Changeset 242 for trunk/hiptop/pester/net/sabi/pester/AlarmListView.java

Timestamp:

07/09/06 00:47:17 (18 years ago)

Author:

Nicholas Riley

Message:

Basic functionality works.

File:

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

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

@@ -35 +35 @@
     private Menu sPeriodUnitsMenu;
     private PopupMenu sPeriodUnitsPopup;
+    // XXX don't allow <5 second repeating alarms
     private CheckBox sRepeatCheckBox;
     private DateTimeEditor sTimeEditor, sDateEditor;
@@ -128 +129 @@
     protected void constrainDate() {
         // XXX schedule every minute (second?) if in AT mode
+        // XXX could use onPeriodicPulse() perhaps
         Date now = new Date();
         sDateEditor.min(now);
         sDatePicker.min(now);
-        sSetAlarmButton.setEnabled(editingDate().compareTo(now) > 0);
+        sSetAlarmButton.setEnabled(sInButton.getValue() == 1 ||
+                                   editingDate().compareTo(now) > 0);
     }
 
@@ -153 +156 @@
                 sAlarmList.addItem(sEditingAlarm);
                 setFocusedItem(sEditingAlarm);
-                sFocusedAlarm = sEditingAlarm; // XXX do we need this?
+                sFocusedAlarm = sEditingAlarm;
             } else {
                 sEditingAlarm.update();
             }
         case EVENT_CANCEL_ALARM:
-            if (sEditingAlarm == sFocusedAlarm) { // existing alarm
-                // XXX (re)schedule alarm
-                sEditingAlarm.endEditing();
-            }
+            if (sEditingAlarm == sFocusedAlarm)
+                sEditingAlarm.schedule();
             sEditingAlarm = null;
             return true;
@@ -170 +171 @@
         case EVENT_IN:
             sAtButton.setValue(0);
+            constrainDate();
             return true;
         case EVENT_AT:
@@ -177 +179 @@
         case EVENT_TIME_EDITOR:
             Date date = editingDate();
-            // XXX factor this out (it's used twice)
             // XXX do this on exit from the field, not on change
             if (date.compareTo(new Date()) <= 0) {
@@ -214 +215 @@
     }
     public void onItemRemoved(ActiveList list, Object item, int index) {
+        ((Alarm)item).cancel();
         sAlarmListWindow.updateAlarmCount();
         super.onItemRemoved(list, item, index);