Extracted new method [pathForNibResource:] for NSWindowController.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11545 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2001-11-26 20:28:34 +00:00
parent e9e500d310
commit afed87226a

View file

@ -314,9 +314,7 @@ Class gmodel_class(void)
withZone: [owner zone]]; withZone: [owner zone]];
} }
- (BOOL) loadNibFile: (NSString*)fileName - (NSString *) pathForNibResource: (NSString *)fileName
externalNameTable: (NSDictionary*)context
withZone: (NSZone*)zone
{ {
NSFileManager *mgr = [NSFileManager defaultManager]; NSFileManager *mgr = [NSFileManager defaultManager];
NSMutableArray *array = [NSMutableArray arrayWithCapacity: 8]; NSMutableArray *array = [NSMutableArray arrayWithCapacity: 8];
@ -378,22 +376,32 @@ Class gmodel_class(void)
} }
} }
} }
return [NSBundle loadNibFile: path return path;
externalNameTable: context
withZone: (NSZone*)zone];
} }
else else
{ {
path = [rootPath stringByAppendingPathExtension: ext]; path = [rootPath stringByAppendingPathExtension: ext];
if([mgr isReadableFileAtPath: path]) if([mgr isReadableFileAtPath: path])
{ {
return [NSBundle loadNibFile: path return path;
externalNameTable: context
withZone: (NSZone*)zone];
} }
} }
} }
return nil;
}
- (BOOL) loadNibFile: (NSString*)fileName
externalNameTable: (NSDictionary*)context
withZone: (NSZone*)zone
{
NSString *path = [self pathForNibResource: fileName];
if (path != nil)
return [NSBundle loadNibFile: path
externalNameTable: context
withZone: (NSZone*)zone];
else
return NO; return NO;
} }
@end @end