Changeset 658 in tmcsimulator for trunk/src/tmcsim/simulationmanager/SimulationManager.java

Timestamp:

09/12/2022 02:19:40 PM (4 years ago)

Author:

jdalbey

Message:

Replace hard-code scenario folder name in Simulation Manager with config property.

File:

• trunk/src/tmcsim/simulationmanager/SimulationManager.java (modified) (4 diffs)

trunk/src/tmcsim/simulationmanager/SimulationManager.java

@@ -48 +48 @@
     private static final String CONFIG_FILE_NAME = "sim_manager_config.properties";
     /*
-     * Name of filesystem folder that contains Scenario xml files.  
+     * Default name of folder that contains Scenario xml files.
+     * Actual name retrieved from config file.
     */
-    public static final String kScenarioFolder = "Scenarios";
+    public static String SCENARIOS_DIR = "Scenarios";
     /**
      * Error logger.
@@ -66 +67 @@
         CAD_SIM_HOST("CADSimulatorHost"),
         CAD_SIM_PORT("CADSimulatorRMIPort"),
-        SCRIPT_DIR("ScriptDir"),
+        SCENARIOS_DIR("ScenariosDir"),
         FAKE_PARAMICS("FakeParamicsConnection");
         public String name;
@@ -111 +112 @@
             simManagerProperties.load(new FileInputStream(new File(propertiesFile)));
 
-            SimulationManagerView.SCRIPT_DIR =
-                    simManagerProperties.getProperty(PROPERTIES.SCRIPT_DIR.name).trim();
+            SCENARIOS_DIR =
+                    simManagerProperties.getProperty(PROPERTIES.SCENARIOS_DIR.name).trim();
 
             //make sure properties aren't null
@@ -229 +230 @@
             {
                 arg1 = args[0];
-                File scriptFile = new File(kScenarioFolder+ System.getProperty("file.separator") + arg1);
+                File scriptFile = new File(SCENARIOS_DIR+ System.getProperty("file.separator") + arg1);
                 // if the script file exists, load it and show name in title bar
                 if (scriptFile.exists())