Changeset 259 for trunk/hiptop

Timestamp:

07/20/06 02:05:30 (18 years ago)

Author:

Nicholas Riley

Message:

Sortable alarm list.

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• Alarm.java (modified) (3 diffs)
• AlarmListView.java (modified) (2 diffs)
• Alarms.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import danger.internal.Date;
 import danger.system.Hardware;
+import danger.text.Collator;
 import danger.util.LocaleUtils;
 import danger.util.StdActiveList;
@@ -15 +16 @@
 import danger.util.format.DateFormat;
 import danger.util.format.StringFormat;
-
-public class Alarm extends StdActiveObject {
+import java.util.Comparator;
+
+public class Alarm extends StdActiveObject implements Comparator {
     private static final int VERSION_1 = 1;
 
@@ -263 +265 @@
     }
 
+    public int compare(Object arg0, Object arg1) {
+        Alarm alarm0 = (Alarm)arg0, alarm1 = (Alarm)arg1;
+        int result = alarm0.getDate().compareTo(alarm1.getDate());
+        if (result != 0) return result;
+        result = Collator.getInstance().compare(alarm0.getMessage(),
+                                                alarm1.getMessage());
+        if (result != 0) return result;
+        return alarm0.hashCode() - alarm1.hashCode();
+    }
+
     public static final int TYPE_PERIODIC = 0;
     public static final int TYPE_PERIODIC_REPEATING = 1;

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

@@ -5 +5 @@
 import danger.ui.ActiveListView;
 import danger.util.ActiveList;
+import danger.util.DEBUG;
 
 public class AlarmListView extends ActiveListView
@@ -59 +60 @@
     public void onItemAdded(ActiveList list, Object item, int index) {
         sAlarmListWindow.updateAlarmCount();
+        super.onItemAdded(list, item, index);
+        // super's default behavior is to preserve the existing selection,
+        // which is admirable in general, but not what we want
         setFocus(index);
-        super.onItemAdded(list, item, index);
     }
     public void onItemRemoved(ActiveList list, Object item, int index) {

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

@@ -35 +35 @@
 
     public static void addAlarm(Alarm alarm) {
-        sAlarmList.addItem(alarm);
+        sAlarmList.insertItemSorted(alarm, alarm);
     }
     public static void removeAlarm(Alarm alarm) {
@@ -58 +58 @@
     }
 
-    /*
-    private static Alarm sAlarm0 = new Alarm();
-    private static Alarm sAlarm1 = new Alarm();
-    public int compare(Object arg0, Object arg1) {
-        
-        return Collator.getInstance().compare(
-    }
-    */
-
     static class Listener extends danger.app.Listener
         implements danger.util.ActiveList.ForEach {