cleanups

upping version number

Author: Idrinth

nbactions.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>run</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>clean</goal>
+                <goal>javafx:run</goal>
+            </goals>
+        </action>
+        <action>
+            <actionName>debug</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath de.idrinth.endlessspace2.modvalidator.App</exec.args>
+                <exec.executable>java</exec.executable>
+                <jpda.listen>true</jpda.listen>
+            </properties>
+        </action>
+        <action>
+            <actionName>profile</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.5.0:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-classpath %classpath de.idrinth.endlessspace2.modvalidator.App</exec.args>
+                <exec.executable>java</exec.executable>
+            </properties>
+        </action>
+        <action>
+            <actionName>build</actionName>
+            <packagings>
+                <packaging>*</packaging>
+            </packagings>
+            <goals>
+                <goal>install</goal>
+            </goals>
+        </action>
+    </actions>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.idrinth.endlessspace2</groupId>
     <artifactId>modvalidator</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>14</maven.compiler.source>
@@ -31,7 +31,7 @@
             <version>${javafx.version}</version>
         </dependency>
         <!-- adding all the platform libs only adds a couple more MB -->
-        <!--<dependency>
+        <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
             <version>${javafx.version}</version>
@@ -48,7 +48,7 @@
             <artifactId>javafx-graphics</artifactId>
             <version>${javafx.version}</version>
             <classifier>linux</classifier>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

src/main/java/de/idrinth/endlessspace2/modvalidator/ExternalReferences.java

@@ -29,6 +29,23 @@ public void check(TextOutputLogger logger, SimulationDescriptors list) {
             }
         }
     }
+
+    @Override
+    public int hashCode() {
+        return 79 * 7 + Objects.hashCode(this.externals);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final ExternalReferences other = (ExternalReferences) obj;
+        return Objects.equals(this.externals, other.externals);
+    }
     private class ExternalReferenceId {
         private final String name;
         private final String type;

src/main/java/de/idrinth/endlessspace2/modvalidator/runner/Initial.java

@@ -1,14 +1,12 @@
 package de.idrinth.endlessspace2.modvalidator.runner;
 
 import de.idrinth.endlessspace2.modvalidator.DataTransferHelper;
-import de.idrinth.endlessspace2.modvalidator.SimulationDescriptorReference;
 import de.idrinth.endlessspace2.modvalidator.SimulationDescriptors;
 import de.idrinth.endlessspace2.modvalidator.SimulationReferenceListHelper;
 import de.idrinth.endlessspace2.modvalidator.TextOutputLogger;
 import de.idrinth.endlessspace2.modvalidator.xmliterator.InitialLoadXMLIterator;
 import de.idrinth.endlessspace2.modvalidator.xmliterator.ValidatingXMLIterator;
 import java.io.File;
-import java.util.HashSet;
 
 public class Initial implements Runnable {
     private final String endlessSpaceFolder;

src/main/java/de/idrinth/endlessspace2/modvalidator/xmliterator/ValidatingXMLIterator.java

@@ -25,36 +25,37 @@ public ValidatingXMLIterator(File root, HashSet<SimulationDescriptorReference> r
     protected void handleFile(File file, File source, TextOutputLogger logger, SimulationDescriptors simulationDescriptors, ExternalReferences externals)
     {
         var finder = new SAXSchemaFinder();
-        System.out.println("-1>");
         parseXML(
             file,
             logger,
             finder,
             new SAXSimulationDescriptorReferenceFinder(references, externals, file),
             new SAXSimulationDescriptorFinder(simulationDescriptors, file, true)
         );
-        System.out.println("-2>");
         validateXMLSchema(finder.value(), file, logger);
-        System.out.println("-3>");
     }
     private void validateXMLSchema(String xsdPath, File xmlPath, TextOutputLogger logger){
         if (null == xsdPath || xsdPath.isEmpty()) {
             logger.error(xmlPath, "schema can't be found");
             return;
         }
-        if (!xsdPath.startsWith("Schemas")) {
-            logger.warn(xmlPath, "schema starts with a none-existing path: "+xsdPath);
-            var pos = xsdPath.indexOf("Schemas");
-            xsdPath = xsdPath.substring(pos > 0 ? pos : 0);
-        }
-        logger.debug(xmlPath, "schema "+xsdPath);
+        var xsd = cleanPath(xsdPath, xmlPath, logger);
+        logger.debug(xmlPath, "schema "+xsd);
         try {
             SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            Schema schema = factory.newSchema(new StreamSource(root + "/" + xsdPath));
+            Schema schema = factory.newSchema(new StreamSource(root + "/" + xsd));
             Validator validator = schema.newValidator();
             validator.validate(new StreamSource(xmlPath));
         } catch (IOException | SAXException ex) {
             logger.error(xmlPath, ex);
         }
     }
+    private String cleanPath(String xsdPath, File xmlPath, TextOutputLogger logger) {
+        if (xsdPath.startsWith("Schemas")) {
+            return xsdPath;
+        }
+        logger.warn(xmlPath, "schema starts with a none-existing path: "+xsdPath);
+        var pos = xsdPath.indexOf("Schemas");
+        return xsdPath.substring(pos > 0 ? pos : 0);
+    }
 }

src/test/java/de/idrinth/endlessspace2/modvalidator/ExternalReferencesTest.java

@@ -2,6 +2,8 @@
 
 import java.io.File;
 import java.util.HashSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -33,4 +35,21 @@ public void testCheck() {
         verify(list).has("3");
         verifyNoMoreInteractions(list);
     }
+    @Test
+    public void testEquals() {
+        ExternalReferences instance = new ExternalReferences();
+        assertNotEquals(null, instance);
+        assertEquals(new ExternalReferences(), instance);
+        var set = new HashSet<ExternalReference>();
+        set.add(new ExternalReference(new File("."), "k", "q"));
+        instance.add("name", "type", set);
+        assertNotEquals(new ExternalReferences(), instance);
+        instance.add("name", "type", new HashSet<>());
+        assertEquals(new ExternalReferences(), instance);
+    }
+    @Test
+    public void testHashCode() {
+        ExternalReferences instance = new ExternalReferences();
+        assertEquals(553, instance.hashCode());
+    }
 }