Changeset 197 in tmcsimulator for trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

Timestamp:

10/30/2017 03:50:27 PM (9 years ago)

Author:

jdalbey

Message:

Deleted ATMSBatchDriver from clients folder. This is now obsolete since it's been integrated as a CAD Server Manager.

File:

• trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (7 diffs)

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

@@ -1 +1 @@
 package tmcsim.cadsimulator.managers;
 
-import atmsdriver.ConsoleTrafficDriver;
 import atmsdriver.model.Highways;
 import atmsdriver.model.LoopDetector;
@@ -19 +18 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Observable;
 import java.util.Properties;
 import java.util.Scanner;
@@ -31 +29 @@
 import tmcsim.cadsimulator.Coordinator;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
-import tmcsim.client.ATMSBatchDriver;
-import tmcsim.client.ATMSBatchViewer;
 import tmcsim.common.SimulationException;
 
@@ -162 +158 @@
                     catch (ParseException ex)
                     {
-                        Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+                        Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
                         System.out.println("Invalid simulation clock time found in ATMSDriverClient");
                         System.exit(-1);
@@ -171 +167 @@
                 {
                     System.out.println("Remote Exception reading sim or ATMS clock time");
-                    Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+                    Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
                 }
                 // If we have any events left to process
@@ -302 +298 @@
                     catch (ParseException ex)
                     {
-                        Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+                        Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
                         System.out.println("Wrong format data in batch event file: " + line + " \nskipping.");
                         System.out.println("Skipping badly formatted event.");
@@ -311 +307 @@
         catch (FileNotFoundException ex)
         {
-            Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
         }
         System.out.println("Events file read, " + eventList.size() + " events queued.");