Merge branch 'CPArrayControllerFixes' of https://github.com/cacaodev/cappuccino into cacaodev-CPArrayControllerFixes

AppKit/CPArrayController.j

@@ -46,10 +46,12 @@
     BOOL    _selectsInsertedObjects;
     BOOL    _alwaysUsesMultipleValuesMarker;
 
-    id      _selectionIndexes;
-    id      _sortDescriptors;
-    id      _filterPredicate;
-    id      _arrangedObjects;
+    BOOL    _automaticallyRearrangesObjects; // FIXME: Not in use
+
+    CPIndexSet  _selectionIndexes;
+    CPArray     _sortDescriptors;
+    CPPredicate _filterPredicate;
+    CPArray     _arrangedObjects;
 }
 
 + (void)initialize
@@ -116,13 +118,29 @@
 
     if (self)
     {
-        _sortDescriptors = [CPArray array];
-        _selectionIndexes = [CPIndexSet indexSet];
+        _preservesSelection = YES;
+        _selectsInsertedObjects = YES;
+        _avoidsEmptySelection = YES;
+        _clearsFilterPredicateOnInsertion = YES;
+        _alwaysUsesMultipleValuesMarker = NO;
+        _automaticallyRearrangesObjects = NO;
+
+        _filterRestrictsInsertion = YES; // FIXME: Not in use
+
+        [self _init];
     }
 
     return self;
 }
 
+- (void)_init
+{
+    _sortDescriptors = [CPArray array];
+    _filterPredicate = nil;
+    _selectionIndexes = [CPIndexSet indexSet];
+    _arrangedObjects = nil;
+}
+
 - (void)prepareContent
 {
     [self _setContentArray:[[self newObject]]];
@@ -180,6 +198,36 @@
     _avoidsEmptySelection = value;
 }
 
