Changeset 471 in tmcsimulator for trunk/src/tmcsim

Timestamp:

07/29/2019 01:36:40 PM (7 years ago)

Author:

jdalbey

Message:

Coordinator.java: Fix defect 181 in sorting CADcomments. logging_service error messages improved.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/Coordinator.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sat, 27 Jul 2019 22:04:01 -0700
+#Mon, 29 Jul 2019 14:47:09 -0700
 
-Application.revision=467
+Application.revision=470
 
-Application.buildnumber=176
+Application.buildnumber=177

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -837 +837 @@
             public int compare(String o1, String o2) 
             {
-                return extractInt(o1) - extractInt(o2);
+                // extract just the timestamp from the strings and convert them to int
+                // fixes #181
+                return extractInt(o1.substring(0,8)) - extractInt(o2.substring(0,8));
             }
             // extract an integer from a String    
@@ -843 +845 @@
             {   // remove all non-digits
                 String num = s.replaceAll("\\D", "");
-                // return 0 if no digits found, else return the number
-                return num.isEmpty() ? 0 : Integer.parseInt(num);
+                try
+                {
+                    // return 0 if no digits found, else return the number
+                    return num.isEmpty() ? 0 : Integer.parseInt(num);
+                } catch (NumberFormatException ex)
+                {
+                    System.out.println("Can't convert "+s+" to integer in writeToCAD. " + 
+                    ex.getMessage());
+                    return 0;
+                }
             }
         });