Changeset 269 for trunk/hiptop

Timestamp:

07/20/06 20:09:20 (18 years ago)

Author:

Nicholas Riley

Message:

Make date constraints behave predictably. Fix flashing Set button when typing message while date is invalid.

File:

• trunk/hiptop/pester/net/sabi/pester/AlarmSetDialog.java (modified) (8 diffs)

trunk/hiptop/pester/net/sabi/pester/AlarmSetDialog.java

@@ -56 +56 @@
         mMessageField =
             (TypeAheadTextField)getDescendantWithID(ID_MESSAGE_FIELD);
-        disableBottomRightButtonOnEmptyField(mMessageField);
         mInButton = (RadioButton)getDescendantWithID(ID_IN_BUTTON);
         mAtButton = (RadioButton)getDescendantWithID(ID_AT_BUTTON);
@@ -91 +90 @@
     }
 
+    protected void editDate(Date date) {
+        // time and date editors must share the same date object
+        mTimeEditor.setDate(date);
+        mDateEditor.setDate(date);
+        mDatePicker.setDate(date);
+    }
+
     protected void editAlarm(Alarm alarm) {
         mMessageField.setText(alarm.getMessage());
@@ -108 +114 @@
         }
 
-        Date date = new Date(alarm.getDate());
-        mTimeEditor.setDate(date);
-        mDateEditor.setDate(date);
-        mDatePicker.setDate(date);
+        editDate(new Date(alarm.getDate()));
 
         mInButton.setValue(usesPeriod ? 1 : 0);
@@ -162 +165 @@
             date.addSeconds(editingInterval());
         } else {
-            // XXX is it necessary to do this, or do the two share the
-            // XXX same physical Date object?
             date = mDateEditor.getDate();
-            date.setTime(mTimeEditor.getDate().getTime());
+            DEBUG.p("+ time editor.getTime = " + Alarm.dateTimeString(date, false));
             date.setSeconds(0);
+            DEBUG.p("+ seconds 0 = " + Alarm.dateTimeString(date, false));
         }
         return date;
@@ -179 +181 @@
         }
         Date now = new Date();
-        mDateEditor.min(now);
-        mDatePicker.min(now);
         Date editingDate = editingDate();
         if (isIn()) {
@@ -193 +193 @@
             mValidateAlarm.resetWake(secondsUntilDate);
         }
+        // we read the time from the date editor; if we constrain it to
+        // absolutely now, we won't read an earlier time even if the time
+        // editor sets it
+        now.setTime(0);
+        mDateEditor.min(now);
+        mDatePicker.min(now);
         mStatusBox.setText(Alarm.dateTimeString(editingDate, true));
         return true;
@@ -257 +263 @@
             return true;
         case EVENT_DATE_EDITOR_TOOK_FOCUS:
+        {
             Date date = editingDate();
-            if (date.compareTo(new Date()) <= 0) {
-                date.addDays(1);
-                mDatePicker.setDate(date);
-                mDateEditor.setDate(date);
-            }
-            validate();
-            return true;
+            Date now = new Date();
+            if (date.compareTo(now) <= 0) {
+                date.setToday();
+                if (date.compareTo(now) <= 0)
+                    date.addDays(1); // tomorrow
+                editDate(date);
+            }
+            validate();
+            return true;
+        }
         case EVENT_DATE_EDITOR:
             mDatePicker.setDate(mDateEditor.getDate());
@@ -270 +280 @@
             return true;
         case EVENT_DATE_PICKER:
-            mDateEditor.setDate((Date)e.argument);
-            validate();
-            return true;
+        {
+            Date date = (Date)e.argument;
+            date.setTime(mDateEditor.getDate().getTime());
+            mTimeEditor.setDate(date);
+            mDateEditor.setDate(date);
+            validate();
+            return true;
+        }
         }
         return super.receiveEvent(e);