Changeset 270 for trunk/hiptop

Timestamp:

07/20/06 22:43:43 (18 years ago)

Author:

Nicholas Riley

Message:

Fix auto-day increment (Date.setToday() doesn't set today, it sets _now_). Save/restore the period regardless of the alarm type, so we don't end up with 1-second periods. Read the time from the time editor when the date picker is focused - less consistency, but easier to understand.

File:

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

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

@@ -99 +99 @@
     protected void editAlarm(Alarm alarm) {
         mMessageField.setText(alarm.getMessage());
-
-        boolean usesPeriod = alarm.getUsesPeriod();
-        if (usesPeriod) {
-            int period = alarm.getPeriod();
+        
+        int period = alarm.getPeriod();
+        if (period > 0) {
             for (int i = mPeriodUnitsPopup.itemCount() - 1 ; i >= 0 ; --i) {
                 int unitsPerSec = mPeriodUnitsPopup.getItem(i).getEvent().data;
@@ -116 +115 @@
         editDate(new Date(alarm.getDate()));
 
+        boolean usesPeriod = alarm.getUsesPeriod();
         mInButton.setValue(usesPeriod ? 1 : 0);
         mAtButton.setValue(usesPeriod ? 0 : 1);
@@ -166 +166 @@
         } else {
             date = mDateEditor.getDate();
-            DEBUG.p("+ time editor.getTime = " + Alarm.dateTimeString(date, false));
             date.setSeconds(0);
-            DEBUG.p("+ seconds 0 = " + Alarm.dateTimeString(date, false));
         }
         return date;
@@ -225 +223 @@
                 return true;
             mEditingAlarm.setMessage(mMessageField.toString());
-            if (isIn()) {
-                mEditingAlarm.setPeriod(editingInterval(),
-                                        mRepeatCheckBox.getValue() == 1);
-            } else {
+            // set the period regardless, so it gets saved for future use
+            mEditingAlarm.setPeriod(editingInterval(),
+                                    mRepeatCheckBox.getValue() == 1);
+            if (!isIn()) { // otherwise, date = current time + period
                 mEditingAlarm.setDate(editingDate());
             }
@@ -266 +264 @@
             Date date = editingDate();
             Date now = new Date();
-            if (date.compareTo(now) <= 0) {
-                date.setToday();
+            if (date.compareTo(now) <= 0) { // XXX do with 1 minute fuzz
+                int time = date.getTime();
+                date.set(now); // idiotically, setToday() sets the time too
+                date.setTime(time);
                 if (date.compareTo(now) <= 0)
                     date.addDays(1); // tomorrow
@@ -282 +282 @@
         {
             Date date = (Date)e.argument;
-            date.setTime(mDateEditor.getDate().getTime());
+            date.setTime(mTimeEditor.getDate().getTime());
             mTimeEditor.setDate(date);
             mDateEditor.setDate(date);