Changeset 349 in tmcsimulator for trunk

Timestamp:

03/27/2019 03:01:27 PM (7 years ago)

Author:

jdalbey

Message:

tmcsim.common package: Added class TimeUtils?.java and moved longtotime() into it from SimulationManagerView?.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/Coordinator.java (modified) (3 diffs)
• common/TimeUtils.java (added)
• simulationmanager/SimulationManagerView.java (modified) (3 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Mon, 25 Mar 2019 20:51:26 -0700
+#Wed, 27 Mar 2019 16:27:44 -0700
 
-Application.revision=346
+Application.revision=348
 
-Application.buildnumber=112
+Application.buildnumber=114

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -67 +67 @@
 import tmcsim.common.SimulationException;
 import tmcsim.common.XMLIncident;
+import tmcsim.common.TimeUtils;
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.CoordinatorInterface;
@@ -95 +96 @@
      * The name of the file where the simulation clock time is written
      */
-    public static final String kSimClockFilename = "webapps/sim_clock.json";
+    public static final String kSimClockFilename = "webapps" + 
+            System.getProperty("file.separator") + "sim_clock.json";
     /**
      * Error logger.
@@ -717 +719 @@
                         // Format output as json
                         String lineout =  "{\"clock\":\"" 
-                                + SimulationManagerView.longToTime(currentSimTime) + "\"}";
+                                + TimeUtils.longToTime(currentSimTime) + "\"}";
                         writer.println(lineout);
                         writer.close();

trunk/src/tmcsim/simulationmanager/SimulationManagerView.java

@@ -41 +41 @@
 import tmcsim.common.CADEnums.PARAMICS_STATUS;
 import tmcsim.common.CADEnums.SCRIPT_STATUS;
+import tmcsim.common.TimeUtils;
 import tmcsim.simulationmanager.actions.AddIncidentAction;
 import tmcsim.simulationmanager.actions.ApplyDiversionAction;
@@ -329 +330 @@
         currentSimulationTime = time;
         
-        String newTime = longToTime(currentSimulationTime);
+        String newTime = TimeUtils.longToTime(currentSimulationTime);
         
         simulationClockLabel.setText(newTime);
@@ -631 +632 @@
     }
     
-    /**
-     * Converts a the long representation of the time, to the H:MM:SS String format
-     *
-     * @param seconds number of seconds.
-     * @return String H:MM:SS time representation.
-     */
-    public static String longToTime(long seconds) {
-        String time = new String();     
-        long timeSegment;   
-        
-        timeSegment = seconds / 3600;
-        time += String.valueOf(timeSegment) + ":";      
-        
-        seconds = seconds % 3600;
-        
-        timeSegment = seconds / 60;
-        if(timeSegment < 10)
-            time += "0";
-        
-        time += String.valueOf(timeSegment) + ":";      
-        seconds = seconds % 60; 
-        
-        timeSegment = seconds;
-        if(timeSegment < 10)
-            time += "0";
-        
-        time += String.valueOf(timeSegment);
-        
-        return time;        
-    }
-
     /**
      * This method is used to disply a message dialog with the received