Changeset 407 in tmcsimulator for trunk/src/tmcsim/cadsimulator/CADServer.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/CADServer.java (modified) (2 diffs)

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -129 +129 @@
          * Class name of desired user interface.
          */
-        USER_INTERFACE("UserInterface");
+        USER_INTERFACE("UserInterface"),
+        /**
+         *  Filepath to which is written the simulation time.
+         */
+        ELAPSED_TIME_FILE("ElapsedTimeFile");
+        
         public String name;
 
@@ -240 +245 @@
             theModel = new CADSimulatorState();
             theModel.addObserver(theViewer);
-
-            theCoordinator = new Coordinator(theModel);
+            /** Load the simulation time filename from properties */
+            String simTimeFilename =
+                    cadServerProperties.getProperty(
+                    CAD_PROPERTIES.ELAPSED_TIME_FILE.name);
+            if (simTimeFilename == null)
+            {
+                cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor",
+                        propertiesFile + " missing property for " + CAD_PROPERTIES.ELAPSED_TIME_FILE.name);
+                throw new SimulationException(SimulationException.PROPERTY_MISSING_ERROR);
+            }
+            theCoordinator = new Coordinator(theModel, simTimeFilename);
 
             startRegistry(Integer.parseInt(