Author: ericwa
Date: Wed Mar 12 01:10:59 2014
New Revision: 10543
URL: http://svn.gna.org/viewcvs/etoile?rev=10543&view=rev
Log:
Typewriter: allow EWDocument to be created with -init so window restoration
isn't broken
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWAppDelegate.m
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWDocument.m
Modified: trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWAppDelegate.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWAppDelegate.m?rev=10543&r1=10542&r2=10543&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWAppDelegate.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWAppDelegate.m
Wed Mar 12 01:10:59 2014
@@ -13,30 +13,13 @@
@implementation EWAppDelegate
-+ (NSURL *) defaultDocumentURL
-{
- NSArray *libraryDirs =
NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
-
- NSString *dir = [[[libraryDirs objectAtIndex: 0]
- stringByAppendingPathComponent: @"CoreObjectTypewriter"]
- stringByAppendingPathComponent:
@"Store.coreobjectstore"];
-
- [[NSFileManager defaultManager] createDirectoryAtPath: dir
- withIntermediateDirectories: YES
- attributes: nil
- error: NULL];
-
- return [NSURL fileURLWithPath: dir isDirectory: YES];
-}
-
- (void) applicationDidFinishLaunching: (NSNotification*)notif
{
- [self makeDocument];
}
- (void) makeDocument
{
- EWDocument *doc = [[EWDocument alloc] initWithStoreURL: [EWAppDelegate
defaultDocumentURL]];
+ EWDocument *doc = [[EWDocument alloc] init];
[[NSDocumentController sharedDocumentController] addDocument: doc];
[doc makeWindowControllers];
[doc showWindows];
@@ -58,7 +41,7 @@
- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
{
- return NO;
+ return YES;
}
- (void)applicationWillTerminate:(NSNotification *)notification
Modified: trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWDocument.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWDocument.m?rev=10543&r1=10542&r2=10543&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWDocument.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWDocument.m Wed Mar
12 01:10:59 2014
@@ -59,10 +59,25 @@
return self;
}
++ (NSURL *) defaultDocumentURL
+{
+ NSArray *libraryDirs =
NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
+
+ NSString *dir = [[[libraryDirs objectAtIndex: 0]
+ stringByAppendingPathComponent: @"CoreObjectTypewriter"]
+ stringByAppendingPathComponent:
@"Store.coreobjectstore"];
+
+ [[NSFileManager defaultManager] createDirectoryAtPath: dir
+ withIntermediateDirectories: YES
+ attributes: nil
+ error: NULL];
+
+ return [NSURL fileURLWithPath: dir isDirectory: YES];
+}
+
- (id)init
{
- [NSException raise: NSIllegalSelectorException format: @"use
-initWithPersistentRoot:, not -init"];
- return nil;
+ return [self initWithStoreURL: [[self class] defaultDocumentURL]];
}
#pragma mark - NSDocument overrides
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
