colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-04 01:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: don't crash when removing objects from an array controller which has its arrangedObjects.@count observed.

Browse Source
This commit is contained in:
Alexander Ljungberg
2012-04-20 15:12:59 +01:00
parent d9640aa205
commit 21a34f88b2
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPObjectController.j
+4 -3
View File
@@ -579,6 +579,8 @@ var CPObjectControllerContentKey = @"CPObjectControllerCo
- (void)removeObjectAtIndex:(unsigned)anIndex
{
var currentObject = [self objectAtIndex:anIndex];
for (var i = 0, count = [_observationProxies count]; i < count; i++)
{
var proxy = [_observationProxies objectAtIndex:i],
@@ -588,7 +590,7 @@ var CPObjectControllerContentKey = @"CPObjectControllerCo
if (operator)
[self willChangeValueForKey:keyPath];
[anObject removeObserver:proxy forKeyPath:keyPath];
[currentObject removeObserver:proxy forKeyPath:keyPath];
if (operator)
[self didChangeValueForKey:keyPath];
@@ -777,8 +779,7 @@ var CPObjectControllerContentKey = @"CPObjectControllerCo
[proxy setNotifyObject:YES];
[_observationProxies addObject:proxy];
// We keep are reference to the observed objects
// because the removeObserver: will be called after the selection changes
// We keep a reference to the observed objects because removeObserver: will be called after the selection changes.
var observedObjects = [_controller selectedObjects];
_observedObjectsByKeyPath[aKeyPath] = observedObjects;
[observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];
Tests/AppKit/CPArrayControllerTest.j
+35
View File
@@ -8,6 +8,7 @@
CPArray _contentArray @accessors(property=contentArray);
CPArray observations;
int aCount @accessors;
}
- (CPArray)makeTestArray
@@ -289,6 +290,40 @@
[self assertFalse:[[arrayController arrangedObjects] containsObject:objectToRemove] message:@"removed objects should no longer appear in arrangedObjects"];
}
- (void)testRemove_
{
var arrayController = [self arrayController],
objectToRemove = [[arrayController arrangedObjects] objectAtIndex:0];
[arrayController setSelectedObjects:[objectToRemove]];
[arrayController remove:nil];
[self assertFalse:[[arrayController arrangedObjects] containsObject:objectToRemove] message:@"removed objects should no longer appear in arrangedObjects"];
}
- (void)testRemoveObjectsAtArrangedObjectIndexes_
{
var arrayController = [self arrayController];
[arrayController removeObjectsAtArrangedObjectIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(1, 2)]];
[self assert:1 equals:[[arrayController arrangedObjects] count] message:@"objects should be removed"];
}
- (void)testRemoveObjectsAtArrangedObjectIndexes_whenObservingCount
{
var arrayController = [self arrayController];
[arrayController addObserver:self forKeyPath:@"arrangedObjects.name" options:0 context:nil];
[self bind:@"aCount" toObject:arrayController withKeyPath:@"arrangedObjects.@count" options:nil];
// This crashed in a previous version of Cappuccino due to an error in _CPObservableArray's removeObjectAtIndex.
[arrayController removeObjectsAtArrangedObjectIndexes:[CPIndexSet indexSetWithIndexesInRange:CPMakeRange(1, 2)]];
[self assert:1 equals:[[arrayController arrangedObjects] count] message:@"objects should be removed"];
[self assert:aCount equals:[[arrayController arrangedObjects] count] message:@"count should be updated"];
}
- (void)testSelectionWhenObjectsDisappear
{
// If the selected object disappears during a rearrange, the selection