Changeset 28 for Trunk/AILogSizeSort.m

Timestamp:

06/20/09 12:52:08 (15 years ago)

Author:

jon

Message:

Modified the sort function to not crash when sorting groups.

Files:

• Trunk/AILogSizeSort.m (modified) (2 diffs)

Trunk/AILogSizeSort.m

@@ -274 +274 @@
 NSComparisonResult logSizeSort(id objectA, id objectB, BOOL groups, id<AIContainingObject> container)
 {
-        if(groups)
+        // Borrowed from AISortController.m
+        BOOL objectAIsGroup = [objectA isKindOfClass:[AIListGroup class]];
+        BOOL objectBIsGroup = [objectB isKindOfClass:[AIListGroup class]];
+        
+        if(groups || (objectAIsGroup && objectBIsGroup))
         {
                 // Keep groups in manual order (borrowed from ESStatusSort)
@@ -285 +289 @@
                         return NSOrderedAscending;
                 }
+        }
+        
+        // Catch cases where only one of the objects is a group
+        if(objectAIsGroup && !objectBIsGroup)
+        {
+                return NSOrderedAscending;
+        }
+        else if(!objectAIsGroup && objectBIsGroup)
+        {
+                return NSOrderedDescending;
         }