Changeset 425 in tmcsimulator

Timestamp:

06/24/2019 04:47:05 PM (7 years ago)

Author:

jdalbey

Message:

build.xml updated to include new highway model package. CADlogDisplay altered to show only user entries not scripted ones.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (1 diff)
• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/client/CADlogDisplay.java (modified) (2 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -184 +184 @@
        includes="tmcsim/cadsimulator/**, tmcsim/common/**, tmcsim/interfaces/**,
                  tmcsim/client/cadclientgui/**, tmcsim/cadmodels/**, atmsdriver/model/**,
-                 tmcsim/application.properties"
+                 tmcsim/highwaymodel/**, tmcsim/application.properties"
        excludes="**/Test.class">
         <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar,jaco-mp3-player-0.9.3.jar"/>

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 23 Jun 2019 14:38:34 -0700
+#Mon, 24 Jun 2019 18:00:23 -0700
 
-Application.revision=423
+Application.revision=424
 
-Application.buildnumber=140
+Application.buildnumber=142

trunk/src/tmcsim/client/CADlogDisplay.java

@@ -69 +69 @@
      */
     private CADClientSocket theClientSocket;
-    /**
-     * Instance of the ClockView.
-     */
-    private ClockView theView;
+
     /**
      * Properties object for the CADClient class.
@@ -132 +129 @@
                             sb.append(notesTable.getValueAt(row,1) + " "); // time
                             String initials = (String) notesTable.getValueAt(row,2); // initials
-                            // If there are no user intials, it's a scripted item
-                            if (initials.length() == 0)
+                            // If there are user intials, include this item.
+                            // Zero length initials mean it's a scripted item
+                            if (initials.length() > 0)
                             {
-                                initials = "Script";
+                                sb.append(initials + " ");
+                                sb.append(notesTable.getValueAt(row,4) + "\n"); // notes
                             }
-                            sb.append(initials + " ");
-                            sb.append(notesTable.getValueAt(row,4) + "\n"); // notes
                         }
                     }