colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 04:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: instantiating a cib with no owner would generate nil warning

Browse Source 
Previously, when a view-based table:

- Had no delegate.
- Used bindings for its data source, thus obviating the need for makeViewWithIdentifier:owner:.

it would eventually call CPCib -instantiateCibWithOwner:topLevelObjects: with a nil owner (the nil table delegate). This method would try to construct a dictionary with the nil owner, which would generate a deprecation warning, and will in the future fail altogether.

In Cocoa, this is exactly what happens, the owner is nil. And the documentation for -instantiateNibWithOwner:topLevelObjects: clearly states that the owner may be nil.

This commit only adds the owner to the name table dictionary if the owner is non-nil. Since objectForKey: with a non-existent key returns nil, this is the same as storing nil for that key.
This commit is contained in:
Aparajita Fishman
2013-03-24 19:46:53 -04:00
parent b6cf557483
commit 8c811ba9ca
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/Cib/CPCib.j
+8 -1
View File
@@ -165,7 +165,14 @@ var CPCibObjectDataKey = @"CPCibObjectDataKey";
- (BOOL)instantiateCibWithOwner:(id)anOwner topLevelObjects:(CPArray)topLevelObjects
{
return [self instantiateCibWithExternalNameTable:@{ CPCibOwner: anOwner, CPCibTopLevelObjects: topLevelObjects }];
// anOwner can be nil, and we can't store nil in a dictionary. If we leave it out,
// anyone who asks for CPCibOwner will get nil back.
var nameTable = @{ CPCibTopLevelObjects: topLevelObjects };
if (anOwner)
[nameTable setObject:anOwner forKey:CPCibOwner];
return [self instantiateCibWithExternalNameTable:nameTable];
}
@end