Changeset 123 in tmcsimulator for trunk/src/tmcsim/cadsimulator/CADServer.java

Timestamp:

10/15/2017 03:59:42 PM (9 years ago)

Author:

jdalbey

Message:

Multiple renaming of classes to improve clarity. Remove check for Paramics running before starting sim.

File:

• trunk/src/tmcsim/cadsimulator/CADServer.java (moved) (moved from trunk/src/tmcsim/cadsimulator/CADSimulator.java) (10 diffs)

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -19 +19 @@
 import tmcsim.cadsimulator.managers.MediaManager;
 import tmcsim.cadsimulator.managers.ParamicsSimulationManager;
-import tmcsim.cadsimulator.managers.SimulationControlManager;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.managers.SimulationClockManager;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.SimulationException;
 import tmcsim.interfaces.CADViewer;
@@ -64 +64 @@
  * @version $Date: 2009/04/17 16:27:46 $ $Revision: 1.5 $
  */
-public class CADSimulator
+public class CADServer
 {
 
@@ -78 +78 @@
      *
      * @author Matthew
-     * @see CADSimulator
+     * @see CADServer
      */
     private static enum CAD_PROPERTIES
@@ -132 +132 @@
         }
     };
+    /** NOTE: Protected fields are accessed by Coordinator */
     /**
      * CADSimulatorViewer instance.
@@ -138 +139 @@
     //protected static CADSimulatorViewer theViewer;
     //protected static CADConsoleViewer theConsole;
-    protected static CADSimulatorModel theModel;
+    protected static CADSimulatorState theModel;
     /**
      * Coordinator instance.
@@ -150 +151 @@
      * SimulationControlManager instance.
      */
-    protected static SimulationControlManager theSimulationCntrlMgr = null;
+    protected static SimulationClockManager theSimulationCntrlMgr = null;
     /**
      * ParamicsSimulationManager instance.
@@ -183 +184 @@
      * Simulator.
      */
-    public CADSimulator(String propertiesFile) throws SimulationException
+    public CADServer(String propertiesFile) throws SimulationException
     {
 
@@ -224 +225 @@
                 throw new SimulationException(SimulationException.INITIALIZE_ERROR);
             }
-            theModel = new CADSimulatorModel();
+            theModel = new CADSimulatorState();
             theModel.addObserver(theViewer);
 
@@ -236 +237 @@
                     CAD_PROPERTIES.CAD_RMI_PORT.name).trim()));
 
-            theSimulationCntrlMgr = new SimulationControlManager(theCoordinator);
+            theSimulationCntrlMgr = new SimulationClockManager(theCoordinator);
 
             theATMSMgr = new ATMSManager(
@@ -410 +411 @@
                     + System.getProperty("file.separator")
                     + CONFIG_FILE_NAME;
-            new CADSimulator(propFile);
+            new CADServer(propFile);
         } catch (Exception e)
         {