From 31179461334f4ec9baf696de5f06ec9ce3cd0089 Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 24 Nov 2004 11:26:26 +0000 Subject: [PATCH] minor code cleanups git-svn-id: http://svn.opengroupware.org/SOPE/trunk@410 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 4 ++++ .../NGObjWeb/DynamicElements/WOComponentReference.h | 1 - sope-appserver/NGObjWeb/DynamicElements/WOForm.m | 12 ++++++------ sope-appserver/NGObjWeb/Version | 2 +- sope-core/NGExtensions/ChangeLog | 4 ++++ sope-core/NGExtensions/NGBundleManager.m | 7 ++++--- sope-core/NGExtensions/Version | 2 +- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index b8033ed8..a121e67e 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,7 @@ +2004-11-24 Helge Hess + + * DynamicElements/WOForm.m: minor code cleanups (v4.5.100) + 2004-11-23 Helge Hess * WORequestHandler.m: properly check whether logger is available diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h index f7788271..044780da 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOComponentReference.h @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __NGObjWeb_WOComponentReference_H__ #define __NGObjWeb_WOComponentReference_H__ diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m index 0143fe02..aaf6b84f 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m @@ -240,7 +240,7 @@ static int debugTakeValues = -1; WOComponent *sComponent = [_ctx component]; NSString *s; NSDictionary *d; - + s = [self->href stringValueInComponent:sComponent]; d = [self->queryDictionary valueInComponent:sComponent]; @@ -273,11 +273,11 @@ static int debugTakeValues = -1; NSString *uri; sComponent = [_c component]; - daClass = [self->actionClass stringValueInComponent:sComponent]; + daClass = [self->actionClass stringValueInComponent:sComponent]; daName = [self->directActionName stringValueInComponent:sComponent]; - if (daClass) { - if (daName) { + if (daClass != nil) { + if (daName != nil) { if (![daClass isEqualToString:@"DirectAction"]) daName = [NSString stringWithFormat:@"%@/%@", daClass, daName]; } @@ -345,8 +345,8 @@ static int debugTakeValues = -1; sComponent = [_ctx component]; WOResponse_AddCString(_response, "
href) + + if (self->href != nil) queryString = [self _addHrefToResponse:_response inContext:_ctx]; else if (self->directActionName != nil || self->actionClass != nil) [self _addDirectActionToResponse:_response inContext:_ctx]; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index a507aa0d..40fbc50d 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=99 +SUBMINOR_VERSION:=100 # v4.5.91 requires libNGExtensions v4.5.134 # v4.5.84 requires libNGExtensions v4.5.127 diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index bc47f01f..78048ae7 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,3 +1,7 @@ +2004-11-24 Helge Hess + + * NGBundleManager.m: subminor code cleanups (v4.5.137) + 2004-11-19 Marcus Mueller * NGLogging: updated - API considered stable now. diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m index 2a2489da..c0feecc7 100644 --- a/sope-core/NGExtensions/NGBundleManager.m +++ b/sope-core/NGExtensions/NGBundleManager.m @@ -1553,7 +1553,7 @@ static BOOL _doesInfoMatch(NSArray *keys, NSDictionary *dict, NSDictionary *info /* scan all bundle search paths */ e = [self->bundleSearchPaths objectEnumerator]; - while ((path = [e nextObject])) { + while ((path = [e nextObject]) != nil) { NSEnumerator *dir; BOOL isDir = NO; NSString *tmp; @@ -1564,9 +1564,10 @@ static BOOL _doesInfoMatch(NSArray *keys, NSDictionary *dict, NSDictionary *info if (!isDir) continue; /* check whether an appropriate bundle is contained in 'path' */ - + + // TODO: move to own method dir = [[fm directoryContentsAtPath:path] objectEnumerator]; - while ((tmp = [dir nextObject])) { + while ((tmp = [dir nextObject]) != nil) { NSDictionary *bundleInfo = nil; NSArray *providedResources = nil; NSString *infoPath; diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index 0ed06f52..e8804e43 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=136 +SUBMINOR_VERSION:=137 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 -- 2.39.5