Changeset 51 for trunk/Cocoa/Pester/Source/PSAlarm.m

Timestamp:

11/18/02 08:57:41 (21 years ago)

Author:

Nicholas Riley

Message:

Alarms.nib: Removed horizontal scroll bar. Turned on grid. Set delegate to NJRTableDelegate instead of PSAlarmSetController.

NJRTableDelegate: In general, made functional (was previously unused). Fixed MyCompanyName. Changed ORDER_BY_CONTEXT to use key-value coding instead of assuming data consists of a dictionary of dictionaries. Added sorting support (reorderedData, replaces oData) with autosave support for sort context. Added _positionTypeSelectDisplay, which adjusts position and justification of type select display control based on the current sort column. Added support for reverse sorting in type select string. Use table data source instead of sorted data so text matches as displayed (this will break with non-text cells...).

NJRTableView: Adapted from iTableView (Jaguar table alternate table background color), TableTester (most everything else) and NJROutlineView (keyDown, moveToBeginning/EndOfDocument). Support for type selection, delete shortcut for row deletion, and iTunes-alike background colors and frame.

NSCharacterSet-NJRExtensions: Moved _typeSelectSet from NJROutlineView as it's now shared with NJRTableView. Still need to factor NJROutlineView as embedded in HostLauncher some day.

PSAlarm: Reorganized, renamed and categorized methods. Added time accessor for the benefit of sorting. Renamed compare: to compareDate: for clarity. Added compareMessage:, though it's currently unused. Renamed cancel to cancelTimer for clarity.

PSAlarmSetController: More fun with initial first responder on window show/hide; still need to work around bug properly (subclass NSComboBox?) and fix it for real. As is, works for OS X 10.1.

PSAlarms: Added alarms accessor, returning alarm array. Fixed memory leak on successful alarm removal (oops). Added removeAlarms:, needed with sorted alarm list.

PSAlarmsController: Set window resize increment. Changes to table delegate methods to use reordered alarm list. Register for NSTableViewSelectionDidChangeNotification now we're no longer the table view delegate. Fixed autoselection in alarmsChanged by using data reordering support in NJRTableView. Implement NJRTableViewDataSource to permit deletion from table view.

Pester.pbproj: Added new files.

Read Me.rtfd: Added TableTester/iTableView acknowledgements. Updated release notes.

File:

• trunk/Cocoa/Pester/Source/PSAlarm.m (modified) (15 diffs)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -20 +20 @@
 
 @implementation PSAlarm
+
+#pragma mark initialize-release
 
 + (void)initialize; // XXX change on locale modification, subscribe to NSNotifications
@@ -41 +43 @@
 }
 
+#pragma mark private
+
 - (void)_setAlarmDate:(NSCalendarDate *)aDate;
 {
@@ -50 +54 @@
 }
 
-- (void)_invalidate:(NSString *)aMessage;
+- (void)_beInvalid:(NSString *)aMessage;
 {
     alarmType = PSAlarmInvalid;
@@ -62 +66 @@
 }
 
-- (void)_validateForType:(PSAlarmType)type;
+- (void)_beValidWithType:(PSAlarmType)type;
 {
     if (alarmType == PSAlarmSet) return; // already valid
@@ -75 +79 @@
     alarmDate = [NSCalendarDate dateWithTimeIntervalSinceNow: alarmInterval];
     [alarmDate retain];
-    [self _validateForType: PSAlarmInterval];
-}
+    [self _beValidWithType: PSAlarmInterval];
+}
+
+- (void)_setIntervalFromDate;
+{
+    alarmInterval = [alarmDate timeIntervalSinceNow] + 1;
+    if (alarmInterval <= 0) {
+        [self _beInvalid: @"Please specify an alarm time in the future."];
+        return;
+    }
+    [self _beValidWithType: PSAlarmDate];
+}
+
+- (NSString *)_alarmTypeString;
+{
+    switch (alarmType) {
+        case PSAlarmDate: return @"PSAlarmDate";
+        case PSAlarmInterval: return @"PSAlarmInterval";
+        case PSAlarmSet: return @"PSAlarmSet";
+        case PSAlarmInvalid: return @"PSAlarmInvalid";
+        default: return [NSString stringWithFormat: @"<unknown: %u>", alarmType];
+    }
+}
+
+- (void)_timerExpired:(NSTimer *)aTimer;
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerExpiredNotification object: self];
+    [timer release]; timer = nil;
+}
+
+#pragma mark alarm setting
 
 - (void)setInterval:(NSTimeInterval)anInterval;
@@ -82 +115 @@
     alarmInterval = anInterval;
     if (alarmInterval <= 0) {
-        [self _invalidate: @"Please specify an alarm interval."]; return;
+        [self _beInvalid: @"Please specify an alarm interval."]; return;
     }
     [self _setDateFromInterval];
-}
-
-- (void)_setIntervalFromDate;
-{
-    alarmInterval = [alarmDate timeIntervalSinceNow] + 1;
-    if (alarmInterval <= 0) {
-        [self _invalidate: @"Please specify an alarm time in the future."];
-        return;
-    }
-    [self _validateForType: PSAlarmDate];
 }
 
@@ -107 +130 @@
     NSCalendarDate *calTime, *calDate;
     if (time == nil && date == nil) {
-        [self _invalidate: @"Please specify an alarm date and time."]; return;
+        [self _beInvalid: @"Please specify an alarm date and time."]; return;
     }
     if (time == nil) {
-        [self _invalidate: @"Please specify an alarm time."]; return;
+        [self _beInvalid: @"Please specify an alarm time."]; return;
     }
     if (date == nil) {
-        [self _invalidate: @"Please specify an alarm date."]; return;
+        [self _beInvalid: @"Please specify an alarm date."]; return;
     }
     // XXX if calTime's date is different from the default date, complain
