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

Timestamp:

07/13/06 16:43:36 (18 years ago)

Author:

Nicholas Riley

Message:

Refactor editing, coalese Alarms and alarm list. Try (and fail) to recognize exit from alarm time editor.

File:

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

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

@@ -21 +21 @@
     private String mMessage;
     private int mType;
-    private int mInterval; // XXX rename to 'interval'
+    private int mPeriod;
     private Date mDate;
     private RingToneObject mAlert;
@@ -38 +38 @@
     }
     public int getPeriod() {
-        return mInterval;
+        return mPeriod;
     }
     public boolean getUsesPeriod() {
@@ -58 +58 @@
     public void setPeriod(int period, boolean repeating) {
         mType = repeating ? TYPE_PERIODIC_REPEATING : TYPE_PERIODIC;
-        mInterval = period;
+        mPeriod = period;
     }
     public void setDate(Date date) {
@@ -75 +75 @@
             dataStream.writeByte(VERSION_1);
             dataStream.writeUTF(mMessage);
-            dataStream.writeInt(mInterval);
+            dataStream.writeInt(mPeriod);
             dataStream.writeInt(mDate.getUnixTimeGMT());
             dataStream.writeInt(mType);
@@ -96 +96 @@
             }
             mMessage = dataStream.readUTF();
-            mInterval = dataStream.readInt();
+            mPeriod = dataStream.readInt();
             mType = dataStream.readInt();
         } catch (Exception e) {
@@ -128 +128 @@
         if (getUsesPeriod()) {
             mDate = new Date();
-            mDate.addSeconds(mInterval);
+            mDate.addSeconds(mPeriod);
         }
         resume();
@@ -154 +154 @@
         switch (mType) {
         case TYPE_PERIODIC:
-            sb.append("periodic (").append(mInterval).append("s) "); break;
+            sb.append("periodic (").append(mPeriod).append("s) "); break;
         case TYPE_PERIODIC_REPEATING:
-            sb.append("repeating periodic (").append(mInterval).append("s) ");
+            sb.append("repeating periodic (").append(mPeriod).append("s) ");
             break;
         case TYPE_DATE:
@@ -170 +170 @@
             return null;
         String layout = LocaleUtils.getDateTimePattern();
-        String timeFormat = LocaleUtils.getMediumTimeFormat();
         String dateFormat = LocaleUtils.getMediumDateFormat();
-        String timeString = DateFormat.withFormat(timeFormat, date);
-        String dateString = DateFormat.withFormat(dateFormat, date);
+        String dateString;
+        String timeFormat;
         if (relative) {
+            timeFormat = LocaleUtils.getShortTimeFormat();
             int daysFromToday = date.getDaysBetween(new Date());
             if (daysFromToday == 0)
@@ -182 +182 @@
             else if (daysFromToday < 7)
                 dateString = date.getDayString();
-        }
+            else
+                dateString = DateFormat.withFormat(dateFormat, date);
+        } else {
+            dateString = DateFormat.withFormat(dateFormat, date);
+            timeFormat = LocaleUtils.getMediumTimeFormat();
+        }
+        String timeString = DateFormat.withFormat(timeFormat, date);
         return StringFormat.withFormat(layout, timeString, dateString);
     }