+- (BOOL)clearsFilterPredicateOnInsertion
+{
+    return _clearsFilterPredicateOnInsertion;
+}
+
+- (void)setClearsFilterPredicateOnInsertion:(BOOL)value
+{
+    _clearsFilterPredicateOnInsertion = value;
+}
+
+- (BOOL)alwaysUsesMultipleValuesMarker
+{
+    return _alwaysUsesMultipleValuesMarker;
+}
+
+- (void)setAlwaysUsesMultipleValuesMarker:(BOOL)value
+{
+    _alwaysUsesMultipleValuesMarker = value;
+}
+
+- (BOOL)automaticallyRearrangesObjects
+{
+    return _automaticallyRearrangesObjects;
+}
+
+- (void)setAutomaticallyRearrangesObjects:(BOOL)value
+{
+    _automaticallyRearrangesObjects = value;
+}
+
 /*!
     Sets the controller's content object.
 
@@ -220,7 +268,7 @@
     // We need to be in control of when notifications fire.
     _contentObject = value;
 
-    if (_clearsFilterPredicateOnInsertion)
+    if (_clearsFilterPredicateOnInsertion && _filterPredicate != nil)
         [self __setFilterPredicate:nil]; // Causes a _rearrangeObjects.
     else
         [self _rearrangeObjects];
@@ -280,7 +328,7 @@
     var filterPredicate = [self filterPredicate],
         sortDescriptors = [self sortDescriptors];
 
-    if (filterPredicate && sortDescriptors)
+    if (filterPredicate && [sortDescriptors count] > 0)
     {
         var sortedObjects = [objects filteredArrayUsingPredicate:filterPredicate];
         [sortedObjects sortUsingDescriptors:sortDescriptors];
@@ -288,7 +336,7 @@
     }
     else if (filterPredicate)
         return [objects filteredArrayUsingPredicate:filterPredicate];
-    else if (sortDescriptors)
+    else if ([sortDescriptors count] > 0)
         return [objects sortedArrayUsingDescriptors:sortDescriptors];
 
     return [objects copy];
@@ -338,7 +386,7 @@
     if (_arrangedObjects === value)
         return;
 
-   _arrangedObjects = [[_CPObservableArray alloc] initWithArray:value];
+    _arrangedObjects = [[_CPObservableArray alloc] initWithArray:value];
 }
 
 /*!
@@ -829,7 +877,8 @@ var CPArrayControllerAvoidsEmptySelection             = @"CPArrayControllerAvoid
     CPArrayControllerFilterRestrictsInsertion         = @"CPArrayControllerFilterRestrictsInsertion",
     CPArrayControllerPreservesSelection               = @"CPArrayControllerPreservesSelection",
     CPArrayControllerSelectsInsertedObjects           = @"CPArrayControllerSelectsInsertedObjects",
-    CPArrayControllerAlwaysUsesMultipleValuesMarker   = @"CPArrayControllerAlwaysUsesMultipleValuesMarker";
+    CPArrayControllerAlwaysUsesMultipleValuesMarker   = @"CPArrayControllerAlwaysUsesMultipleValuesMarker",
+    CPArrayControllerAutomaticallyRearrangesObjects   = @"CPArrayControllerAutomaticallyRearrangesObjects";
 
 @implementation CPArrayController (CPCoding)
 
@@ -845,6 +894,8 @@ var CPArrayControllerAvoidsEmptySelection             = @"CPArrayControllerAvoid
         _preservesSelection = [aCoder decodeBoolForKey:CPArrayControllerPreservesSelection];
         _selectsInsertedObjects = [aCoder decodeBoolForKey:CPArrayControllerSelectsInsertedObjects];
         _alwaysUsesMultipleValuesMarker = [aCoder decodeBoolForKey:CPArrayControllerAlwaysUsesMultipleValuesMarker];
+        _automaticallyRearrangesObjects = [aCoder decodeBoolForKey:CPArrayControllerAutomaticallyRearrangesObjects];
+        _sortDescriptors = [CPArray array];
 
         if (![self content] && [self automaticallyPreparesContent])
             [self prepareContent];
@@ -865,6 +916,7 @@ var CPArrayControllerAvoidsEmptySelection             = @"CPArrayControllerAvoid
     [aCoder encodeBool:_preservesSelection forKey:CPArrayControllerPreservesSelection];
     [aCoder encodeBool:_selectsInsertedObjects forKey:CPArrayControllerSelectsInsertedObjects];
     [aCoder encodeBool:_alwaysUsesMultipleValuesMarker forKey:CPArrayControllerAlwaysUsesMultipleValuesMarker];
+    [aCoder encodeBool:_automaticallyRearrangesObjects forKey:CPArrayControllerAutomaticallyRearrangesObjects];
 }
 
 - (void)awakeFromCib

Tests/AppKit/CPArrayControllerTest.j

@@ -1,5 +1,6 @@
 
 @import <AppKit/CPArrayController.j>
+@import <AppKit/CPTextField.j>
 
 @implementation CPArrayControllerTest : OJTestCase
 {
@@ -190,8 +191,7 @@
 
     [arrayController setContent:newContent];
 
-    [self assert:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, 2)] equals:[arrayController selectionIndexes]
-         message:@"last object cannot be selected"];
+    [self assert:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, 2)] equals:[arrayController selectionIndexes] message:@"last object cannot be selected"];
 }
 
 - (void)testContentBinding
@@ -354,6 +354,16 @@
     [self assert:@"Building 1" equals:[[self arrayController] valueForKeyPath:@"selection.department.building"]];
 }
 
+- (void)testArrangedObjectsNotEmptyAfterSetContentWhenClearsFilterOnInsertionIsTrue
+{
+    var arrayController = [[CPArrayController alloc] init];
+    [arrayController setFilterPredicate:nil];
+    [arrayController setClearsFilterPredicateOnInsertion:YES];  
+    [arrayController setContent:[CPArray arrayWithObject:@"a"]];
+    
+    [self assertTrue:[[arrayController arrangedObjects] count] > 0];
+}
+
 - (void)observeValueForKeyPath:keyPath
     ofObject:anActivity
     change:change

Tools/nib2cib/NSArrayController.j

@@ -37,6 +37,7 @@
         _preservesSelection = [aCoder decodeBoolForKey:@"NSPreservesSelection"];
         _selectsInsertedObjects = [aCoder decodeBoolForKey:@"NSSelectsInsertedObjects"];
         _alwaysUsesMultipleValuesMarker = [aCoder decodeBoolForKey:@"NSAlwaysUsesMultipleValuesMarker"];
+        _automaticallyRearrangesObjects = [aCoder decodeBoolForKey:@"NSAutomaticallyRearrangesObjects"];
     }
 
     return self;