Changeset 4748

Timestamp:

06/05/08 10:04:07 (6 months ago)

Author:

marc.englund@…

Message:

Fixes #1756 (time reverted to current when changing date)

Location:

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui

Files:

• IDateField.java (modified) (1 diff)
• Time.java (modified) (5 diffs)

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java

@@ -156 +156 @@
     }
 
+    public int getShowingMilliseconds() {
+        return (int) (showingDate.getTime() - showingDate.getTime() / 1000 * 1000);
+    }
+
+    public void setShowingMilliseconds(int ms) {
+        showingDate.setTime(showingDate.getTime() / 1000 * 1000 + ms);
+    }
+
     public int getCurrentResolution() {
         return currentResolution;

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/Time.java

@@ -258 +258 @@
             }
             datefield.getCurrentDate().setHours(h);
+            datefield.getShowingDate().setHours(h);
             datefield.getClient().updateVariable(datefield.getId(), "hour", h,
                     datefield.isImmediate());
@@ -264 +265 @@
             final int m = mins.getSelectedIndex();
             datefield.getCurrentDate().setMinutes(m);
+            datefield.getShowingDate().setMinutes(m);
             datefield.getClient().updateVariable(datefield.getId(), "min", m,
                     datefield.isImmediate());
@@ -270 +272 @@
             final int s = sec.getSelectedIndex();
             datefield.getCurrentDate().setSeconds(s);
+            datefield.getShowingDate().setSeconds(s);
             datefield.getClient().updateVariable(datefield.getId(), "sec", s,
                     datefield.isImmediate());
@@ -276 +279 @@
             final int ms = msec.getSelectedIndex();
             datefield.setMilliseconds(ms);
+            datefield.setShowingMilliseconds(ms);
             datefield.getClient().updateVariable(datefield.getId(), "msec", ms,
                     datefield.isImmediate());
@@ -283 +287 @@
                     * 12;
             datefield.getCurrentDate().setHours(h);
+            datefield.getShowingDate().setHours(h);
             datefield.getClient().updateVariable(datefield.getId(), "hour", h,
                     datefield.isImmediate());