From a10058fc7f4d3469a462c39ecdbce5cdbe103861 Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Fri, 19 Sep 2008 20:19:08 -0700
Subject: [PATCH] Improved Cib Support.

Reviewed by ross.
---
 AppKit/CPDocumentController.j                |  12 +++----
 AppKit/CPView.j                              |   2 +-
 AppKit/Cib/CPCib.j                           |   3 +-
 AppKit/Cib/_CPCibCustomObject.j              |   2 +-
 AppKit/Cib/_CPCibKeyedUnarchiver.j           |  34 +++++++++++++++++++
 AppKit/Cib/_CPCibWindowTemplate.j            |   2 +-
 AppKit/Platform/DOM/CPDOMDisplayServer.j     |   4 +--
 Tools/NibApp/HelloWorld.nib/info.nib         |   5 ++-
 Tools/NibApp/HelloWorld.nib/keyedobjects.nib | Bin 4015 -> 4087 bytes
 9 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 AppKit/Cib/_CPCibKeyedUnarchiver.j

diff --git a/AppKit/CPDocumentController.j b/AppKit/CPDocumentController.j
index 84fbd9d7a..80edb065b 100644
--- a/AppKit/CPDocumentController.j
+++ b/AppKit/CPDocumentController.j
@@ -100,18 +100,18 @@ var CPSharedDocumentController = nil;
 */
 - (void)openUntitledDocumentOfType:(CPString)aType display:(BOOL)shouldDisplay
 {
-    var document = [self makeUntitledDocumentOfType:aType error:nil];
+    var theDocument = [self makeUntitledDocumentOfType:aType error:nil];
     
-    if (document)
-        [self addDocument:document];
+    if (theDocument)
+        [self addDocument:theDocument];
     
     if (shouldDisplay)
     {
-        [document makeWindowControllers];
-        [document showWindows];
+        [theDocument makeWindowControllers];
+        [theDocument showWindows];
     }
         
-    return document;
+    return theDocument;
 }
 
 /*
diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index 8a90392db..481cce508 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -368,7 +368,7 @@ var DOMElementPrototype         = nil,
     
     [aSubview removeFromSuperview];
     
-    [aView _insertSubview:aView atIndex:index];
+    [self _insertSubview:aView atIndex:index];
 }
 
 /* @ignore */
diff --git a/AppKit/Cib/CPCib.j b/AppKit/Cib/CPCib.j
index be630aedb..ee27f538d 100644
--- a/AppKit/Cib/CPCib.j
+++ b/AppKit/Cib/CPCib.j
@@ -26,6 +26,7 @@ import <Foundation/CPURLRequest.j>
 
 import "CPCustomView.j"
 import "_CPCibCustomObject.j"
+import "_CPCibKeyedUnarchiver.j"
 import "_CPCibObjectData.j"
 import "_CPCibWindowTemplate.j"
 
@@ -51,7 +52,7 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
 - (BOOL)instantiateCibWithExternalNameTable:(CPDictionary)anExternalNameTable
 {
-    var unarchiver = [[CPKeyedUnarchiver alloc] initForReadingWithData:_data],
+    var unarchiver = [[_CPCibKeyedUnarchiver alloc] initForReadingWithData:_data],
         objectData = [unarchiver decodeObjectForKey:CPCibObjectDataKey];
 
     if (!objectData || ![objectData isKindOfClass:[_CPCibObjectData class]])
diff --git a/AppKit/Cib/_CPCibCustomObject.j b/AppKit/Cib/_CPCibCustomObject.j
index 56b633c9a..5064784d8 100644
--- a/AppKit/Cib/_CPCibCustomObject.j
+++ b/AppKit/Cib/_CPCibCustomObject.j
@@ -28,7 +28,7 @@ var _CPCibCustomObjectClassName = @"_CPCibCustomObjectClassName";
     [aCoder encodeObject:_className forKey:_CPCibCustomObjectClassName];
 }
 
