Skip to content

報告書(３種類)と資源チャートが正常に表示されない不具合の修正 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sankakumaru wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

報告書(３種類)と資源チャートが正常に表示されない不具合の修正 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions main/logbook/dto/chart/ResourceLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,13 @@ public static ResourceLog getInstance(File file) throws IOException {
while (ite.hasNext()) {
String line = ite.next();
// 日付,（直前のイベント,）燃料,弾薬,鋼材,ボーキ,高速建造材,高速修復材,開発資材,ネジ
// 高速建造材,高速修復材が逆になっているので注意
String[] colums = line.split(",");
// 高速建造材,高速修復材が逆になっているので注意
String[] colums;
if (line.contains(",")) {
colums = line.split(",");
} else {
colums = line.split("\t");
}
try {
pos.setIndex(0);
Date date = null;
Expand Down
6 changes: 3 additions & 3 deletions main/logbook/gui/logic/CreateReportLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ public static List<GetShipDto> loadCreateShipReport() {
File file = new File(FilenameUtils.concat(AppConfig.get().getReportPath(), AppConstants.LOG_CREATE_SHIP));
if (file.exists()) {
CSVReader reader = new CSVReader(new InputStreamReader(
new FileInputStream(file), AppConstants.CHARSET));
new FileInputStream(file), AppConstants.CHARSET), '\t');
dtoList = getCreateShip(reader.readAll());
reader.close();
}
Expand Down Expand Up @@ -904,7 +904,7 @@ public static List<CreateItemDto> loadCreateItemReport() {
File file = new File(FilenameUtils.concat(AppConfig.get().getReportPath(), AppConstants.LOG_CREATE_ITEM));
if (file.exists()) {
CSVReader reader = new CSVReader(new InputStreamReader(
new FileInputStream(file), AppConstants.CHARSET));
new FileInputStream(file), AppConstants.CHARSET), '\t');
dtoList = getCreateItem(reader.readAll());
reader.close();
}
Expand Down Expand Up @@ -944,7 +944,7 @@ public static List<MissionResultDto> loadMissionReport() {
File file = new File(FilenameUtils.concat(AppConfig.get().getReportPath(), AppConstants.LOG_MISSION));
if (file.exists()) {
CSVReader reader = new CSVReader(new InputStreamReader(
new FileInputStream(file), AppConstants.CHARSET));
new FileInputStream(file), AppConstants.CHARSET), '\t');
dtoList = getMissionResult(reader.readAll());
reader.close();
}
Expand Down