Changeset 113 for trunk/Cocoa/Pester/Source/PSAlarms.m

Timestamp:

03/10/03 05:48:21 (21 years ago)

Author:

Nicholas Riley

Message:

PSTimer.m: Fix bug 15, leaking PSTimer from NSInvocation argument retention.

Read Me.rtfd: Updated release notes.

PSAlarm.[hm]: Removed obsolete comment. Changed 1m-59m times to
display without `0h'. Moved code from deserialization to -resetTimer
to be used for alarm deletion undo - fix bug 14.

PSAlarmsController.m: Fix bug 14 - implement _restoreAlarms:,
_removeAlarms and _undoManager. Need to add localized string.

PSAlarmAlertController.m: Fix bug 17, move alert triggering from
constructor to -performAlertsForAlarm: to avoid nested notifications
delivering in wrong order.

PSAlarms.[hm]: Fix bug 14 - implement -restoreAlarms, invokes [PSAlarm
resetTimer]. Clarified a comment. Uncommented some debug logging.

package-Pester.sh: Implemented partition map-less disk image, saves a
few K on distribution. Removed obsolete comments. Added agvtool
bump.

File:

• trunk/Cocoa/Pester/Source/PSAlarms.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSAlarms.m

@@ -72 +72 @@
 {
     PSAlarm *alarm = [notification object];
-    // NSLog(@"timer expired: %@ retainCount %d", alarm, [alarm retainCount]);
+    NSLog(@"timer expired: %@ retainCount %d", alarm, [alarm retainCount]);
     [expiredAlarms addObject: alarm];
-    // NSLog(@"expired alarms: %@", [expiredAlarms description]);
+    NSLog(@"expired alarms: %@", [expiredAlarms description]);
     [alarms removeObject: alarm];
     [self _changed];
@@ -82 +82 @@
 {
     PSAlarm *alarm = [notification object];
-    // NSLog(@"timer set: %@ retainCount %d", alarm, [alarm retainCount]);
+    NSLog(@"timer set: %@ retainCount %d", alarm, [alarm retainCount]);
     [alarms addObject: alarm];
     [expiredAlarms removeObject: alarm];
@@ -210 +210 @@
 }
 
+- (void)restoreAlarms:(NSSet *)alarmsToRestore;
+{
+    [alarmsToRestore makeObjectsPerformSelector: @selector(resetTimer)];
+}
+
 - (BOOL)alarmsExpiring;
 {
@@ -274 +279 @@
         e = [plExpiredAlarms objectEnumerator];
         while ( (plAlarm = [e nextObject]) != nil) {
-            // expired alarms may be just that, or they may have outstanding repeats - if the latter, PSAlarm will reschedule the alarm.
+            // expired alarms may be ready for deletion, or may repeat - if the latter, PSAlarm will reschedule the alarm so the repeat interval begins at restoration time. 
             if ( (alarm = [[PSAlarm alloc] initWithPropertyList: plAlarm]) != nil)
                 [alarms addObject: alarm];