-- (id)awakeAfterUsingCoder:(CPCoder)aCoder
+- (id)_cibInstantiate
 {
     var theClass = CPClassFromString(_className);
     
diff --git a/AppKit/Cib/_CPCibKeyedUnarchiver.j b/AppKit/Cib/_CPCibKeyedUnarchiver.j
new file mode 100644
index 000000000..f962d2be6
--- /dev/null
+++ b/AppKit/Cib/_CPCibKeyedUnarchiver.j
@@ -0,0 +1,34 @@
+
+import <Foundation/CPKeyedUnarchiver.j>
+
+
+@implementation _CPCibKeyedUnarchiver : CPKeyedUnarchiver
+{
+}
+
+- (id)decodeObjectForKey:(CPString)aKey
+{
+    var object = [super decodeObjectForKey:aKey];
+    
+    if ([object respondsToSelector:@selector(_cibInstantiate)])
+    {
+        var index = [[_plistObject objectForKey:aKey] objectForKey:_CPKeyedArchiverUIDKey],
+            processedObject = [object _cibInstantiate];
+            
+        if (processedObject != object)
+        {
+            object = processedObject;
+        
+            [self replaceObjectAtUID:index withObject:processedObject];
+        }
+    }
+    
+    return object;
+}
+
+- (void)replaceObjectAtUID:(int)aUID withObject:(id)anObject
+{
+    _objects[aUID] = anObject;
+}
+
+@end
\ No newline at end of file
diff --git a/AppKit/Cib/_CPCibWindowTemplate.j b/AppKit/Cib/_CPCibWindowTemplate.j
index 7147656aa..dec6bd3c4 100644
--- a/AppKit/Cib/_CPCibWindowTemplate.j
+++ b/AppKit/Cib/_CPCibWindowTemplate.j
@@ -65,7 +65,7 @@ var _CPCibWindowTemplateMinSizeKey          = @"_CPCibWindowTemplateMinSizeKey",
     [aCoder encodeObject:_windowView forKey:_CPCibWindowTemplateWindowViewKey];
 }
 
-- (id)awakeAfterUsingCoder:(CPCoder)aCoder
+- (id)_cibInstantiate
 {
     var windowClass = CPClassFromString(_windowClass);
     
diff --git a/AppKit/Platform/DOM/CPDOMDisplayServer.j b/AppKit/Platform/DOM/CPDOMDisplayServer.j
index 0e34fef89..b2338c339 100644
--- a/AppKit/Platform/DOM/CPDOMDisplayServer.j
+++ b/AppKit/Platform/DOM/CPDOMDisplayServer.j
@@ -133,7 +133,7 @@ CPDOMDisplayServerViewsContext          = {};
                                             CPDOMDisplayServerInstructions[index++] = nil;
                                             
                                             break;
-                }}catch(e) { alert("here?" + instruction) }
+                }}catch(e) { CPLog("here?" + instruction) }
         }
         
         CPDOMDisplayServerInstructionCount = 0;
@@ -155,7 +155,7 @@ CPDOMDisplayServerViewsContext          = {};
             [view displayIfNeeded];
         }
     }
-        
+
     [CPDOMDisplayRunLoop performSelector:@selector(run) target:CPDOMDisplayServer argument:nil order:0 modes:[CPDefaultRunLoopMode]];
 }
 
diff --git a/Tools/NibApp/HelloWorld.nib/info.nib b/Tools/NibApp/HelloWorld.nib/info.nib
index b8f7650f5..d92bee152 100644
--- a/Tools/NibApp/HelloWorld.nib/info.nib
+++ b/Tools/NibApp/HelloWorld.nib/info.nib
@@ -7,7 +7,10 @@
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
-	<array/>
+	<array>
+		<integer>1</integer>
+		<integer>10</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>9F33</string>
 	<key>targetFramework</key>
diff --git a/Tools/NibApp/HelloWorld.nib/keyedobjects.nib b/Tools/NibApp/HelloWorld.nib/keyedobjects.nib
index 3ad8add67f8afcdbeae4c98d4699dbea7bfd30f6..acebe2aa01ffb8ede7a87325d27929eefad4d8cf 100644
GIT binary patch
delta 2371
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

delta 2373
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
bBSwnRVvNWW6T|<SiV~i2d3dhBi?V+Kxha#(