Changeset 123 in tmcsimulator for trunk/src/tmcsim/cadsimulator/Coordinator.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/Coordinator.java (modified) (40 diffs)

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -27 +27 @@
 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.client.cadclientgui.CardfileReader;
 import tmcsim.client.cadclientgui.ScriptHandler;
@@ -80 +80 @@
  * @see MediaManager
  * @see ParamicsSimulationManager
- * @see SimulationControlManager
+ * @see SimulationClockManager
  * @author Matthew Cechini
  * @version
@@ -103 +103 @@
      * connected Manager, this object is set to null.
      */
-    private static SimulationManagerInterface managerInt = null;
+    private static SimulationManagerInterface simMgr = null;
     private static LinkedList<CADClientInterface> clientList;
     private static CADData cadData;
     private static CardfileData cardfileData;
-    private CADSimulatorModel cadModel;
+    private CADSimulatorState cadModel;
 
     /**
@@ -115 +115 @@
      * @throws RemoteException
      */
-    public Coordinator(CADSimulatorModel model) throws RemoteException
+    public Coordinator(CADSimulatorState model) throws RemoteException
     {
         super();
@@ -153 +153 @@
     public void registerForCallback(SimulationManagerInterface simManInt) throws RemoteException
     {
-        managerInt = simManInt;
+        simMgr = simManInt;
         cadModel.setSimManagerStatus(true);
     }
@@ -159 +159 @@
     public void unregisterForCallback(SimulationManagerInterface simManInt) throws RemoteException
     {
-        managerInt = null;
+        simMgr = null;
         cadModel.setSimManagerStatus(false);
     }
@@ -166 +166 @@
     {
 
-        if (!CADSimulator.theIncidentMgr.areIncidentsLoaded())
+        if (!CADServer.theIncidentMgr.areIncidentsLoaded())
         {
             throw new ScriptException(ScriptException.NO_SCRIPT_LOADED);
         }
-        else if (CADSimulator.theParamicsSimMgr.isConnected())
+        else if (CADServer.theParamicsSimMgr.isConnected())
         {
             Runnable startRun = new Runnable()
@@ -184 +184 @@
                          * Is some process happening on the ATMS side that we need to wait for?
                          */
-                        long currentATMSTime = CADSimulator.theATMSMgr.getCurrentTime();
+                        long currentATMSTime = CADServer.theATMSMgr.getCurrentTime();
                         /* Seems like it waits 0-30 seconds, depending on what the time is on
                          * the ATMS server.  Does something happen every 30 seconds over there?
@@ -205 +205 @@
                     } finally
                     {
-                        CADSimulator.theSimulationCntrlMgr.startSimulation();
-                        CADSimulator.theParamicsSimMgr.startSimulation();
-                        CADSimulator.theSoundPlayer.setAudioEnabled(true);
+                        CADServer.theSimulationCntrlMgr.startSimulation();
+                        CADServer.theParamicsSimMgr.startSimulation();
+                        CADServer.theSoundPlayer.setAudioEnabled(true);
                     }
                 }
@@ -217 +217 @@
         else
         {
-            CADSimulator.theSimulationCntrlMgr.startSimulation();
-            CADSimulator.theSoundPlayer.setAudioEnabled(true);
+            CADServer.theSimulationCntrlMgr.startSimulation();
+            CADServer.theSoundPlayer.setAudioEnabled(true);
         }
     }
@@ -224 +224 @@
     public void pauseSimulation() throws RemoteException
     {
-        CADSimulator.theSimulationCntrlMgr.pauseSimulation();
-        CADSimulator.theSoundPlayer.setAudioEnabled(false);
+        CADServer.theSimulationCntrlMgr.pauseSimulation();
+        CADServer.theSoundPlayer.setAudioEnabled(false);
     }
 
@@ -231 +231 @@
     {
 
-        CADSimulator.theIncidentMgr.resetIncidents();
+        CADServer.theIncidentMgr.resetIncidents();
         cadData.resetSimulation();
 
-        CADSimulator.theSoundPlayer.setAudioEnabled(false);
-        CADSimulator.theSoundPlayer.deQueueAll();
+        CADServer.theSoundPlayer.setAudioEnabled(false);
+        CADServer.theSoundPlayer.deQueueAll();
 
         cadModel.setTime(0);
@@ -243 +243 @@
         CMSDiversionDB.getInstance().resetDiversions();
 
-        CADSimulator.theSimulationCntrlMgr.resetSimulation();
-        CADSimulator.theParamicsSimMgr.resetSimulation();
+        CADServer.theSimulationCntrlMgr.resetSimulation();
+        CADServer.theParamicsSimMgr.resetSimulation();
 
         notifyObservers(new ObserverMessage(ObserverMessage.messageType.RESET_SIMULATION, null));
@@ -253 +253 @@
     {
 
-        boolean audioWasEnabled = CADSimulator.theSoundPlayer.getAudioEnabled();
-
-        CADSimulator.theSoundPlayer.setAudioEnabled(false);
+        boolean audioWasEnabled = CADServer.theSoundPlayer.getAudioEnabled();
+
+        CADServer.theSoundPlayer.setAudioEnabled(false);
 
         long tempTime = 0;
@@ -262 +262 @@
             tempTime++;
 
-            CADSimulator.theIncidentMgr.tick(tempTime);
-        }
-        CADSimulator.theSoundPlayer.setAudioEnabled(audioWasEnabled);
-
-
-        CADSimulator.theSimulationCntrlMgr.gotoSimulationTime(newSimTime);
+            CADServer.theIncidentMgr.tick(tempTime);
+        }
+        CADServer.theSoundPlayer.setAudioEnabled(audioWasEnabled);
+
+
+        CADServer.theSimulationCntrlMgr.gotoSimulationTime(newSimTime);
 
         Runnable gotoRun = new Runnable()
@@ -275 +275 @@
                 cadModel.setTime(newSimTime);
 
-                if (managerInt != null)
+                if (simMgr != null)
                 {
                     try
                     {
-                        managerInt.tick(newSimTime);
+                        simMgr.tick(newSimTime);
                     } catch (RemoteException re)
                     {
                         //Simulation Manager has disappeared
-                        managerInt = null;
+                        simMgr = null;
                         cadModel.setSimManagerStatus(false);
 
@@ -312 +312 @@
                 cadModel.setScriptStatus(status);
 
-                if (managerInt != null)
+                if (simMgr != null)
                 {
                     try
                     {
-                        managerInt.setScriptStatus(status);
+                        simMgr.setScriptStatus(status);
                     } catch (RemoteException re)
                     {
                         //Simulation Manager has disappeared
-                        managerInt = null;
+                        simMgr = null;
                         cadModel.setSimManagerStatus(false);
 
@@ -362 +362 @@
                 }
 
-                if (managerInt != null)
+                if (simMgr != null)
                 {
                     try
                     {
-                        managerInt.setParamicsStatus(status);
+                        simMgr.setParamicsStatus(status);
                     } catch (RemoteException re)
                     {
                         //Simulation Manager has disappeared
-                        managerInt = null;
+                        simMgr = null;
                         cadModel.setSimManagerStatus(false);
 
@@ -387 +387 @@
     public void connectToParamics() throws RemoteException
     {
-        CADSimulator.theParamicsSimMgr.connectToParamics();
+        CADServer.theParamicsSimMgr.connectToParamics();
     }
 
     public void disconnectFromParamics() throws RemoteException
     {
-        CADSimulator.theParamicsSimMgr.disconnectFromParamics();
+        CADServer.theParamicsSimMgr.disconnectFromParamics();
     }
 
     public void loadParamicsNetwork(int networkID) throws RemoteException, SimulationException
     {
-        CADSimulator.theParamicsSimMgr.loadParamicsNetwork(networkID);
+        CADServer.theParamicsSimMgr.loadParamicsNetwork(networkID);
     }
 
     public PARAMICS_STATUS getParamicsStatus() throws RemoteException
     {
-        return CADSimulator.theParamicsSimMgr.getParamicsStatus();
+        return CADServer.theParamicsSimMgr.getParamicsStatus();
     }
 
     public int getParamicsNetworkLoaded() throws RemoteException
     {
-        return CADSimulator.theParamicsSimMgr.getParamicsNetworkLoaded();
+        return CADServer.theParamicsSimMgr.getParamicsNetworkLoaded();
     }
 
     public long getCurrentSimulationTime() throws RemoteException
     {
-        return CADSimulator.theSimulationCntrlMgr.getCurrentSimTime();
+        return CADServer.theSimulationCntrlMgr.getCurrentSimTime();
     }
 
@@ -418 +418 @@
     {
 
-        if (!CADSimulator.theSimulationCntrlMgr.simulationStarted())
+        if (!CADServer.theSimulationCntrlMgr.simulationStarted())
         {
             throw new ScriptException(ScriptException.SIM_NOT_STARTED);
         }
-        else if (!CADSimulator.theIncidentMgr.areIncidentsLoaded())
+        else if (!CADServer.theIncidentMgr.areIncidentsLoaded())
         {
             throw new ScriptException(ScriptException.NO_SCRIPT_LOADED);
         }
 
-        CADSimulator.theIncidentMgr.triggerIncident(incidentNumber,
-                CADSimulator.theSimulationCntrlMgr.getCurrentSimTime());
+        CADServer.theIncidentMgr.triggerIncident(incidentNumber,
+                CADServer.theSimulationCntrlMgr.getCurrentSimTime());
     }
 
     public void deleteIncident(Integer incidentNumber) throws RemoteException, ScriptException
     {
-        CADSimulator.theIncidentMgr.deleteIncident(incidentNumber);
-
-        if (CADSimulator.theIncidentMgr.getIncidentList().size() == 0)
+        CADServer.theIncidentMgr.deleteIncident(incidentNumber);
+
+        if (CADServer.theIncidentMgr.getIncidentList().size() == 0)
         {
             setScriptStatus(SCRIPT_STATUS.NO_SCRIPT);
         }
 
-        if (managerInt != null)
+        if (simMgr != null)
         {
             try
             {
-                managerInt.incidentRemoved(incidentNumber);
+                simMgr.incidentRemoved(incidentNumber);
             } catch (RemoteException re)
             {
                 //Simulation Manager has disappeared
-                managerInt = null;
+                simMgr = null;
                 cadModel.setSimManagerStatus(false);
 
@@ -461 +461 @@
     {
 
-        if (newTime < CADSimulator.theSimulationCntrlMgr.getCurrentSimTime())
+        if (newTime < CADServer.theSimulationCntrlMgr.getCurrentSimTime())
         {
             throw new ScriptException(ScriptException.TIME_PASSED);
         }
 
-        CADSimulator.theIncidentMgr.rescheduleIncident(incidentNumber, newTime);
+        CADServer.theIncidentMgr.rescheduleIncident(incidentNumber, newTime);
     }
 
@@ -472 +472 @@
     {
 
-        CADSimulator.theIncidentMgr.addIncident(newIncident);
-
-        if (managerInt != null)
+        CADServer.theIncidentMgr.addIncident(newIncident);
+
+        if (simMgr != null)
         {
             try
             {
-                managerInt.incidentAdded(newIncident);
+                simMgr.incidentAdded(newIncident);
             } catch (RemoteException re)
             {
                 //Simulation Manager has disappeared
-                managerInt = null;
+                simMgr = null;
                 cadModel.setSimManagerStatus(false);
 
@@ -497 +497 @@
         try
         {
-            CADSimulator.theIncidentMgr.clearIncidents();
+            CADServer.theIncidentMgr.clearIncidents();
             cadData.clearData();
 
@@ -507 +507 @@
             cadData.setUnitsFromXML(sh.getUnits());
             refreshClients();
-            CADSimulator.theIncidentMgr.addIncidents(sh.getIncidents());
+            CADServer.theIncidentMgr.addIncidents(sh.getIncidents());
 
             resetSimulation();
@@ -519 +519 @@
     public Vector<Incident> getIncidentList() throws RemoteException
     {
-        return CADSimulator.theIncidentMgr.getIncidentList();
+        return CADServer.theIncidentMgr.getIncidentList();
     }
 
     public TreeMap<Integer, Vector<IncidentEvent>> getTriggeredEvents() throws RemoteException
     {
-        return CADSimulator.theIncidentMgr.getTriggeredEvents();
+        return CADServer.theIncidentMgr.getTriggeredEvents();
     }
 
     public SCRIPT_STATUS getScriptStatus() throws RemoteException
     {
-        if (CADSimulator.theIncidentMgr.areIncidentsLoaded())
-        {
-            if (CADSimulator.theSimulationCntrlMgr.simulationStarted())
+        if (CADServer.theIncidentMgr.areIncidentsLoaded())
+        {
+            if (CADServer.theSimulationCntrlMgr.simulationStarted())
             {
                 return SCRIPT_STATUS.SCRIPT_RUNNING;
@@ -537 +537 @@
             else
             {
-                for (Incident inc : CADSimulator.theIncidentMgr.getIncidentList())
+                for (Incident inc : CADServer.theIncidentMgr.getIncidentList())
                 {
                     if (inc.hasOccured() == true)
@@ -599 +599 @@
     {
         CMSDiversionDB.getInstance().updateDiversions(theDiversion);
-        CADSimulator.theParamicsSimMgr.updateDiversion(theDiversion);
+        CADServer.theParamicsSimMgr.updateDiversion(theDiversion);
     }
 
@@ -614 +614 @@
     {
 
-        long currentSimTime = CADSimulator.theSimulationCntrlMgr.getCurrentSimTime();
+        long currentSimTime = CADServer.theSimulationCntrlMgr.getCurrentSimTime();
 
         IncidentEvent triggeredEvent = new IncidentEvent(currentSimTime);
         triggeredEvent.eventInfo = modelInfo;
 
-        triggeredEvent.finalizeEvent(currentSimTime, CADSimulator.getCADTime());
-
-        CADSimulator.theIncidentMgr.updateIncident(modelInfo.getLogNumber(), triggeredEvent);
+        triggeredEvent.finalizeEvent(currentSimTime, CADServer.getCADTime());
+
+        CADServer.theIncidentMgr.updateIncident(modelInfo.getLogNumber(), triggeredEvent);
 
         updateIncidentInGUI(modelInfo.getLogNumber(), triggeredEvent);
@@ -633 +633 @@
      * ParamicsControlManager to send an IncidentUpdate.
      *
-     * @see SimulationControlManager
+     * @see SimulationClockManager
      * @see ParamicsControlManager
      * @see IncidentManager
@@ -639 +639 @@
     public void tick()
     {
-        if (CADSimulator.theSimulationCntrlMgr.simulationStarted())
-        {
-
-            final long currentSimTime = CADSimulator.theSimulationCntrlMgr.getCurrentSimTime();
+        if (CADServer.theSimulationCntrlMgr.simulationStarted())
+        {
+
+            final long currentSimTime = CADServer.theSimulationCntrlMgr.getCurrentSimTime();
 
             Runnable timeRun = new Runnable()
@@ -653 +653 @@
                     if (currentSimTime % 30 == 0)
                     {
-                        CADSimulator.theParamicsSimMgr.sendIncidentUpdate(currentSimTime);
+                        CADServer.theParamicsSimMgr.sendIncidentUpdate(currentSimTime);
                     }
 
-                    if (managerInt != null)
+                    if (simMgr != null)
                     {
                         try
                         {
-                            managerInt.tick(currentSimTime);
+                            simMgr.tick(currentSimTime);
                         } catch (RemoteException re)
                         {
                             //Simulation Manager has disappeared
-                            managerInt = null;
+                            simMgr = null;
                             cadModel.setSimManagerStatus(false);
 
@@ -672 +672 @@
                     }
 
-                    CADSimulator.theIncidentMgr.tick(currentSimTime);
+                    CADServer.theIncidentMgr.tick(currentSimTime);
                 }
             };
@@ -699 +699 @@
             public void run()
             {
-                if (managerInt != null)
+                if (simMgr != null)
                 {
                     try
                     {
-                        managerInt.incidentStarted(completedEvent.eventInfo.getLogNumber());
+                        simMgr.incidentStarted(completedEvent.eventInfo.getLogNumber());
                     } catch (RemoteException re)
                     {
                         //Simulation Manager has disappeared
-                        managerInt = null;
+                        simMgr = null;
                         cadModel.setSimManagerStatus(false);
 
@@ -740 +740 @@
         for (XMLIncident xmlInc : completedEvent.XMLIncidents)
         {
-            CADSimulator.theParamicsSimMgr.updateIncident(xmlInc);
+            CADServer.theParamicsSimMgr.updateIncident(xmlInc);
         }
 
@@ -753 +753 @@
             public void run()
             {
-                if (managerInt != null)
+                if (simMgr != null)
                 {
                     try
                     {
-                        managerInt.eventOccured(
+                        simMgr.eventOccured(
                                 completedEvent.eventInfo.getLogNumber(),
                                 completedEvent);
@@ -763 +763 @@
                     {
                         //Simulation Manager has disappeared
-                        managerInt = null;
+                        simMgr = null;
                         cadModel.setSimManagerStatus(false);
 
@@ -782 +782 @@
     public boolean incidentExists(Integer logNumber)
     {
-        return CADSimulator.theIncidentMgr.incidentExists(logNumber);
+        return CADServer.theIncidentMgr.incidentExists(logNumber);
     }
 
@@ -790 +790 @@
     public Vector<IncidentBoardModel_obj> getIncidentBoardModelObjects()
     {
-        return CADSimulator.theIncidentMgr.getIncidentBoardModelObjects();
+        return CADServer.theIncidentMgr.getIncidentBoardModelObjects();
     }
 
@@ -798 +798 @@
     public Vector<IncidentInquiryModel_obj> getIncidentInquiryModelObjects(Integer logNumber)
     {
-        return CADSimulator.theIncidentMgr.getIncidentInquiryModelObjects(logNumber);
+        return CADServer.theIncidentMgr.getIncidentInquiryModelObjects(logNumber);
     }
 
@@ -806 +806 @@
     public Vector<IncidentSummaryModel_obj> getIncidentSummaryModelObjects()
     {
-        return CADSimulator.theIncidentMgr.getIncidentSummaryModelObjects();
+        return CADServer.theIncidentMgr.getIncidentSummaryModelObjects();
     }