Changeset 53 for trunk/Cocoa/Pester/Source/NJRIntegerFilter.m

Timestamp:

01/02/03 05:30:03 (21 years ago)

Author:

Nicholas Riley

Message:

Updated for Pester 1.1a5 (very limited release).

Pester 1.1a4 was never released.

Location:

trunk/Cocoa/Pester/Source

Files:

• . (modified) (1 prop)
• NJRIntegerFilter.m (modified) (2 diffs)

trunk/Cocoa/Pester/Source

@@ -1 +1 @@
 build
+.gdb_history

@@ -1 +1 @@
 build
+.gdb_history

trunk/Cocoa/Pester/Source/NJRIntegerFilter.m

@@ -7 +7 @@
 //
 
-// based on MyIntegerFilter
-// Copyright © 2001 Bill Cheeseman. All rights reserved.
+// based on MyIntegerFilter, later VRIntegerNumberFilter
+// Copyright © 2001-2002 Bill Cheeseman. All rights reserved.
 
 #import "NJRIntegerFilter.h"
@@ -14 +14 @@
 @implementation NJRIntegerFilter
 
-// Input filter
+// Input validation
 
-- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error {
-
-    // Override method to enable NSControl delegate method control:didFailToValidatePartialString:errorDescription: to
-    // reject invalid keypresses. Filters out keyboard input characters other than "1" .. "9".
+- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error;
+{
+    // Override method to enable NSControl delegate method control:didFailToValidatePartialString:errorDescription: to reject invalid keypresses. Filters out keyboard input characters other than 0..9.
     if ([[*partialStringPtr substringWithRange:NSMakeRange(origSelRange.location, (*proposedSelRangePtr).location - origSelRange.location)] rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet] options:NSLiteralSearch].location != NSNotFound) {
-        *error = NSLocalizedString(@"Input is not an integer", @"Presented when user value not a numeric digit");
-        return NO; // Reject *partialStringPtr as typed, invoke delegate method
+        *error = NSLocalizedString(@"Input is not an integer.", @"Presented when user value not a numeric digit");
+        return NO; // Reject *partialStringPtr as typed, invoke delegate method for error handling
     }
-
-    if ([*partialStringPtr length] == 0) {
-        // Work around NSFormatter issue in Mac OS X 10.0.
-        [[[NSApp keyWindow] fieldEditor:NO forObject:nil] setSelectedRange:*proposedSelRangePtr];
-    }
-
+    *error = nil;
     return YES; // Accept *partialStringPtr as typed
 }

@@ -1 +1 @@
 build
+.gdb_history