Corrected an issue loading .gmodels from "gopen" or from the workspace app.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@20699 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2005-02-13 09:40:12 +00:00
parent 2feadabe19
commit 94a6c491f8
2 changed files with 31 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2005-02-13 04:46 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: in -loadDocument: if the extension is
.gmodel call the openGModel: method to load it.
2005-02-06 10:43 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: in -saveAsDocument: return the value

View file

@ -1715,7 +1715,15 @@ static NSImage *fileImage = nil;
NSDirectoryEnumerator *dirEnumerator;
BOOL repairFile = [[NSUserDefaults standardUserDefaults] boolForKey: @"GormRepairFileOnLoad"];
NSMenu *mainMenu;
NSString *ext = [aFile pathExtension];
// If someone attempts to open a .gmodel using open or in a
// workspace manager, open it.. otherwise open the .gorm file.
if([ext isEqual: @"gmodel"])
{
return [self openGModel: aFile];
}
if ([mgr fileExistsAtPath: aFile isDirectory: &isDir])
{
// if the data is in a directory, then load from objects.gorm
@ -2586,7 +2594,7 @@ static NSImage *fileImage = nil;
return [nameTable objectForKey: @"NSServicesMenu"];
}
/*
/**
* To revert to a saved version, we actually load a new document and
* close the original document, returning the id of the new document.
*/
@ -2605,6 +2613,10 @@ static NSImage *fileImage = nil;
return nil;
}
/**
* Save the document. If this is called when documentPath is nil,
* then saveGormDocument: will call it to define the path.
*/
- (BOOL) saveAsDocument: (id)sender
{
NSSavePanel *sp;
@ -2635,11 +2647,11 @@ static NSImage *fileImage = nil;
return NO;
}
//
// Private method which iterates through the list of custom classes and instructs
// the archiver to replace the actual object with template during the archiving
// process.
//
/**
* Private method which iterates through the list of custom classes and instructs
* the archiver to replace the actual object with template during the archiving
* process.
*/
- (void) _replaceObjectsWithTemplates: (NSArchiver *)archiver
{
GormClassManager *cm = [self classManager];
@ -2667,6 +2679,10 @@ static NSImage *fileImage = nil;
}
}
/**
* Save the document. This method creates the directory and the files needed
* to comprise the .gorm package.
*/
- (BOOL) saveGormDocument: (id)sender
{
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
@ -2906,6 +2922,10 @@ static NSImage *fileImage = nil;
return YES;
}
/**
* Marks this document as the currently active document. The active document is
* the one being edited by the user.
*/
- (void) setDocumentActive: (BOOL)flag
{
if (flag != isActive && isDocumentOpen)