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

Timestamp:

11/01/2017 12:31:34 PM (9 years ago)

Author:

jdalbey

Message:

TrafficModelManager?.java Refactor to use Observable, along with the view. Add Reload button functionality.

File:

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

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

@@ -18 +18 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Observable;
 import java.util.Properties;
 import java.util.Scanner;
+import java.util.Vector;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -38 +40 @@
  * @version 2.0
  */
-public class TrafficModelManager
+public class TrafficModelManager extends Observable
 {
     private final static int ONE_SECOND = 1000;
@@ -89 +91 @@
 
     /**
+     * Current simulation clock time
+     */
+    private String currentClock = "";
+    
+    /**
      * GUI for this driver
      */
-    private TrafficModelViewer theView;
+    //private TrafficModelViewer theView;
     
     /**
@@ -111 +118 @@
                 props.getProperty(PROPERTIES.FEPSIM_IP_ADDR.name),
                 8080); 
-
-        // Read the text file of events and put in a queue
-        FileInputStream fis = null;
-        try
-        {
-            fis = new FileInputStream(props.getProperty(PROPERTIES.EVENTS_FILE.name));
-        } catch (FileNotFoundException ex)
-        {
-            Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, 
-                    "Missing Traffic Events file " + props.getProperty(PROPERTIES.EVENTS_FILE.name));
-            System.exit(-1);
-        }
-        // Read all lines from the file of events
-        Scanner fileScanner = new Scanner(fis);        
-        eventQueue = readBatchFile(fileScanner);
-        // Extract the incidents and create a map
-        incidents = createIncidentMap(eventQueue);
-        // Launch the GUI display
-        theView = new TrafficModelViewer(this, new ArrayList<String>(incidents.keySet()));
-        theView.setVisible(true);
-        theView.update("0:00", "1:11", eventQueue);
-
+        
+        loadEvents();
+        
         // Create a timer that fetches the simulation time every second.
         Timer timer = new Timer(ONE_SECOND, new ActionListener()
@@ -139 +127 @@
             public void actionPerformed(ActionEvent e)
             {
-                String currentClock = "";
                 String currentATMStime = "";
                 Date simClock = new Date();
@@ -184 +171 @@
                         // Remove this event from the queue, we're done with it.
                         eventQueue.remove();
-                    }
-
-                    theView.update(currentClock, currentATMStime, eventQueue);
+                        setChanged();
+                        notifyObservers(getEventQueue());
+                    }
+                    setChanged();
+                    notifyObservers(currentClock);
                 }
             }
@@ -205 +194 @@
         
     }
-
+    /** Accessor to event queue
+     * 
+     * @return defensive copy of current queue of events
+     */
+    public LinkedList<TrafficEvent> getEventQueue()
+    {
+        return new LinkedList<TrafficEvent>(eventQueue);
+    }
+    public Vector<String> getIncidents()
+    {
+        return new Vector<String>(incidents.keySet());
+    }
+    public String getClockTime()
+    {
+        return currentClock;
+    }
+    public void loadEvents()
+    {
+        // Read the text file of events and put in a queue
+        FileInputStream fis = null;
+        try
+        {
+            fis = new FileInputStream(props.getProperty(PROPERTIES.EVENTS_FILE.name));
+        } catch (FileNotFoundException ex)
+        {
+            Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, 
+                    "Missing Traffic Events file " + props.getProperty(PROPERTIES.EVENTS_FILE.name));
+            System.exit(-1);
+        }
+        // Read all lines from the file of events
+        Scanner fileScanner = new Scanner(fis);        
+        eventQueue = readBatchFile(fileScanner);
+        // Extract the incidents and create a map
+        incidents = createIncidentMap(eventQueue);
+        setChanged();
+        notifyObservers("-:--");
+        setChanged();
+        notifyObservers(getIncidents());
+        setChanged();
+        notifyObservers(getEventQueue());
+    }
     /**
      * This method verifies that the needed configuration properties are not
@@ -327 +356 @@
 
         }
+        incidents.remove(incidentNumber);
         // Now refresh the view with the updated queue of events
-        theView.update("0:00", "0:00", eventQueue);
+        setChanged();
+        notifyObservers(getEventQueue());
+        setChanged();
+        notifyObservers(getIncidents());
     }
 
@@ -363 +396 @@
         {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new TrafficModelManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME,
+            TrafficModelManager mgr = new TrafficModelManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME,                    
             theCoordinator);
-
+            TrafficModelViewer view = new TrafficModelViewer(mgr);
+            view.setVisible(true);
+            mgr.addObserver(view);
         }
         catch (Exception e)