Changeset 6261

Timestamp:

Jun 27, 2008, 5:40:22 AM (14 years ago)

Author:

livings124

Message:

comparing with the numeric option works for sorting IP address properly, so let it do the heavy lifting for us

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.xib (modified) (3 diffs)
• InfoWindowController.m (modified) (1 diff)
• NSStringAdditions.h (modified) (1 diff)
• NSStringAdditions.m (modified) (1 diff)

trunk/macosx/English.lproj/InfoWindow.xib

@@ -9 +9 @@
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                         <bool key="EncodedWithXMLCoder">YES</bool>
-                        <integer value="1039"/>
+                        <integer value="1042"/>
                 </object>
                 <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -2288 +2288 @@
                                                                                                 <bool key="NSIsResizeable">YES</bool>
                                                                                                 <reference key="NSTableView" ref="221969066"/>
-                                                                                                <object class="NSSortDescriptor" key="NSSortDescriptorPrototype" id="631031026">
+                                                                                                <object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
                                                                                                         <string key="NSKey">IP</string>
                                                                                                         <bool key="NSAscending">YES</bool>
-                                                                                                        <string key="NSSelector">compareIP:</string>
+                                                                                                        <string key="NSSelector">compareNumeric:</string>
                                                                                                 </object>
                                                                                         </object>
@@ -3852 +3852 @@
                                                                                 <object class="NSArray" key="NSSortDescriptors">
                                                                                         <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                        <reference ref="631031026"/>
                                                                                         <reference ref="116573225"/>
                                                                                 </object>

trunk/macosx/InfoWindowController.m

@@ -1593 +1593 @@
     {
         NSSortDescriptor * secondDescriptor = [[NSSortDescriptor alloc] initWithKey: @"IP" ascending: asc
-                                                                        selector: @selector(compareIP:)];
+                                                                        selector: @selector(compareFinder:)];
         [descriptors addObject: secondDescriptor];
         [secondDescriptor release];

trunk/macosx/NSStringAdditions.h

@@ -40 +40 @@
 
 - (NSComparisonResult) compareFinder: (NSString *) string; //how the Finder compares strings
-- (NSComparisonResult) compareIP: (NSString *) string;
+- (NSComparisonResult) compareNumeric: (NSString *) string; //simple compare method for strings with numbers (works for IP addresses)
 
 @end

trunk/macosx/NSStringAdditions.m

@@ -148 +148 @@
 - (NSComparisonResult) compareFinder: (NSString *) string
 {
-    int comparisonOptions = ![NSApp isOnLeopardOrBetter] ? (NSCaseInsensitiveSearch | NSNumericSearch)
-        : (NSCaseInsensitiveSearch | NSNumericSearch| NSWidthInsensitiveSearch | NSForcedOrderingSearch);
+    int comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSCaseInsensitiveSearch | NSNumericSearch
+                                                            | NSWidthInsensitiveSearch | NSForcedOrderingSearch)
+                                                        : (NSCaseInsensitiveSearch | NSNumericSearch);
     
     return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }
 
-- (NSComparisonResult) compareIP: (NSString *) string
-{    
-    NSArray * selfSections = [self componentsSeparatedByString: @"."],
-            * newSections = [string componentsSeparatedByString: @"."];
+- (NSComparisonResult) compareNumeric: (NSString *) string
+{
+    int comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSNumericSearch | NSForcedOrderingSearch) : NSNumericSearch;
     
-    if ([selfSections count] != [newSections count])
-        return [selfSections count] > [newSections count] ? NSOrderedDescending : NSOrderedAscending;
-
-    NSEnumerator * selfSectionsEnum = [selfSections objectEnumerator], * newSectionsEnum = [newSections objectEnumerator];
-    NSString * selfString, * newString;
-    int comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSNumericSearch | NSForcedOrderingSearch) : NSNumericSearch;
-    NSComparisonResult result;
-    while ((selfString = [selfSectionsEnum nextObject]) && (newString = [newSectionsEnum nextObject]))
-        if ((result = [selfString compare: newString options: comparisonOptions
-                        range: NSMakeRange(0, [selfString length]) locale: [NSLocale currentLocale]]) != NSOrderedSame)
-            return result;
-    
-    return NSOrderedSame;
+    return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }