Changeset 123 in tmcsimulator for trunk/src/tmcsim/cadsimulator/managers/IncidentManager.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/managers/IncidentManager.java (modified) (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);