From 926e33b8c5c7f36520f8bd9dc798be6c1613148d Mon Sep 17 00:00:00 2001
From: nh60211as <nh60211@gmail.com>
Date: Thu, 1 Oct 2020 21:33:37 +0800
Subject: [PATCH] Rearranged code.

---
 src/Main.java      |  5 ++++-
 src/ReadFile.java  | 17 ++++++++++-------
 src/Skill.java     |  2 +-
 src/WriteFile.java |  9 ++++-----
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/Main.java b/src/Main.java
index 1225909..0f2cc6c 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,6 +1,7 @@
+import java.io.File;
+import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.io.*;
 
 public class Main {
     private static final String skillListFileName = "skillList.txt";
@@ -18,6 +19,7 @@ public static void main(String[] args) {
         HashMap<String, String> maxLevelList = generateMaxLevelList(skillList, jewelList, method);
 
         File remainKeyEntryFile = new File(remainKeyEntryFileName);
+        System.out.println("Writing remain key entry list: " + remainKeyEntryFile.getAbsolutePath());
         WriteFile.writeRemainKeyEntryFile(maxLevelList, remainKeyEntryFile);
 
         HashMap<String, String> remainKeyEntries = ReadFile.readRemainKeyEntry(remainKeyEntryFileName);
@@ -103,6 +105,7 @@ private static void generatePatchFile(File inputFileName, HashMap<String, String
         HashMap<String, String> CSVContent = ReadFile.readGMDEditorCSV(inputFileName);
         //System.out.println(CSVContent.toString());
         //System.out.println(CSVContent.size());
+        System.out.println("Writing CSV file to be import to GMD editor: " + outputFile.getAbsoluteFile());
         WriteFile.writeGMDEditorCSV(CSVContent, remainKeyEntries, outputFile);
     }
 
diff --git a/src/ReadFile.java b/src/ReadFile.java
index 6f5aa6e..58c8688 100644
--- a/src/ReadFile.java
+++ b/src/ReadFile.java
@@ -1,15 +1,15 @@
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 import com.opencsv.CSVParser;
 import com.opencsv.CSVParserBuilder;
 import com.opencsv.CSVReader;
 import com.opencsv.CSVReaderBuilder;
 import com.opencsv.exceptions.CsvException;
 
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 public class ReadFile {
     // read different set of Maximum Level based on isIB(is Iceborne)
     static HashMap<String, Integer> readSkillList(File file, boolean isIB) {
@@ -78,7 +78,7 @@ static HashMap<String, ArrayList<Skill>> readJewelList(File file) {
                 String[] SkillListBlock = skillListString.split(",");
                 // set the limit to -1 so the function DOESN'T discard trailing empty string
                 //System.out.println(currentLine);
-                ArrayList<Skill> inputValue = new ArrayList();
+                ArrayList<Skill> inputValue = new ArrayList<>();
                 for (int i = 0; i < SkillListBlock.length; i += 2)
                     inputValue.add(new Skill(SkillListBlock[i], Integer.parseInt(SkillListBlock[i + 1])));
                 skillList.put(inputKey, inputValue);
@@ -115,6 +115,9 @@ static HashMap<String, String> readRemainKeyEntry(String remainKeyEntryFileName)
                 if (currentLine.substring(0, 1).contentEquals("#"))
                     continue;
                 if (currentLine.length() > 0) {
+                    // IntelliJ reports the following
+                    // Warning:Condition 'currentLine.length() > 0' is always 'true'
+                    // But String could be empty and equates to 0
                     String[] stringBlock = currentLine.split(";", -1);
                     // set the limit to -1 so the function DOESN'T discard trailing empty string
                     //System.out.println(currentLine);
diff --git a/src/Skill.java b/src/Skill.java
index db80525..fb14291 100644
--- a/src/Skill.java
+++ b/src/Skill.java
@@ -2,7 +2,7 @@ public class Skill {
     String skillName;
     int level;
 
-    public Skill(String skillName, int level){
+    public Skill(String skillName, int level) {
         this.skillName = skillName;
         this.level = level;
     }
diff --git a/src/WriteFile.java b/src/WriteFile.java
index 6356c6b..124adb3 100644
--- a/src/WriteFile.java
+++ b/src/WriteFile.java
@@ -1,4 +1,7 @@
-import com.opencsv.*;
+import com.opencsv.CSVParser;
+import com.opencsv.CSVParserBuilder;
+import com.opencsv.CSVWriterBuilder;
+import com.opencsv.ICSVWriter;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -9,7 +12,6 @@ static void writeRemainKeyEntryFile(HashMap<String, String> levelIndicatorList,
         Writer writer = null;
         BufferedWriter bw = null;
         try {
-            System.out.println("Writing remain key entry list: " + file.getAbsoluteFile());
             writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
             bw = new BufferedWriter(writer);
             // Start writing files line by line
@@ -38,14 +40,12 @@ static void writeRemainKeyEntryFile(HashMap<String, String> levelIndicatorList,
                 ex.printStackTrace();
             }
         }
-        System.out.println("Done");
     }
 
     static void writeGMDEditorCSV(HashMap<String, String> fileContent, HashMap<String, String> remainKeyEntries, File file) {
         Writer writer = null;
         BufferedWriter bw = null;
         try {
-            System.out.println("Writing CSV file to be import to GMD editor: " + file.getAbsoluteFile());
             writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8);
             bw = new BufferedWriter(writer);
             CSVParser parser = new CSVParserBuilder().withSeparator(';').build();
@@ -70,7 +70,6 @@ static void writeGMDEditorCSV(HashMap<String, String> fileContent, HashMap<Strin
                     bw.close();
                 if (writer != null)
                     writer.close();
-                writer.close();
             } catch (IOException ex) {
                 ex.printStackTrace();
             }