Changeset 777 for trunk

Timestamp:

Aug 14, 2006, 11:39:51 PM (16 years ago)

Author:

livings124

Message:

Sort IP addresses correctly.

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• StringAdditions.h (modified) (1 diff)
• StringAdditions.m (modified) (1 diff)

trunk/macosx/StringAdditions.h

@@ -40 +40 @@
                                 attributes: (NSDictionary *) attributes;
 
+- (NSComparisonResult) compareIP: (NSString *) string;
+
 @end

trunk/macosx/StringAdditions.m

@@ -158 +158 @@
 }
 
+- (NSComparisonResult) compareIP: (NSString *) string
+{
+    if ([self isEqualToString: string])
+        return NSOrderedSame;
+
+    NSEnumerator * selfSections = [[self componentsSeparatedByString: @"."] objectEnumerator],
+            * newSections = [[string componentsSeparatedByString: @"."] objectEnumerator];
+    
+    NSComparisonResult result;
+    NSString * selfString = [selfSections nextObject], * newString = [newSections nextObject];
+    while (selfString && newString)
+    {
+        if ((result = [selfString compare: newString options: NSNumericSearch]) != NSOrderedSame)
+            return result;
+        
+        selfString = [selfSections nextObject];
+        newString = [newSections nextObject];
+    }
+    
+    if (selfString)
+        return NSOrderedDescending;
+    else if (newString)
+        return NSOrderedAscending;
+    else
+        return NSOrderedSame;
+}
+
 @end