Changeset 407 in tmcsimulator for trunk/src/tmcsim/cadsimulator/Coordinator.java

Timestamp:

05/16/2019 01:02:37 PM (7 years ago)

Author:

jdalbey

Message:

Fix for #155 to make simulation time filename configurable.

File:

• trunk/src/tmcsim/cadsimulator/Coordinator.java (modified) (4 diffs)

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -31 +31 @@
 import tmcsim.cadsimulator.managers.ParamicsSimulationManager;
 import tmcsim.cadsimulator.managers.SimulationClockManager;
+import tmcsim.cadsimulator.managers.TrafficModelManager;
+import static tmcsim.cadsimulator.managers.TrafficModelManager.loadProperties;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.client.cadclientgui.CardfileReader;
@@ -96 +98 @@
      * The name of the file where the simulation clock time is written
      */
-    public static final String kSimClockFilename = "webapps" + 
+    private String kSimClockFilename = "webapps" + 
             System.getProperty("file.separator") + "dynamicdata" + 
-            System.getProperty("file.separator") + "sim_elapsedtime.json";
+            System.getProperty("file.separator") + "sim_elapsedtime.json";        
     /**
      * Error logger.
@@ -119 +121 @@
     private static CardfileData cardfileData;
     private CADSimulatorState cadModel;
-
+    
     /**
      * Constructor. Call UnicastRemoteObject constructor and call
@@ -126 +128 @@
      * @throws RemoteException
      */
-    public Coordinator(CADSimulatorState model) throws RemoteException
+    public Coordinator(CADSimulatorState model, String simTimeFilename) throws RemoteException
     {
         super();
         cadModel = model;
+        kSimClockFilename = simTimeFilename;
         clientList = new LinkedList<CADClientInterface>();
         cadData = new CADData();