fixing splitting of classes

Idrinth · Idrinth · commit c047136fbc7a · 2020-05-31T16:35:25.000+02:00
fixing scaling of output
diff --git a/src/main/java/de/idrinth/endlessspace2/modvalidator/App.java b/src/main/java/de/idrinth/endlessspace2/modvalidator/App.java
@@ -13,13 +13,14 @@ public class App extends Application {
     private static Stage stage;
     @Override
     public void start(Stage stage) throws IOException {
-        scene = new Scene(loadFXML("initial"), 640, 480);
+        stage.setTitle("Endless Space 2 Mod Validator");
+        scene = new Scene(loadFXML("initial"));
         stage.setScene(scene);
         stage.show();
         App.stage = stage;
     }
     public static void toPrimary() throws IOException {
-        scene = new Scene(loadFXML("primary"), 640, 480);
+        scene = new Scene(loadFXML("primary"));
         stage.setScene(scene);
         stage.show();
     }
diff --git a/src/main/java/de/idrinth/endlessspace2/modvalidator/Data.java b/src/main/java/de/idrinth/endlessspace2/modvalidator/Data.java
@@ -6,6 +6,7 @@ class Data {
     private static XMLIterator iterator;
     private static SimulationDescriptors rootList;
     private static File workshopDir;
+    private static File gameDir;
 
     public static void setIterator(XMLIterator iterator) {
         Data.iterator = iterator;
@@ -18,6 +19,9 @@ public static void setRootList(SimulationDescriptors rootList) {
     public static void setWorkshopDir(File workshopDir) {
         Data.workshopDir = workshopDir;
     }
+    public static void setGameDir(File gameDir) {
+        Data.gameDir = gameDir;
+    }
 
     public static XMLIterator iterator() {
         return iterator;
@@ -28,4 +32,7 @@ public static SimulationDescriptors rootList() {
     public static File workshopDir() {
         return workshopDir;
     }
+    public static File gameDir() {
+        return gameDir;
+    }
 }
diff --git a/src/main/java/de/idrinth/endlessspace2/modvalidator/InitialController.java b/src/main/java/de/idrinth/endlessspace2/modvalidator/InitialController.java
@@ -2,18 +2,22 @@
 
 import java.io.File;
 import java.io.IOException;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
-import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 
-public class InitialController {
-    @FXML
-    private TextArea output;
+public class InitialController extends ThreaddedController {
     @FXML
     private TextField endlessSpaceFolder;
     @FXML
-    private void start() throws IOException {
+    private void start() {
+        execute();
+    }
+
+    @Override
+    public void run() {
         var logger = new TextOutputLogger(endlessSpaceFolder.getText(), output);
+        logger.info("checking requirements");
         if (null == endlessSpaceFolder.getText() || endlessSpaceFolder.getText().isEmpty()) {
             logger.info("You need to provide the folder of endless space 2.");
             return;
@@ -30,11 +34,27 @@ private void start() throws IOException {
             logger.info("Can't find Schema folder at the place you pointed to.");
             return;
         }
+        logger.info("reading in game dir");
         iterator.run(simFolder, logger, list);
         logger.info("done");
         Data.setIterator(new XMLIterator(schemaFolder.getParentFile()));
         Data.setRootList(list);
+        Data.setGameDir(new File(endlessSpaceFolder.getText()+"/Public"));
         Data.setWorkshopDir(new File(endlessSpaceFolder.getText()+"/../../workshop/content/392110"));
-        App.toPrimary();
+        Platform.runLater(new SwitchToPrimary(logger));
+    }
+    private class SwitchToPrimary implements Runnable {
+        private final TextOutputLogger logger;
+
+        public SwitchToPrimary(TextOutputLogger logger) {
+            this.logger = logger;
+        }
+        public void run() {
+            try {
+                App.toPrimary();
+            } catch (IOException ex) {
+                logger.error(Data.gameDir(), ex);
+            }
+        }
     }
 }
diff --git a/src/main/java/de/idrinth/endlessspace2/modvalidator/PrimaryController.java b/src/main/java/de/idrinth/endlessspace2/modvalidator/PrimaryController.java
@@ -7,7 +7,6 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.ResourceBundle;
@@ -18,29 +17,14 @@
 import javafx.scene.control.TextArea;
 import javafx.util.StringConverter;
 
-public class PrimaryController implements Initializable {
-
-    @FXML
-    private TextArea output;
+public class PrimaryController extends ThreaddedController implements Initializable {
     @FXML
     private ChoiceBox<File> modfolder;
     private XMLIterator iterator;
     private SimulationDescriptors rootList;
     @FXML
     private void validate() {
-        var logger = new TextOutputLogger(modfolder.getValue(), output);
-        if (null == modfolder.getValue()) {
-            logger.info("You need to choose a mod to check.");
-            return;
-        }
-        logger.info("xsd validation");
-        var list = rootList.clone();
-        iterator.run(modfolder.getValue(), logger, list);
-        logger.info("logic validation");
-        list.values().forEach((sd) -> {
-            sd.check(logger, list);
-        });
-        logger.info("done");
+        execute();
     }
 
     @Override
@@ -56,11 +40,29 @@ public void initialize(URL url, ResourceBundle rb) {
         if (workshop.isDirectory()) {
             files.addAll(Arrays.asList(workshop.listFiles(new FolderFilter())));
         }
+        files.add(Data.gameDir());
         modfolder.setConverter(new FileConverter());
         modfolder.setItems(files);
     }
+
+    @Override
+    public void run() {
+        var logger = new TextOutputLogger(modfolder.getValue(), output);
+        if (null == modfolder.getValue()) {
+            logger.info("You need to choose a mod to check.");
+            return;
+        }
+        logger.info("xsd validation");
+        var list = rootList.clone();
+        iterator.run(modfolder.getValue(), logger, list);
+        logger.info("logic validation");
+        list.values().forEach((sd) -> {
+            sd.check(logger, list);
+        });
+        logger.info("done");
+    }
     private class FileConverter extends StringConverter<File> {
-        private HashSet<Identifier> ids = new HashSet<>();
+        private final HashSet<Identifier> ids = new HashSet<>();
         @Override
         public String toString(File file) {
             for (var id : ids) {
@@ -97,10 +99,16 @@ public Identifier(File file) throws IOException {
                 full = file.getCanonicalPath();
                 if (full.contains("workshop")) {
                     path = "workshop://"+full.substring(full.lastIndexOf("workshop")+24);
-                } else {
+                    name = file.listFiles(new XMLNotRegistry())[0].getName().replace(".xml", "");
+                } else if(full.contains("Community")) {
                     path = "local://"+full.substring(full.lastIndexOf("Community")+10);
+                    name = file.listFiles(new XMLNotRegistry())[0].getName().replace(".xml", "");
+                } else if(full.endsWith("Public")) {
+                    path = "game://Endless Space 2";
+                    name = "Base";
+                } else {
+                    throw new IOException(full+" can't be recognised as a folder");
                 }
-                name = file.listFiles(new XMLNotRegistry())[0].getName().replace(".xml", "");
                 this.file = file;
             }
             public String id() {
diff --git a/src/main/java/de/idrinth/endlessspace2/modvalidator/SimpleXMLIterator.java b/src/main/java/de/idrinth/endlessspace2/modvalidator/SimpleXMLIterator.java
@@ -133,9 +133,10 @@ public void startElement(String namespaceURI, String localName, String qName, At
                     }
                     path = path.replaceAll("!", "");
                     while (path.contains(",")) {
-                        var path2 = path.substring(path.indexOf(",")+1).trim();
+                        var position = path.lastIndexOf(",");
+                        var path2 = path.substring(position+1).trim();
                         sd.addReference(path2, atts.getValue("TargetProperty"));
-                        path = path.substring(0, path.lastIndexOf(","));
+                        path = path.substring(0, position);
                     }
                     sd.addReference(path, atts.getValue("TargetProperty"));
             }
diff --git a/src/main/java/de/idrinth/endlessspace2/modvalidator/ThreaddedController.java b/src/main/java/de/idrinth/endlessspace2/modvalidator/ThreaddedController.java
@@ -0,0 +1,15 @@
+package de.idrinth.endlessspace2.modvalidator;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;
+
+public abstract class ThreaddedController implements Runnable {
+    @FXML
+    protected TextArea output;
+    private final ExecutorService te = Executors.newSingleThreadExecutor();
+    protected final void execute() {
+        te.submit(this);
+    }
+}
diff --git a/src/main/resources/de/idrinth/endlessspace2/modvalidator/initial.fxml b/src/main/resources/de/idrinth/endlessspace2/modvalidator/initial.fxml
@@ -10,18 +10,19 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane  xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.idrinth.endlessspace2.modvalidator.InitialController">
+<AnchorPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.idrinth.endlessspace2.modvalidator.InitialController">
     <children>
-        <HBox alignment="CENTER">
+        <VBox spacing="10.0" AnchorPane.topAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
             <children>
-                <Label text="Endless Space 2 Folder:"/>
-                <TextField fx:id="endlessSpaceFolder"/>
-                <Button text="Start" onAction="#start"/>
+                <HBox spacing="20.0" AnchorPane.topAnchor="0.0">
+                    <children>
+                        <Label text="Endless Space 2 Folder:"/>
+                        <TextField fx:id="endlessSpaceFolder"/>
+                        <Button text="Start" onAction="#start"/>
+                    </children>
+                </HBox>
+                <TextArea VBox.vgrow="ALWAYS" AnchorPane.bottomAnchor="0.0" maxHeight="Infinity" maxWidth="Infinity" editable="false" fx:id="output"/>
             </children>
-        </HBox>
-        <VBox alignment="CENTER" spacing="20.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="20.0">
-            <Label text="Output:" />
-            <TextArea maxHeight="Infinity" editable="false" fx:id="output"/>
         </VBox>
     </children>
 </AnchorPane>
diff --git a/src/main/resources/de/idrinth/endlessspace2/modvalidator/primary.fxml b/src/main/resources/de/idrinth/endlessspace2/modvalidator/primary.fxml
@@ -12,20 +12,17 @@
 
 <AnchorPane  xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.idrinth.endlessspace2.modvalidator.PrimaryController">
     <children>
-        <VBox alignment="CENTER" spacing="20.0">
+        <VBox spacing="10.0" AnchorPane.topAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
             <children>
-                <HBox alignment="CENTER">
+                <HBox alignment="CENTER" spacing="20.0">
                     <children>
                         <Button text="Validate" onAction="#validate"/>
                         <Label text="Modfolder" />
                         <ChoiceBox fx:id="modfolder"/>
                         <Label text="against game folder Schema." />
                     </children>
                 </HBox>
-                <VBox alignment="CENTER" spacing="20.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="20.0">
-                    <Label text="Output:" />
-                    <TextArea maxHeight="Infinity" editable="false" fx:id="output"/>
-                </VBox>
+                <TextArea VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS" maxHeight="Infinity" maxWidth="Infinity" editable="false" fx:id="output"/>
             </children>
         </VBox>
     </children>

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,10 @@ public void startElement(String namespaceURI, String localName, String qName, At`
`133`	`133`	`}`
`134`	`134`	`path = path.replaceAll("!", "");`
`135`	`135`	`while (path.contains(",")) {`
`136`		`- var path2 = path.substring(path.indexOf(",")+1).trim();`
	`136`	`+ var position = path.lastIndexOf(",");`
	`137`	`+ var path2 = path.substring(position+1).trim();`
`137`	`138`	`sd.addReference(path2, atts.getValue("TargetProperty"));`
`138`		`- path = path.substring(0, path.lastIndexOf(","));`
	`139`	`+ path = path.substring(0, position);`
`139`	`140`	`}`
`140`	`141`	`sd.addReference(path, atts.getValue("TargetProperty"));`
`141`	`142`	`}`