NEW: Created release :-)

Engin1980 · Mar 11, 2018 · 125f18c · 125f18c
1 parent b7df0d7
commit 125f18c
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 0 deletions.
diff --git a/.idea/artifacts/JAtcSim.xml b/.idea/artifacts/JAtcSim.xml
diff --git a/JAtcSim/src/META-INF/MANIFEST.MF b/JAtcSim/src/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Class-Path: EXmlSerialization.jar eng.eSystem.jar hamcrest-core-1.3.ja
+ r junit-4.12.jar junit-4.12.jar junit.jar hamcrest-core-1.3.jar
+Main-Class: eng.jAtcSim.JAtcSim
+
diff --git a/JAtcSim/src/eng/jAtcSim/JAtcSim.java b/JAtcSim/src/eng/jAtcSim/JAtcSim.java
@@ -26,6 +26,8 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Calendar;
 
 /**
@@ -66,6 +68,7 @@ public static void main(String[] args) {
   public static void startSimulation(StartupSettings startupSettings) {
 
 
+    resolveShortXmlFileNamesInStartupSettings(appSettings, startupSettings);
     XmlLoadHelper.saveStartupSettings(startupSettings, appSettings.getStartupSettingsFile());
 
     XmlLoadedData data;
@@ -117,6 +120,36 @@ public static void startSimulation(StartupSettings startupSettings) {
     simPack.startPack();
   }
 
+  private static void resolveShortXmlFileNamesInStartupSettings(AppSettings appSettings, StartupSettings startupSettings) {
+    Path tmp;
+    Path appPath;
+    appPath = appSettings.applicationFolder;
+
+    tmp = Paths.get(startupSettings.files.areaXmlFile);
+    if (tmp.isAbsolute()) {
+      tmp = appPath.relativize(tmp);
+      startupSettings.files.areaXmlFile = tmp.toString();
+    }
+
+    tmp = Paths.get(startupSettings.files.fleetsXmlFile);
+    if (tmp.isAbsolute()) {
+      tmp = appPath.relativize(tmp);
+      startupSettings.files.fleetsXmlFile = tmp.toString();
+    }
+
+    tmp = Paths.get(startupSettings.files.planesXmlFile);
+    if (tmp.isAbsolute()) {
+      tmp = appPath.relativize(tmp);
+      startupSettings.files.planesXmlFile = tmp.toString();
+    }
+
+    tmp = Paths.get(startupSettings.files.trafficXmlFile);
+    if (tmp.isAbsolute()) {
+      tmp = appPath.relativize(tmp);
+      startupSettings.files.trafficXmlFile = tmp.toString();
+    }
+  }
+
   public static void quit() {
 
   }