From 217f150dfa16f486f43af4d61796a64e26ead054 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 14 Sep 2004 10:42:40 +0000 Subject: [PATCH] deprecated some API in resource manager git-svn-id: http://svn.opengroupware.org/SOPE/trunk@134 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 3 +++ sope-appserver/NGObjWeb/OWResourceManager.m | 9 +++++---- sope-appserver/NGObjWeb/Version | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 919bea0e..4e060512 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,8 @@ 2004-09-13 Helge Hess + * OWResourceManager.m: deprecated -pathToComponentNamed:inFramework: + in favor of -pathToComponentNamed:inFramework:languages (v4.3.38) + * v4.3.37 * Templates/WOWrapperTemplateBuilder.m: added ability to load wod diff --git a/sope-appserver/NGObjWeb/OWResourceManager.m b/sope-appserver/NGObjWeb/OWResourceManager.m index 90a9260b..ed8b35ab 100644 --- a/sope-appserver/NGObjWeb/OWResourceManager.m +++ b/sope-appserver/NGObjWeb/OWResourceManager.m @@ -601,6 +601,7 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path) - (NSString *)pathToComponentNamed:(NSString *)_name inFramework:(NSString *)_framework + languages:(NSArray *)_langs { /* search for component wrapper .. */ // TODO: shouldn't we used that for WOx as well? @@ -628,17 +629,17 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path) path = [self pathForResourceNamed:specName inFramework:_framework - languages:nil]; + languages:_langs]; if (path != nil) return path; } return nil; } - (NSString *)pathToComponentNamed:(NSString *)_name - inFramework:(NSString *)_framework - languages:(NSArray *)_langs + inFramework:(NSString *)_fw { - return [self pathToComponentNamed:_name inFramework:_framework]; + // TODO: is this still used somewhere? + return [self pathToComponentNamed:_name inFramework:_fw languages:nil]; } - (WOComponentDefinition *)_definitionForPathlessComponent:(NSString *)_name diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 89f877e1..3c3f9fab 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=37 +SUBMINOR_VERSION:=38 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 -- 2.39.5