Changeset 346 in tmcsimulator for trunk

Timestamp:

03/24/2019 07:19:23 PM (7 years ago)

Author:

jdalbey

Message:

Modify GotoTimeIndexDialog?.java to use TimeSelector? widget.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• simulationmanager/dialogs/GotoTimeIndexDialog.java (modified) (7 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 24 Mar 2019 11:13:40 -0700
+#Sun, 24 Mar 2019 20:49:11 -0700
 
-Application.revision=344
+Application.revision=345
 
 Application.buildnumber=110

trunk/src/tmcsim/simulationmanager/dialogs/GotoTimeIndexDialog.java

@@ -13 +13 @@
 import javax.swing.JDialog;
 import javax.swing.JLabel;
-import javax.swing.JSpinner;
+import javax.swing.UIManager;
 
 import tmcsim.simulationmanager.SimulationManagerView;
-import tmcsim.simulationmanager.model.IncidentTimeSpinnerModel;
-
+import timeselector.*;
 
 /**
@@ -26 +25 @@
  *
  * @author Matthew Cechini
- * @version
+ * Modifed to use timeselector by jdalbey 3/24/2019
  */
 @SuppressWarnings("serial")
@@ -47 +46 @@
         
         initComponents();   
-        
-        timeSpinner.setValue(initialValue);     
 
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
@@ -97 +94 @@
         });
         
-        incidentTimeModel = new IncidentTimeSpinnerModel();
-        timeSpinner = new JSpinner(incidentTimeModel);
-        timeSpinner.setMaximumSize(new Dimension(70,20));
-        timeSpinner.setAlignmentX(Box.CENTER_ALIGNMENT);
+        fldTimeSelection = new TimeSelectionField(false);
         
         buttonBox = new Box(BoxLayout.X_AXIS);
@@ -117 +111 @@
         gotoIndexBox.add(gotoLabel);
         gotoIndexBox.add(Box.createVerticalStrut(10));
-        gotoIndexBox.add(timeSpinner);
+        gotoIndexBox.add(fldTimeSelection);
         gotoIndexBox.add(Box.createVerticalStrut(10));
         gotoIndexBox.add(buttonBox);    
@@ -128 +122 @@
     
     /**
-     * Gets a string representation of the time set by the time
-     * spinner in the dialog.  Format:  H:MM:SS
-     * @return String representation of spinner time.
+     * Accessor to the String representation of user selected time. The text
+     * field contains a String representation of the time in a format produced
+     * by SimpleDateFormat pattern "h:mm:ss", e.g., "3:26:00"
+     *
+     * @return String containing the selected time.
      */
-    public String getGotoTime() {
-        return (String)timeSpinner.getValue();
+    public String getGotoTime() 
+    {
+        String result = fldTimeSelection.getText();
+        return result.substring(1, result.length());
     }   
     
+    /** Local main for unit testing */
+    public static void main(String[] args)
+    {
+        try
+        {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch (Exception ex)
+        {
+            ex.printStackTrace();
+        }
+
+        GotoTimeIndexDialog dlg = new GotoTimeIndexDialog(null,0);
+        System.out.println(dlg.getGotoTime());
+    }
     
     private JLabel gotoLabel;
-    private JSpinner timeSpinner;
-    
-    private IncidentTimeSpinnerModel incidentTimeModel;
     
     private JButton cancelButton;;
@@ -148 +157 @@
     private Box buttonBox;  
     
+    private TimeSelectionField fldTimeSelection;
 }