Changeset 158 in tmcsimulator for trunk

Timestamp:

10/21/2017 11:28:15 AM (9 years ago)

Author:

jdalbey

Message:

ATMSBatchDriver: Removed diagnostic output of ATMS time. build.xml fixed ATMSBatchDriver.jar target.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (2 diffs)
• src/tmcsim/client/ATMSBatchDriver.java (modified) (3 diffs)
• src/tmcsim/client/ATMSBatchViewer.form (modified) (1 diff)
• src/tmcsim/client/ATMSBatchViewer.java (modified) (1 diff)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -237 +237 @@
         </manifest>
       </jar>
+      
+      <!--                   *** ATMS Batch Driver Only Jar ***         -->
+      <jar destfile="${deploy.dir}/ATMSBatchDriver.jar"
+       basedir="${build.dir}/classes"
+       includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**,
+                 tmcsim/client/cadclientgui/**, tmcsim/cadmodels/**,
+                 atmsdriver/**, atmsdriver.model/**"
+       excludes="**/Test.class">
+        <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>
+        <manifest>
+            <attribute name="Main-Class" value="tmcsim/client/ATMSBatchDriver"/>
+        </manifest>
+      </jar>
 </target>
 
@@ -250 +263 @@
 </target>
 
-    <!--
-
-    There exist several targets which are by default empty and which can be
-    used for execution of your tasks. These targets are usually executed
-    before and after some main targets. They are:
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported
-    nbproject/build-impl.xml file.
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are:
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="TMCSim-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on
-    the compile target as the regular run target does. Again, for a list of available
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file.
-
-    -->
 </project>

trunk/src/tmcsim/client/ATMSBatchDriver.java

@@ -141 +141 @@
             System.exit(0);
         }
+        // Initialize the highway model
         incidents = new HashMap<String, List<String>> ();
         highways = new Highways(
@@ -175 +176 @@
                     long simtime = theCoorInt.getCurrentSimulationTime();
                     currentClock = formatInterval(simtime);
-                    long ATMStime = theCoorInt.getATMStime();       
-                    Date atmsdate = new Date(ATMStime);
-                    currentATMStime = formatter.format(atmsdate);
+                    // For Debugging, show the ATMS time
+//                    long ATMStime = theCoorInt.getATMStime();       
+//                    Date atmsdate = new Date(ATMStime);
+//                    currentATMStime = formatter.format(atmsdate);
                     try {
                         simClock = formatter.parse(currentClock);
@@ -188 +190 @@
                 } catch (RemoteException ex)
                 {
+                    System.out.println("Remote Exception reading sim or ATMS clock time");
                     Logger.getLogger(ATMSBatchDriver.class.getName()).log(Level.SEVERE, null, ex);
                 }

trunk/src/tmcsim/client/ATMSBatchViewer.form

@@ -4 +4 @@
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="3"/>
+    <Property name="title" type="java.lang.String" value="ATMS Batch Driver"/>
   </Properties>
   <SyntheticProperties>

trunk/src/tmcsim/client/ATMSBatchViewer.java

@@ -75 +75 @@
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+        setTitle("ATMS Batch Driver");
 
         lstEvents.setFont(new java.awt.Font("Noto Mono", 0, 12)); // NOI18N