Changeset 658 in tmcsimulator for trunk/src

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.

Location:

trunk/src/tmcsim

Files:

• cadsimulator/Coordinator.java (modified) (2 diffs)
• simulationmanager/SimulationManager.java (modified) (4 diffs)
• simulationmanager/SimulationManagerView.java (modified) (1 diff)
• simulationmanager/actions/AddIncidentAction.java (modified) (2 diffs)
• simulationmanager/actions/LoadScriptAction.java (modified) (2 diffs)

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -83 +83 @@
 import tmcsim.interfaces.CoordinatorInterface;
 import tmcsim.interfaces.SimulationManagerInterface;
-import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder;
 import tmcsim.simulationmanager.SimulationManagerView;
 import tmcsim.simulationmanager.actions.LoadScriptAction;
+import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR;
 
 /**
@@ -167 +167 @@
         try
         {
-            CardfileReader cfr = new CardfileReader(kScenarioFolder+"/Cardfile.xml", cardfileData);
+            CardfileReader cfr = new CardfileReader(SCENARIOS_DIR+"/Cardfile.xml", cardfileData);
         } catch (Exception e)
         {

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())

trunk/src/tmcsim/simulationmanager/SimulationManagerView.java

@@ -83 +83 @@
     /** Maximum Paramics network ID (100) */
     private static int MAX_NETWORK_ID    = 100;
-
-    /** Default directory for script loading. */
-    public static String SCRIPT_DIR      = ".";
 
     /** Reference to the simulation manager model. */

trunk/src/tmcsim/simulationmanager/actions/AddIncidentAction.java

@@ -15 +15 @@
 import tmcsim.common.SimulationException;
 import tmcsim.common.CADEnums.SCRIPT_STATUS;
+import tmcsim.simulationmanager.SimulationManager;
 import tmcsim.simulationmanager.SimulationManagerView;
 import tmcsim.simulationmanager.dialogs.AddIncidentDialog;
@@ -60 +61 @@
                 try{                
                     JFileChooser chooser   = new JFileChooser(
-                            SimulationManagerView.SCRIPT_DIR);
+                            SimulationManager.SCENARIOS_DIR);
                     
                     chooser.setDialogTitle("Open Simulation Script File");

trunk/src/tmcsim/simulationmanager/actions/LoadScriptAction.java

@@ -10 +10 @@
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
+import tmcsim.simulationmanager.SimulationManager;
 import tmcsim.simulationmanager.SimulationManagerView;
 import tmcsim.simulationmanager.model.XmlFilter;
@@ -39 +40 @@
         SwingUtilities.invokeLater(new Runnable(){      
             public void run() { 
-                JFileChooser chooser = new JFileChooser(
-                        SimulationManagerView.SCRIPT_DIR);
+                JFileChooser chooser = new JFileChooser(SimulationManager.SCENARIOS_DIR);
                 
-                chooser.setDialogTitle("Open Simulation Script File");
+                chooser.setDialogTitle("Open Simulation Scenario File");
                 chooser.setMultiSelectionEnabled(false);        
                 chooser.setFileFilter(new XmlFilter());