Changeset 239 for trunk/hiptop/pester/net

Timestamp:

07/08/06 19:28:37 (18 years ago)

Author:

Nicholas Riley

Message:

Final initial control set for edit dialog.

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• Alarm.java (modified) (6 diffs)
• AlarmListView.java (modified) (4 diffs)

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

@@ -13 +13 @@
     // persisted
     private String mMessage;
-    private boolean mUsesPeriod;
+    private int mType;
     private long mPeriod;
     private Date mDate;
@@ -31 +31 @@
     }
     public boolean getUsesPeriod() {
-        return mUsesPeriod;
+        return mType != TYPE_DATE;
     }
     public Date getDate() {
@@ -40 +40 @@
         mMessage = message;
     }
-    public void setPeriod(long period) {
-        mUsesPeriod = true;
+    public void setPeriod(long period, boolean repeating) {
+        mType = repeating ? TYPE_PERIODIC_REPEATING : TYPE_PERIODIC;
         mPeriod = period;
     }
     public void setDate(Date date) {
-        mUsesPeriod = false;
+        mType = TYPE_DATE;
         mDate = date;
     }
@@ -58 +58 @@
             dataStream.writeLong(mPeriod);
             dataStream.writeInt(mDate.getUnixTimeGMT());
-            dataStream.writeBoolean(mUsesPeriod);
+            dataStream.writeInt(mType);
             dataStream.flush();
             return byteStream.toByteArray();
@@ -78 +78 @@
             mMessage = dataStream.readUTF();
             mPeriod = dataStream.readLong();
-            mUsesPeriod = dataStream.readBoolean();
+            mType = dataStream.readInt();
         } catch (Exception e) {
             // XXX do something
@@ -96 +96 @@
     }
 
+    public static final int TYPE_PERIODIC = 0;
+    public static final int TYPE_PERIODIC_REPEATING = 1;
+    public static final int TYPE_DATE = 2;
+
     public static final int STATUS_INVALID = 0;
     public static final int STATUS_EDITING = 1;

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

@@ -6 +6 @@
 import danger.ui.Button;
 import danger.ui.DialogWindow;
+import danger.ui.RadioButton;
 import danger.ui.Rect;
 import danger.ui.TypeAheadTextField;
@@ -23 +24 @@
     private TypeAheadTextField sMessageField;
     private Button sDiscardAlarmButton;
+    private RadioButton sInButton, sAtButton;
 
     private static Alarm sFocusedAlarm, sEditingAlarm;
@@ -38 +40 @@
         sMessageField = (TypeAheadTextField)sEditWindow.getDescendantWithID(ID_MESSAGE_FIELD);
         sEditWindow.disableBottomRightButtonOnEmptyField(sMessageField);
+        sInButton = (RadioButton)sEditWindow.getDescendantWithID(ID_IN_BUTTON);
+        sAtButton = (RadioButton)sEditWindow.getDescendantWithID(ID_AT_BUTTON);
         sDiscardAlarmButton = (Button)sEditWindow.getDescendantWithID(ID_DISCARD_ALARM_BUTTON);
 
@@ -87 +91 @@
             sAlarmList.removeItem(sFocusedAlarm);
             return true;
+        case EVENT_IN:
+            sAtButton.setValue(0);
+            return true;
+        case EVENT_AT:
+            sInButton.setValue(0);
+            return true;
         }
         return super.receiveEvent(e);