Allow to check all the lines of a file #2

NicolasGrosjean · Jan 9, 2018 · 925c759 · 925c759
1 parent b3d7073
commit 925c759
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/src/gui/Window.java b/src/gui/Window.java
@@ -50,14 +50,15 @@
 import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;
 
-import parsing.Parse;
+import config.ConfigStorage;
+import config.WorkingSession;
 import parsing.CK2ParsedFile;
 import parsing.IParsedFile;
+import parsing.Parse;
 import renderer.ButtonRenderer;
 import renderer.ColoredInteger;
 import renderer.Percentage;
-import config.ConfigStorage;
-import config.WorkingSession;
+import translator.ITranslator;
 
 public class Window extends JFrame {
 	private static int FILE_COLUMN = 1;
@@ -450,8 +451,7 @@ public void actionPerformed(ActionEvent e) {
             	int row = table.getSelectedRows()[0];
             	IParsedFile f = (IParsedFile) table.getValueAt(row, FILE_COLUMN);
             	String directory = (ws.getDirectory().endsWith("/")) ? ws.getDirectory() : ws.getDirectory() + "/";
-            	CK2ParsedFile file = Parse.getAllCk2Lines(directory + f.getName(), ws.getSourceLanguage(),
-            			ws.getDestinationLanguage());
+            	ITranslator file = f.createAllLines(ws.getSourceLanguage(), ws.getDestinationLanguage());
             	new TranslatorDialog(null, f.getName(), true, file,
             			ws.getSourceLanguage(), ws.getDestinationLanguage(),
             			ws.isAutomaticGoogleCall());

diff --git a/src/parsing/CK2ParsedFile.java b/src/parsing/CK2ParsedFile.java
@@ -10,6 +10,7 @@
 import java.util.LinkedList;
 
 import translator.TranslatorParsedFile;
+import translator.ITranslator;
 import translator.TranslatedEntry;
 
 public class CK2ParsedFile extends TranslatorParsedFile {
@@ -182,4 +183,10 @@ public TranslatedEntry getNextEntryToTranslateAndSave(TranslatedEntry entryToSav
 		}
 		return nextEntry;
 	}
+
+	@Override
+	public ITranslator createAllLines(Language sourceLanguage, Language destinationLanguage) {
+		Parse parseObj = new Parse(new LinkedList<String>(), sourceLanguage, destinationLanguage, null, null);
+		return parseObj.parseAcsvFile(filePath, true);
+	}
 }
diff --git a/src/parsing/HoI4ParsedFile.java b/src/parsing/HoI4ParsedFile.java
@@ -13,6 +13,7 @@
 import java.util.LinkedList;
 
 import translator.TranslatorParsedFile;
+import translator.ITranslator;
 import translator.TranslatedEntry;
 
 public class HoI4ParsedFile extends TranslatorParsedFile {
@@ -225,4 +226,10 @@ public String getFilePath(Language language)
 	{
 		return troncatedFilePath + "_" + language.getCode().toLowerCase() + ".yml";
 	}
+
+	@Override
+	public ITranslator createAllLines(Language sourceLanguage, Language destinationLanguage) {
+		Parse parseObj = new Parse(new LinkedList<String>(), sourceLanguage, destinationLanguage, null, null);
+		return parseObj.parseAymlFile(troncatedFilePath, true);
+	}
 }
diff --git a/src/parsing/IParsedFile.java b/src/parsing/IParsedFile.java
@@ -2,6 +2,8 @@
 
 import java.util.Iterator;
 
+import translator.ITranslator;
+
 public interface IParsedFile {
 	public String getName();
 
@@ -23,6 +25,8 @@ public interface IParsedFile {
 	 */
 	public String getMissingTranslation();
 
+	public ITranslator createAllLines(Language sourceLanguage, Language destinationLanguage);
+
 	/** ---------------- FOR TESTING -------------------------------**/
 	public Iterator<ParsedEntry> getDescendingIteratorLineToTranslate();
 

diff --git a/src/parsing/Parse.java b/src/parsing/Parse.java
@@ -14,6 +14,7 @@
 import java.util.Set;
 
 import config.WorkingSession;
+import translator.ITranslator;
 
 public class Parse {
 	/**
@@ -186,20 +187,12 @@ public static LinkedList<String> listDirectoryFiles(String directoryPath) {
 		}
 		return filePaths;
 	}
-
-	public static CK2ParsedFile getAllCk2Lines(String filePath, Language sourceLanguage,
-			Language destinationLanguage)
-	{
-		Parse parseObj = new Parse(new LinkedList<String>(),
-				sourceLanguage, destinationLanguage, null, null);
-		return parseObj.parseAcsvFile(filePath, true);
-	}
 
 	private CK2ParsedFile parseAcsvFile(String filePath) {
 		return parseAcsvFile(filePath, false);
 	}
 
-	private CK2ParsedFile parseAcsvFile(String filePath, boolean returnAllLines) {
+	public CK2ParsedFile parseAcsvFile(String filePath, boolean returnAllLines) {
 		CK2ParsedFile parsedFile = new CK2ParsedFile(filePath);
 		int lineNumber = 0;
 		int usefulLineNumber = 0;
@@ -316,7 +309,7 @@ private HoI4ParsedFile parseAymlFile(String troncatedFilePath) {
 		return parseAymlFile(troncatedFilePath, false);
 	}
 
-	private HoI4ParsedFile parseAymlFile(String troncatedFilePath, boolean returnAllLines) {
+	public HoI4ParsedFile parseAymlFile(String troncatedFilePath, boolean returnAllLines) {
 		HoI4ParsedFile parsedFile = new HoI4ParsedFile(troncatedFilePath);
 		File sourceFile = new File(parsedFile.getFilePath(sourceLanguage));
 		File destinationFile = new File(parsedFile.getFilePath(destinationLanguage));
@@ -548,7 +541,7 @@ private String analyzeExpression(String expression) {
 	 * @param filePath
 	 * @return
 	 */
-	private String getFilePathWithoutLanguage(String filePath) {
+	private static String getFilePathWithoutLanguage(String filePath) {
 		String[] split = filePath.split("_");
 		// Concatenate all except the last one
 		String res = "";