code cleanup

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@175 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index e21f7d9500e851f02471c30a057989a34c79c4fe..8df0172052b5ab2d3fa3fa10bc3f6cb205d74042 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-27  Helge Hess  <helge.hess@opengroupware.org>
+
+       * DynamicElements/WONestedList.m: minor code cleanups (v4.3.48)
+
 2004-09-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * WEClientCapabilities.m: added the NewsFire RSS reader as a known

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
index eb86266183b640f7ebb5081d325482d14c011ade..541ebb6460b013a53a62ef5622277fda685248ba 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WONestedList.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOHTMLDynamicElement.h"
 #include "WOElement+private.h"
@@ -66,7 +65,6 @@
   return self;
 }
 
-#if !LIB_FOUNDATION_BOEHM_GC
 - (void)dealloc {
   RELEASE(self->level);
   RELEASE(self->isOrdered);
@@ -81,15 +79,14 @@
   RELEASE(self->action);
   [super dealloc];
 }
-#endif
 
-// OWResponder
+/* processing requests */
 
 - (void)takeValuesFromRequest:(WORequest *)_req inContext:(WOContext *)_ctx {
   // not a container ..
 }
 
-- (id)invokeActionForRequest:(WORequest *)_request inContext:(WOContext *)_ctx {
+- (id)invokeActionForRequest:(WORequest *)_rq inContext:(WOContext *)_ctx {
   WOComponent *sComponent = [_ctx component];
   id       idxId   = nil;
   id       object  = nil;
@@ -123,6 +120,8 @@
   return [self executeAction:self->action inContext:_ctx];
 }
 
+/* generating response */
+
 - (void)appendList:(NSArray *)_list atLevel:(unsigned int)_level
   toResponse:(WOResponse *)_response inContext:(WOContext *)_ctx
 {
@@ -207,8 +206,9 @@
 }
 
 - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx {
-  NSArray *top = [self->list valueInComponent:[_ctx component]];
-
+  NSArray *top;
+  
+  top = [self->list valueInComponent:[_ctx component]];
   if ([top count] > 0) {
     [self appendList:top
           atLevel:0
@@ -220,8 +220,9 @@
 /* description */
 
 - (NSString *)associationDescription {
-  NSMutableString *str = [[NSMutableString alloc] init];
+  NSMutableString *str;
 
+  str = [NSMutableString stringWithCapacity:64];
   if (self->action)    [str appendFormat:@" action=%@",    self->action];
   if (self->list)      [str appendFormat:@" list=%@",      self->list];
   if (self->sublist)   [str appendFormat:@" sublist=%@",   self->sublist];
@@ -233,8 +234,7 @@
   if (self->value)     [str appendFormat:@" value=%@",     self->value];
   if (self->isOrdered) [str appendFormat:@" isOrdered=%@", self->isOrdered];
   if (self->level)     [str appendFormat:@" level=%@",     self->level];
-
-  return AUTORELEASE(str);
+  return str;
 }
 
 @end /* WONestedList */

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 6951e40268e9ae95f6d5695ecedacd3b8a59c195..a9be7723742c373efa8259816bbd0d369e107fc6 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=47
+SUBMINOR_VERSION:=48
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115