diff --git a/AppKit/CPApplication.j b/AppKit/CPApplication.j index dfc68d528..06662715d 100644 --- a/AppKit/CPApplication.j +++ b/AppKit/CPApplication.j @@ -1358,8 +1358,8 @@ var _CPAppBootstrapperActions = nil; if (mainCibFile) { [mainBundle loadCibFile:mainCibFile - externalNameTable:@{ CPCibOwner: CPApp } - loadDelegate:self]; + externalNameTable:@{ CPCibOwner: CPApp } + loadDelegate:self]; return YES; } @@ -1436,7 +1436,7 @@ var _CPAppBootstrapperActions = nil; + (void)cibDidFailToLoad:(CPCib)aCib { - throw new Error("Could not load main cib file (Did you forget to nib2cib it?)."); + throw new Error("Could not load main cib file. Did you forget to nib2cib it?"); } + (void)reset diff --git a/AppKit/Cib/CPCibLoading.j b/AppKit/Cib/CPCibLoading.j index 8a46e670f..91ae95ed3 100644 --- a/AppKit/Cib/CPCibLoading.j +++ b/AppKit/Cib/CPCibLoading.j @@ -63,8 +63,8 @@ var CPCibOwner = @"CPCibOwner"; + (CPCib)loadCibFile:(CPString)anAbsolutePath externalNameTable:(CPDictionary)aNameTable loadDelegate:aDelegate { return ([[CPCib alloc] - initWithContentsOfURL:anAbsolutePath - loadDelegate:[[_CPCibLoadDelegate alloc] + initWithContentsOfURL:anAbsolutePath + loadDelegate:[[_CPCibLoadDelegate alloc] initWithLoadDelegate:aDelegate externalNameTable:aNameTable]]); } @@ -84,9 +84,9 @@ var CPCibOwner = @"CPCibOwner"; - (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate { return ([[CPCib alloc] - initWithCibNamed:aFileName - bundle:self - loadDelegate:[[_CPCibLoadDelegate alloc] + initWithCibNamed:aFileName + bundle:self + loadDelegate:[[_CPCibLoadDelegate alloc] initWithLoadDelegate:aDelegate externalNameTable:aNameTable]]); }