Changeset 310 in tmcsimulator

Timestamp:

03/13/2019 10:07:54 AM (7 years ago)

Author:

jdalbey

Message:

Fix defect #102. Also add revision number to filenames of deploy jars.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (4 diffs)
• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/Coordinator.java (modified) (1 diff)
• src/tmcsim/client/CADClient.java (modified) (1 diff)
• src/tmcsim/client/cadclientgui/data/CADData.java (modified) (1 diff)
• src/tmcsim/client/cadclientgui/data/Incident.java (modified) (1 diff)
• src/tmcsim/client/cadclientgui/screens/IncidentViewer.java (modified) (2 diffs)
• src/tmcsim/common/SimulationException.java (modified) (3 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -176 +176 @@
 
     <!--                   *** Build CAD Server Only Jar ***         -->
-      <jar destfile="${deploy.dir}/CADserver.jar"
+      <jar destfile="${deploy.dir}/CADserver_r${svna.version}.jar"
        basedir="${build.dir}/classes"
        includes="tmcsim/cadsimulator/**, tmcsim/common/**, tmcsim/interfaces/**,
@@ -189 +189 @@
 
       <!--                   *** Build Sim Manager Only Jar ***         -->
-      <jar destfile="${deploy.dir}/SimManager.jar"
+      <jar destfile="${deploy.dir}/SimManager_r${svna.version}.jar"
        basedir="${build.dir}/classes"
        includes="tmcsim/simulationmanager/**, tmcsim/common/**, tmcsim/cadmodels/**,
@@ -201 +201 @@
 
       <!--                   *** Build CAD Client Only Jar ***         -->
-      <jar destfile="${deploy.dir}/CADClient.jar"
+      <jar destfile="${deploy.dir}/CADClient_r${svna.version}.jar"
        basedir="${build.dir}/classes"
        includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**,
@@ -215 +215 @@
 
       <!--                   *** Build Clock Client Only Jar ***         -->
-      <jar destfile="${deploy.dir}/ClockClient.jar"
+      <jar destfile="${deploy.dir}/ClockClient_r${svna.version}.jar"
        basedir="${build.dir}/classes"
        includes="tmcsim/client/ClockClient*.class, tmcsim/client/ClockView.class,

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sat, 02 Mar 2019 15:51:02 -0800
+#Wed, 13 Mar 2019 10:54:57 -0700
 
-Application.revision=289
+Application.revision=306
 
-Application.buildnumber=102
+Application.buildnumber=107

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -500 +500 @@
 
         CADServer.theIncidentMgr.addIncident(newIncident);
-
+        cadData.addIncident(newIncident); // fixes #102
         if (simMgr != null)
         {

trunk/src/tmcsim/client/CADClient.java

@@ -287 +287 @@
             theCoorInt.registerForCallback(this);
         } catch (Exception e) {
-            throw new SimulationException(SimulationException.CAD_SIM_CONNECT,
+            throw new SimulationException(SimulationException.CAD_SIM_CONNECT,hostname,
                     e);
         }

trunk/src/tmcsim/client/cadclientgui/data/CADData.java

@@ -155 +155 @@
         incidents = incident;
     }
-
+    /**
+     * Add a single new incident to the list of incidents. Fixes #102
+     * @param incident a single new incident to be added
+     * @author jdalbey
+     */
+    public void addIncident(Incident incident)
+    {
+        incidents.add(incident);
+    }
+    
     /**
      * Returns the specified unitNum

trunk/src/tmcsim/client/cadclientgui/data/Incident.java

@@ -263 +263 @@
 
     public Long getIncidentLength() {
+        if (eventList.size() == 0) return 0L;
         return eventList.lastElement().secondsToOccurInIncident
                 - eventList.firstElement().secondsToOccurInIncident;

trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java

@@ -387 +387 @@
     private void saveComment(String commentMsg)
     {
-                DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
-                DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
-                // prepare fields to be added to comment table
-                String[] fields =
-                {
-                    dateFormat.format(new Date()),
-                    timeFormat.format(new Date()),
-                    ScreenManager.getUserName(), // Put username in "Initials" column
-                    "", // "Block" is left blank for now 
-                    commentMsg
-                };
-                try
-                {
-                    // insert a new row in the comment table
-                    ScreenManager.theCoordinator.addCadDataIncidentTable(
-                            INC_TABLE.COMMENTS_NOTES, incidentId, fields);
-                    ((DefaultTableModel) commentsNotesTable.getModel()).insertRow(0, fields);
-                } catch (RemoteException e)
-                {
-                    e.printStackTrace();
-                }
-        
+        DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
+        DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+        // prepare fields to be added to comment table
+        String[] fields =
+        {
+            dateFormat.format(new Date()),
+            timeFormat.format(new Date()),
+            ScreenManager.getUserName(), // Put username in "Initials" column
+            "", // "Block" is left blank for now 
+            commentMsg
+        };
+        try
+        {
+            // insert a new row in the comment table
+            ScreenManager.theCoordinator.addCadDataIncidentTable(
+                    INC_TABLE.COMMENTS_NOTES, incidentId, fields);
+            ((DefaultTableModel) commentsNotesTable.getModel()).insertRow(0, fields);
+        } catch (RemoteException e)
+        {
+            e.printStackTrace();
+        }
     }
-    // JD Add a mouselistener to the comments table to display a single cell
-    //  contents in a popup
-//    public MouseListener newCommentsTableCellListener()
-//    {
-//        return new MouseListener()
-//        {
-//            public void mousePressed(MouseEvent event)
-//            {
-//            }
-//
-//            public void mouseReleased(MouseEvent event)
-//            {
-//            }
-//
-//            public void mouseEntered(MouseEvent event)
-//            {
-//            }
-//
-//            public void mouseExited(MouseEvent event)
-//            {
-//            }
-//
-//            public void mouseClicked(MouseEvent event)
-//            {
-//                Point point = event.getPoint();
-//                int row, column;
-//                row = commentsNotesTable.rowAtPoint(point);
-//                column = commentsNotesTable.columnAtPoint(point);
-//                // See if the click was in column 4 (the comment column)
-//                if (column == 4)
-//                {
-//                    JOptionPane.showMessageDialog(null, getWrappedText((String) commentsNotesTable.getValueAt(row, column)),
-//                            "Comment/Note Text", JOptionPane.INFORMATION_MESSAGE);
-//                }
-//
-//            }
-//        };
-//    }
+
     private void initControllers()
     {
@@ -461 +423 @@
     }
 
-    /**
-     * A custom renderer that sets a tool tip with the wrapped comment. JD
-     */
-// Obsolete JD
-//    class LineWrapRenderer extends DefaultTableCellRenderer
-//    {
-//        public final static int kSegmentsize = 60;
-//
-//        protected void setValue(Object value)
-//        {
-//            String comment = (String) value;
-//            setText(comment);
-//            // Wrap long comments in a tooltip
-//            setToolTipText(getWrappedText(comment));
-//        }
-//    }
-//
-//    private String getWrappedText(String stringToWrap)
-//    {
-//        int limit = stringToWrap.length() / LineWrapRenderer.kSegmentsize;
-//        StringBuilder toolTip = new StringBuilder("<html>");
-//        for (int jumper = 0; jumper <= limit; jumper++)
-//        {
-//            toolTip.append(stringToWrap.substring(jumper * LineWrapRenderer.kSegmentsize, Math.min((jumper + 1) * LineWrapRenderer.kSegmentsize, stringToWrap.length())));
-//            toolTip.append("<br>");  // Use html break to cause a line break
-//        }
-//        toolTip.append("</html>");
-//        return toolTip.toString();
-//    }
     private void initLayout()
     {

trunk/src/tmcsim/common/SimulationException.java

@@ -19 +19 @@
      * Error Message: "Unable to connect to the CAD Simulator."
      */
-    public static final String CAD_SIM_CONNECT = "Unable to connect to the CAD Simulator.";
+    public static final String CAD_SIM_CONNECT = "Unable to connect to the CAD Server. "+
+            "Check that server is running at ";
     
     /** 
@@ -25 +26 @@
      * Error Message: "Unable to communicate with the CAD Simulator."
      */
-    public static final String CAD_SIM_COMM = "Unable to communicate with the CAD Simulator.";
+    public static final String CAD_SIM_COMM = "Unable to communicate with the CAD Server.";
     
     /** 
@@ -50 +51 @@
      * Error Message: "Unable to connect to the CAD Simulator."
      */
-    public static final String NULL_VIEW = "Unable to connect to the CAD Simulator.";
+    public static final String NULL_VIEW = "Unable to connect to the CAD Server.";
         
     /**