gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-05-08 22:20:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

search Bundles too

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@14467 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
dwetzel 2002-09-16 23:49:06 +00:00
parent db664c3cf7
commit 2cf97deea2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
GSWeb.framework/GSWResourceManager.m
View file

@ -1045,7 +1045,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
{ {
// NSDebugMLLog(@"resmanager",@"frameworkName=%@",frameworkName); // NSDebugMLLog(@"resmanager",@"frameworkName=%@",frameworkName);
bundle=[self lockedCachedBundleForFrameworkNamed:frameworkName]; bundle=[self lockedCachedBundleForFrameworkNamed:frameworkName];
NSDebugMLLog(@"resmanager",@"bundle=%@",bundle); //NSDebugMLLog(@"resmanager",@"bundle=%@",bundle);
if (bundle) if (bundle)
{ {
// NSDebugMLLog(@"resmanager",@"found cached bundle=%@",bundle); // NSDebugMLLog(@"resmanager",@"found cached bundle=%@",bundle);
@ -1095,13 +1095,17 @@ NSString* localNotFoundMarker=@"NOTFOUND";
// NSDebugMLLog(@"resmanager",@"bundle %@ %s cached",resourceName,(bundle ? "" : "NOT")); // NSDebugMLLog(@"resmanager",@"bundle %@ %s cached",resourceName,(bundle ? "" : "NOT"));
if (!bundle) if (!bundle)
{ {
NSArray* allFrameworks=[NSBundle allFrameworks]; NSMutableArray* allFrameworks=[[NSBundle allFrameworks] mutableCopy];
int i=0; int i=0;
NSString* bundlePath=nil; NSString* bundlePath=nil;
NSBundle* tmpBundle=nil; NSBundle* tmpBundle=nil;
NSDictionary* infoDict=nil; NSDictionary* infoDict=nil;
NSString* frameworkName=nil; NSString* frameworkName=nil;
GSWDeployedBundle* projectBundle=nil; GSWDeployedBundle* projectBundle=nil;
[allFrameworks addObjectsFromArray:[NSBundle allBundles]];
[allFrameworks autorelease];
for(i=0;!bundle && i<[allFrameworks count];i++) for(i=0;!bundle && i<[allFrameworks count];i++)
{ {
tmpBundle=[allFrameworks objectAtIndex:i]; tmpBundle=[allFrameworks objectAtIndex:i];
@ -1290,7 +1294,7 @@ NSString* localNotFoundMarker=@"NOTFOUND";
} }
else else
frameworks=[NSArray arrayWithObject:aFrameworkName ? aFrameworkName : @""]; frameworks=[NSArray arrayWithObject:aFrameworkName ? aFrameworkName : @""];
for(i=0;!path && i<[frameworks count];i++) for(i=0;!path && i<[frameworks count];i++)
{ {
frameworkName=[frameworks objectAtIndex:i]; frameworkName=[frameworks objectAtIndex:i];