Changeset 123 in tmcsimulator for trunk/src/tmcsim/cadsimulator/managers

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.

Location:

trunk/src/tmcsim/cadsimulator/managers

Files:

• IncidentManager.java (modified) (3 diffs)
• MediaManager.java (modified) (3 diffs)
• SimulationClockManager.java (moved) (moved from trunk/src/tmcsim/cadsimulator/managers/SimulationControlManager.java) (3 diffs)

trunk/src/tmcsim/cadsimulator/managers/IncidentManager.java

@@ -7 +7 @@
 import tmcsim.cadmodels.IncidentInquiryModel_obj;
 import tmcsim.cadmodels.IncidentSummaryModel_obj;
-import tmcsim.cadsimulator.CADSimulator;
+import tmcsim.cadsimulator.CADServer;
 import tmcsim.cadsimulator.Coordinator;
 import tmcsim.cadsimulator.SoundPlayer;
@@ -247 +247 @@
                 
             for(IncidentEvent event : inc.getCompletedEvents()) {
-                event.finalizeEvent(currentSimTime, CADSimulator.getCADTime());
+                event.finalizeEvent(currentSimTime, CADServer.getCADTime());
                 updateIncident(inc.getLogNumber(), event);
                 theCoordinator.updateIncidentInGUI(inc.getLogNumber(), event);
@@ -311 +311 @@
         if(targetIncident == null) {
             completedEvent.eventInfo.getHeader().logStatus    = "A";             
-            completedEvent.eventInfo.getHeader().incidentDate = CADSimulator.getCADDate().substring(0,4);  
-            completedEvent.eventInfo.getHeader().incidentTime = CADSimulator.getCADTime();
+            completedEvent.eventInfo.getHeader().incidentDate = CADServer.getCADDate().substring(0,4);  
+            completedEvent.eventInfo.getHeader().incidentTime = CADServer.getCADTime();
             
             targetIncident = new IncidentInquiryModel_obj(completedEvent.eventInfo);

trunk/src/tmcsim/cadsimulator/managers/MediaManager.java

@@ -19 +19 @@
 import tmcsim.cadsimulator.videocontrol.DVDStatusUpdate;
 import tmcsim.cadsimulator.videocontrol.DVDTitleUpdate;
-import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.CCTVDirections;
 import tmcsim.common.CCTVInfo;
@@ -74 +74 @@
     
     /** Reference to the CADSimulatorModel. */
-    private CADSimulatorModel theModel;
+    private CADSimulatorState theModel;
 
     /** Properties object for the Media portion of the CAD. */
@@ -90 +90 @@
      */
     public MediaManager(String propertiesFile, ATMSManager theATMSManager, 
-            CADSimulatorModel model) {
+            CADSimulatorState model) {
         theDVD_DB   = new DVDPlayerDB();        
         theImage_DB = new StillImagesDB();

trunk/src/tmcsim/cadsimulator/managers/SimulationClockManager.java

@@ -8 +8 @@
 import tmcsim.common.CADEnums.SCRIPT_STATUS;
 
-public class SimulationControlManager  {
+/** Manage the simulation clock, "the heartbeat of the simulation". */
+public class SimulationClockManager  {
 
     /** 
-     * 
+     * Define what happens every second.
      */
     private class ClockTask extends TimerTask {     
@@ -39 +40 @@
     
     
-    public SimulationControlManager(Coordinator coor) {
+    public SimulationClockManager(Coordinator coor) {
         
         theCoordinator    = coor;       
@@ -59 +60 @@
     
     public void startSimulation() {
-            
+        /** Start the clock running */    
         simTimer = new Timer();     
         simTimer.scheduleAtFixedRate(new ClockTask(), 0, 1000);