gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Indented

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@9572 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-04-12 14:20:26 +00:00
parent 040f694d58
commit 9007f47800
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Model/IMLoading.m
View file

@ -62,23 +62,29 @@ BOOL _fileOwnerDecoded = NO;
GMModel* decoded;
if (![[path pathExtension] isEqualToString:@"gmodel"])
path = [path stringByAppendingPathExtension:@"gmodel"];
{
path = [path stringByAppendingPathExtension:@"gmodel"];
}
/* First check to see if path is an absolute path; if so try to load the
pointed file. */
if ([path isAbsolutePath]) {
if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
/* The file is an absolute path name but the model file doesn't exist. */
return NO;
}
if (![[NSFileManager defaultManager] fileExistsAtPath:path])
{
/* The file is an absolute path name but the model file
doesn't exist. */
return NO;
}
}
else {
/* The path is a relative path; search it in the current bundle. */
else
{
/* The path is a relative path; search it in the current bundle. */
NSString *abspath = [resourcePath stringByAppendingPathComponent:path];
if (![[NSFileManager defaultManager] fileExistsAtPath:abspath]) {
NSArray *paths;
if (![[NSFileManager defaultManager] fileExistsAtPath:abspath])
{
NSArray *paths;
NSString *root;
paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSSystemDomainMask, YES);
if ((paths != nil) && ([paths count] > 0))
@ -87,19 +93,25 @@ BOOL _fileOwnerDecoded = NO;
root = [root stringByAppendingPathComponent:@"Model"];
abspath = [root stringByAppendingPathComponent:path];
if (![[NSFileManager defaultManager] fileExistsAtPath:abspath])
return NO;
{
return NO;
}
}
else
return NO;
{
return NO;
}
}
path = abspath;
}
}
NSLog (@"loading model file %@...", path);
unarchiver = [GMUnarchiver unarchiverWithContentsOfFile:path];
if (!unarchiver)
return NO;
{
return NO;
}
/* Set the _nibOwner to `owner' so that the first decoded custom object
replaces itself with `owner'. Also set _fileOwnerDecoded so that the
@ -109,7 +121,7 @@ BOOL _fileOwnerDecoded = NO;
decoded = [unarchiver decodeObjectWithName:@"RootObject"];
[decoded _makeConnections];
/* Restore the previous nib owner. We do this because loadIMFile:owner: can
be invoked recursively. */
_nibOwner = previousNibOwner;