Changeset 210 in tmcsimulator for trunk/src/tmcsim/cadsimulator/CADServer.java

Timestamp:

11/02/2017 12:32:10 PM (9 years ago)

Author:

jdalbey

Message:

Integrate TrafficModelViewer? into the CAD Server GUI as an additional tab. Eliminates the separate window for traffic mgr view.

File:

• trunk/src/tmcsim/cadsimulator/CADServer.java (modified) (4 diffs)

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -21 +21 @@
 import tmcsim.cadsimulator.managers.SimulationClockManager;
 import tmcsim.cadsimulator.managers.TrafficModelManager;
-import tmcsim.cadsimulator.managers.TrafficModelViewer;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.SimulationException;
@@ -178 +177 @@
      */
     protected static TrafficModelManager theTrafficMgr = null;
-    private TrafficModelViewer trafficView = null;
     
     /**
@@ -259 +257 @@
                     CAD_PROPERTIES.TRAFFICMGR_PROP_FILE.name),
                     theCoordinator);
-            trafficView = new TrafficModelViewer(theTrafficMgr);
-             theTrafficMgr.addObserver(trafficView);
+            theTrafficMgr.addObserver(theViewer);
+            theTrafficMgr.run();
 
             theMediaMgr = new MediaManager(
@@ -315 +313 @@
 
         theViewer.setVisible(true);
-        trafficView.setVisible(true);
-
 
     }