Changeset 296 for trunk/hiptop/pester/net/sabi/pester/Alarm.java

Timestamp:

07/29/06 00:53:01 (18 years ago)

Author:

Nicholas Riley

Message:

Better alarm debug description, datastore debugging; use absolute fire time for snoozed alarms too; replace the buggy alarm stack and misaligned sleep message with a painfully constructed alert.

File:

• trunk/hiptop/pester/net/sabi/pester/Alarm.java (modified) (3 diffs)

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

@@ -31 +31 @@
     // transient
     private int mState;
-    private int mAbsoluteFireTime; // valid if periodic and modified since reboot
+    private int mAbsoluteFireTime; // valid if periodic or snoozed,
+                                   // and modified since reboot
     private danger.app.Alarm mAlarm;
     private int mUID;
@@ -155 +156 @@
         if (mState != STATE_SCHEDULED)
             return;
-        if (getUsesPeriod() && mAbsoluteFireTime != -1) {
+        if (mAbsoluteFireTime != -1) {
             int realSecondsLeft = mAbsoluteFireTime - Hardware.getAbsoluteTime();
             mDate = new Date();
@@ -200 +201 @@
     public String description() {
         StringBuffer sb = new StringBuffer();
+        if (mUID != 0) sb.append('(').append(mUID).append(") ");
         switch (mState) {
-        case STATE_INVALID: sb.append("invalid "); break;
-        case STATE_EDITING: sb.append("editing "); break;
-        case STATE_SCHEDULED: sb.append("scheduled "); break;
+        case STATE_INVALID: sb.append("inv "); break;
+        case STATE_EDITING: sb.append("edi "); break;
+        case STATE_SCHEDULED: sb.append("sch "); break;
         }
         switch (mType) {
+        case TYPE_PERIODIC_REPEATING:
+            sb.append("r-");
         case TYPE_PERIODIC:
-            sb.append("periodic (").append(mPeriod).append("s) "); break;
-        case TYPE_PERIODIC_REPEATING:
-            sb.append("repeating periodic (").append(mPeriod).append("s) ");
-            break;
+            sb.append("per(").append(mPeriod).append("s)");
+            if (mState != STATE_SCHEDULED)
+                break;
         case TYPE_DATE:
-            sb.append("date (").append(getDateTimeString()).append(") "); break;
-        }
-        sb.append("alarm: ");
+            sb.append("(").append(getDateTimeString()).append(")"); break;
+        }
+        sb.append(": ");
         sb.append('"').append(mMessage).append('"');
         return sb.toString();