From 46cb322addd35b70c6bfef64baba75621bc44a9b Mon Sep 17 00:00:00 2001 From: mguesdon Date: Sun, 23 Nov 2003 18:00:48 +0000 Subject: [PATCH] o removed projectName (now inherit from GSWDeployedBundle) git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18112 72102866-910b-0410-8b05-ffd578937521 --- GSWeb.framework/GSWProjectBundle.h | 8 ++------ GSWeb.framework/GSWProjectBundle.m | 15 ++++----------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/GSWeb.framework/GSWProjectBundle.h b/GSWeb.framework/GSWProjectBundle.h index 4d61ea1..ad1038b 100644 --- a/GSWeb.framework/GSWProjectBundle.h +++ b/GSWeb.framework/GSWProjectBundle.h @@ -36,25 +36,21 @@ //==================================================================== @interface GSWProjectBundle : GSWDeployedBundle { - NSString* _projectName; NSDictionary* _subprojects; NSDictionary* _pbProjectDictionary; }; -(id)initWithPath:(NSString*)aPath; --(void)dealloc; --(NSString*)description; -(NSArray*)lockedPathsForResourcesOfType:(id)aType; -(NSArray*)lockedPathsForResourcesInSubprojectsOfType:(id)aType; -(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName - forLanguage:(NSString*)aLanguage; + language:(NSString*)aLanguage; -(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName - forLanguages:(NSArray*)someLanguages; + languages:(NSArray*)someLanguages; -(NSDictionary*)subprojects; -(BOOL)isFramework; -(GSWDeployedBundle*)projectBundle; -(NSString*)projectPath; --(NSString*)projectName; -(NSDictionary*)_pbProjectDictionary; @end diff --git a/GSWeb.framework/GSWProjectBundle.m b/GSWeb.framework/GSWProjectBundle.m index 893d7a8..efcd805 100644 --- a/GSWeb.framework/GSWProjectBundle.m +++ b/GSWeb.framework/GSWProjectBundle.m @@ -54,7 +54,6 @@ RCS_ID("$Id$") //-------------------------------------------------------------------- -(void)dealloc { - DESTROY(_projectName); DESTROY(_subprojects); DESTROY(_pbProjectDictionary); [super dealloc]; @@ -89,20 +88,20 @@ RCS_ID("$Id$") //-------------------------------------------------------------------- -(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName - forLanguage:(NSString*)aLanguage + language:(NSString*)aLanguage { LOGObjectFnNotImplemented(); //TODOFN return [super lockedRelativePathForResourceNamed:aName - forLanguage:aLanguage]; + language:aLanguage]; }; //-------------------------------------------------------------------- -(NSString*)lockedRelativePathForResourceNamed:(NSString*)aName - forLanguages:(NSArray*)someLanguages + languages:(NSArray*)someLanguages { LOGObjectFnNotImplemented(); //TODOFN return [super lockedRelativePathForResourceNamed:aName - forLanguages:someLanguages]; + languages:someLanguages]; }; //-------------------------------------------------------------------- @@ -132,12 +131,6 @@ RCS_ID("$Id$") return nil; }; -//-------------------------------------------------------------------- --(NSString*)projectName -{ - return _projectName; -}; - //-------------------------------------------------------------------- -(NSDictionary*)_pbProjectDictionary {