Added support for external objects in cibs.

Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-09-06 11:49:25 -07:00
1 parent c895170597
commit 58e06142b9
3 files changed
+51 -3

No files matched your search

+5 -1
View File
@@ -30,12 +30,14 @@
@import "_CPCibCustomView.j"
@import "_CPCibKeyedUnarchiver.j"
@import "_CPCibObjectData.j"
@import "_CPCibProxyObject.j"
@import "_CPCibWindowTemplate.j"
CPCibOwner = @"CPCibOwner",
CPCibTopLevelObjects = @"CPCibTopLevelObjects",
CPCibReplacementClasses = @"CPCibReplacementClasses";
CPCibReplacementClasses = @"CPCibReplacementClasses",
CPCibExternalObjects = @"CPCibExternalObjects";
var CPCibObjectDataKey = @"CPCibObjectDataKey";
@@ -139,6 +141,8 @@ var CPCibObjectDataKey = @"CPCibObjectDataKey";
[unarchiver setClass:[replacementClasses objectForKey:key] forClassName:key];
}
[unarchiver setExternalObjectsForProxyIdentifiers:[anExternalNameTable objectForKey:CPCibExternalObjects]];
var objectData = [unarchiver decodeObjectForKey:CPCibObjectDataKey];
if (!objectData || ![objectData isKindOfClass:[_CPCibObjectData class]])
+13 -2
View File
@@ -4,8 +4,9 @@
@implementation _CPCibKeyedUnarchiver : CPKeyedUnarchiver
{
CPBundle _bundle;
BOOL _awakenCustomResources;
CPBundle _bundle;
BOOL _awakenCustomResources;
CPDictionary _externalObjectsForProxyIdentifiers;
}
- (id)initForReadingWithData:(CPData)data bundle:(CPBundle)aBundle awakenCustomResources:(BOOL)shouldAwakenCustomResources
@@ -33,6 +34,16 @@
return _awakenCustomResources;
}
- (void)setExternalObjectsForProxyIdentifiers:(CPDictionary)externalObjectsForProxyIdentifiers
{
_externalObjectsForProxyIdentifiers = externalObjectsForProxyIdentifiers;
}
- (id)externalObjectForProxyIdentifier:(CPString)anIdentifier
{
return [_externalObjectsForProxyIdentifiers objectForKey:anIdentifier];
}
- (void)replaceObjectAtUID:(int)aUID withObject:(id)anObject
{
_objects[aUID] = anObject;
+33
View File
@@ -0,0 +1,33 @@
@import <Foundation/CPObject.j>
@implementation _CPCibProxyObject : CPObject
{
CPString _identifier;
}
@end
var _CPCibProxyObjectIdentifierKey = @"CPIdentifier";
@implementation _CPCibProxyObject (CPCoding)
- (id)initWithCoder:(CPCoder)aCoder
{
self = [super init];
if (self)
_identifier = [aCoder decodeObjectForKey:_CPCibProxyObjectIdentifierKey];
if ([aCoder respondsToSelector:@selector(externalObjectForProxyIdentifier:)])
return [aCoder externalObjectForProxyIdentifier:_identifier];
return self;
}
- (void)encodeWithCoder:(CPCoder)aCoder
{
[aCoder encodeObject:_identifier forKey:_CPCibProxyObjectIdentifierKey];
}
@end