Changeset 360 in tmcsimulator for trunk

Timestamp:

04/09/2019 03:46:18 PM (7 years ago)

Author:

jdalbey

Message:

add spike ShowUserDir?.java

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (1 diff)
• config/testConfig/traffic_model_config.properties (modified) (1 diff)
• src/spikes/ShowUserDir.java (added)
• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/CADServer.java (modified) (9 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -271 +271 @@
         </manifest>
       </jar>
+      <!--                   *** Spike Only Jar ***         -->
+      <jar destfile="${deploy.dir}/ShowUserDir.jar"
+       basedir="${build.dir}/classes"
+       includes="spikes/**"
+       excludes="**/Test.class">
+        <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>
+        <manifest>
+            <attribute name="Main-Class" value="spikes/ShowUserDir"/>
+        </manifest>
+      </jar>
       
 </target>

trunk/config/testConfig/traffic_model_config.properties

@@ -1 +1 @@
 Highways_Map_File = config/vds_data/highways_triangle.txt
+#Highways_Map_File = config/vds_data/highways_fullmap.txt
 #Events_File = config/vds_data/single_event_55S.txt
 Events_File = config/vds_data/atmsBatchEvents.txt

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 04 Apr 2019 11:09:39 -0700
+#Thu, 04 Apr 2019 15:32:24 -0700
 
-Application.revision=355
+Application.revision=356
 
-Application.buildnumber=119
+Application.buildnumber=121

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -181 +181 @@
      * Properties file for the CADSimulator.
      */
-    private Properties cadSimulatorProperties;
+    private Properties cadServerProperties;
 
     /**
@@ -199 +199 @@
         try
         {
-            cadSimulatorProperties = new Properties();
-            cadSimulatorProperties.load(new FileInputStream(propertiesFile));
+            cadServerProperties = new Properties();
+            cadServerProperties.load(new FileInputStream(propertiesFile));
             cadSimLogger.logp(Level.INFO, "CADSimulator", "Constructor",
                     "Properties loaded from " + propertiesFile);
@@ -219 +219 @@
         {
             String userInterfaceName =
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.USER_INTERFACE.name);
             if (userInterfaceName == null)
@@ -244 +244 @@
 
             startRegistry(Integer.parseInt(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.COOR_RMI_PORT.name).trim()));
             startRegistry(Integer.parseInt(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.CAD_RMI_PORT.name).trim()));
 
@@ -253 +253 @@
 
             theATMSMgr = new ATMSManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.ATMS_PROP_FILE.name));
             
             theTrafficMgr = new TrafficModelManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.TRAFFICMGR_PROP_FILE.name),
                     theCoordinator);
@@ -264 +264 @@
 
             theMediaMgr = new MediaManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.MEDIA_PROP_FILE.name),
                     theATMSMgr, theModel);
 
             theParamicsSimMgr = new ParamicsSimulationManager(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.PARAMICS_PROP_FILE.name),
                     theCoordinator, theMediaMgr);
 
             theSoundPlayer = new SoundPlayer(
-                    cadSimulatorProperties.getProperty(
+                    cadServerProperties.getProperty(
                     CAD_PROPERTIES.AUDIO_LOCATION.name));
             theSoundPlayer.start();
@@ -283 +283 @@
             //Begin accepting Client connections
             CADSimulatorSocketHandler tmsh = new CADSimulatorSocketHandler(
-                    Integer.parseInt(cadSimulatorProperties.getProperty(
+                    Integer.parseInt(cadServerProperties.getProperty(
                     CAD_PROPERTIES.CLIENT_PORT.name).trim()));
             tmsh.start();
@@ -297 +297 @@
         try
         {
-            if (cadSimulatorProperties.getProperty(
+            if (cadServerProperties.getProperty(
                     CAD_PROPERTIES.CMS_XML_FILE.name) != null)
             {
                 CMSDiversionDB.getInstance().loadFromXML(
                         DocumentBuilderFactory.newInstance().newDocumentBuilder()
-                        .parse(new File(cadSimulatorProperties.getProperty(
+                        .parse(new File(cadServerProperties.getProperty(
                         CAD_PROPERTIES.CMS_XML_FILE.name))));
             }
@@ -311 +311 @@
 
             JOptionPane.showMessageDialog(new JWindow(), "Unable to open "
-                    + cadSimulatorProperties.getProperty(CAD_PROPERTIES.CMS_XML_FILE.name),
+                    + cadServerProperties.getProperty(CAD_PROPERTIES.CMS_XML_FILE.name),
                     "Initialization Error", JOptionPane.WARNING_MESSAGE);
         }