Changeset 102 for trunk/Cocoa/Pester/Source/NJRIntervalField.m

Timestamp:

02/23/03 04:55:07 (21 years ago)

Author:

Nicholas Riley

Message:

Pester 1.1b3

File:

• trunk/Cocoa/Pester/Source/NJRIntervalField.m (modified) (3 diffs)

trunk/Cocoa/Pester/Source/NJRIntervalField.m

@@ -38 +38 @@
     while ( (i = [e nextObject]) != nil) {
         multiplierTag = [i tag];
+        if (multiplierTag <= 0) continue;
         if (((int)interval % multiplierTag) == 0) {
             NSFormatter *formatter = [self formatter];
@@ -64 +65 @@
             case 'm': case 'M': tag = 60; break;
             case 'h': case 'H': tag = 60 * 60; break;
+            case 'u': case 'U': tag = -2; break;
             default: break;
         }
-        if (tag != -1) [intervalUnits selectItemAtIndex: [intervalUnits indexOfItemWithTag: tag]];
+        if (tag != -1) {
+            int itemIndex = [intervalUnits indexOfItemWithTag: tag];
+            if (itemIndex != -1) {
+                [intervalUnits selectItemAtIndex: itemIndex];
+                [[intervalUnits menu] performActionForItemAtIndex: itemIndex];
+            }
+            if (tag < 0) return NO; // don't send update
+        }
     }
     return [super textView: textView shouldChangeTextInRange: range replacementString: string];
@@ -73 +82 @@
 - (void)handleDidFailToFormatString:(NSString *)string errorDescription:(NSString *)error label:(NSString *)label;
 {
-    NSString *alertMessage;
-    NSString *alternateButtonString;
-    NSDecimalNumber *proposedValue;
+    NSString *alertMessage = nil;
+    NSString *alternateButtonString = nil;
+    NSDecimalNumber *proposedValue = nil;
     NSDictionary *contextInfo;