@@ -119 +142 @@
     calDate = [NSCalendarDate dateWithTimeIntervalSinceReferenceDate: [date timeIntervalSinceReferenceDate]];
     if (calTime == nil || calDate == nil) {
-        [self _invalidate: @"Please specify a reasonable date and time."];
+        [self _beInvalid: @"Please specify a reasonable date and time."];
     }
     [self setForDateAtTime:
@@ -131 +154 @@
 }
 
-- (BOOL)isValid;
-{
-    if (alarmType == PSAlarmDate) [self _setIntervalFromDate];
-    return (alarmType != PSAlarmInvalid);
+#pragma mark accessing
+
+- (NSString *)message;
+{
+    if (alarmMessage == nil || [alarmMessage isEqualToString: @""])
+        return @"Alarm!";
+    return alarmMessage;
 }
 
@@ -146 +172 @@
 }
 
-- (NSString *)message;
-{
-    if (alarmMessage == nil || [alarmMessage isEqualToString: @""])
-        return @"Alarm!";
-    return alarmMessage;    
+- (BOOL)isValid;
+{
+    if (alarmType == PSAlarmDate) [self _setIntervalFromDate];
+    return (alarmType != PSAlarmInvalid);
 }
 
@@ -163 +188 @@
     if (alarmType == PSAlarmInterval) [self _setDateFromInterval];
     return alarmDate;
+}
+
+- (NSCalendarDate *)time;
+{
+    if (alarmType == PSAlarmInterval) [self _setDateFromInterval];
+    return [[NSCalendarDate alloc] initWithYear: 0
+                                          month: 1
+                                            day: 1
+                                           hour: [alarmDate hourOfDay]
+                                         minute: [alarmDate minuteOfHour]
+                                         second: [alarmDate secondOfMinute]
+                                       timeZone: nil];
+}
+
+- (NSTimeInterval)interval;
+{
+    if (alarmType == PSAlarmSet || alarmType == PSAlarmDate) [self _setIntervalFromDate];
+    return alarmInterval;
+}
+
+- (void)addAlert:(PSAlert *)alert;
+{
+    if (alerts == nil) alerts = [[NSMutableArray alloc] initWithCapacity: 4];
+    [alerts addObject: alert];
+}
+
+- (void)removeAlerts;
+{
+    [alerts removeAllObjects];
+}
+
+- (NSArray *)alerts;
+{
+    return [[alerts copy] autorelease];
 }
 
@@ -193 +252 @@
 }
 
-- (NSTimeInterval)interval;
-{
-    if (alarmType == PSAlarmSet || alarmType == PSAlarmDate) [self _setIntervalFromDate];
-    return alarmInterval;
-}
+#pragma mark actions
 
 - (BOOL)setTimer;
@@ -204 +259 @@
         case PSAlarmDate: if (![self isValid]) return NO;
         case PSAlarmInterval:
-            timer = [NSTimer scheduledTimerWithTimeInterval: alarmInterval
-                                                     target: self
-                                                   selector: @selector(_timerExpired:)
-                                                   userInfo: nil
-                                                    repeats: NO];
+            timer = [NSTimer scheduledTimerWithTimeInterval: alarmInterval target: self selector: @selector(_timerExpired:) userInfo: nil repeats: NO];
             if (timer != nil) {
                 [timer retain];
@@ -220 +271 @@
 }
 
-- (void)cancel;
+- (void)cancelTimer;
 {
     [timer invalidate]; [timer release]; timer = nil;
 }
 
-- (void)_timerExpired:(NSTimer *)aTimer;
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerExpiredNotification object: self];
-    [timer release]; timer = nil;
-}
-
-- (NSString *)_alarmTypeString;
-{
-    switch (alarmType) {
-        case PSAlarmDate: return @"PSAlarmDate";
-        case PSAlarmInterval: return @"PSAlarmInterval";
-        case PSAlarmSet: return @"PSAlarmSet";
-        case PSAlarmInvalid: return @"PSAlarmInvalid";
-        default: return [NSString stringWithFormat: @"<unknown: %u>", alarmType];
-    }
-}
-
-- (NSComparisonResult)compare:(PSAlarm *)otherAlarm;
+#pragma mark comparing
+
+- (NSComparisonResult)compareDate:(PSAlarm *)otherAlarm;
 {
     return [[self date] compare: [otherAlarm date]];
 }
 
-- (void)addAlert:(PSAlert *)alert;
-{
-    if (alerts == nil) alerts = [[NSMutableArray alloc] initWithCapacity: 4];
-    [alerts addObject: alert];
-}
-
-- (void)removeAlerts;
-{
-    [alerts removeAllObjects];
-}
-
-- (NSArray *)alerts;
-{
-    return [[alerts copy] autorelease];
-}
+- (NSComparisonResult)compareMessage:(PSAlarm *)otherAlarm;
+{
+    return [[self message] caseInsensitiveCompare: [otherAlarm message]];
+}
+
+#pragma mark printing
 
 - (NSString *)description;
@@ -272 +299 @@
            [NSString stringWithFormat: @"\ntimer: %@", timer] : @""))];
 }
+
+#pragma mark archiving
 
 - (void)encodeWithCoder:(NSCoder *)coder;