From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 3 Nov 2006 20:46:54 +0000 (+0000)
Subject: code cleanups
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d25ff1b2d65ce0ade3de06d6fb8b36981ecc9faa;p=sope

code cleanups


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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 82372e62..92b9bf74 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-03  Helge Hess  <helge.hess@opengroupware.org>
+
+	* v4.5.254
+
+	* DynamicElements/WOInput.m: changed to use -warnWithFormat:
+
+	* DynamicElements/WOCheckBox.m: subminor code cleanup
+
 2006-11-02  Helge Hess  <helge.hess@opengroupware.org>
 
 	* woapp-gs.make: fixed a bug in a variable test for which_lib, note
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
index 8fc69596..0fffe99e 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOCheckBox.m
@@ -111,7 +111,7 @@
   
   [self appendExtraAttributesToResponse:_response inContext:_ctx];
   
-  if (self->otherTagString) {
+  if (self->otherTagString != nil) {
     WOResponse_AddChar(_response, ' ');
     WOResponse_AddString(_response,
 			 [self->otherTagString stringValueInComponent:
diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOInput.m b/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
index 5d5f1950..546c9aad 100644
--- a/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOInput.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -58,9 +59,8 @@ static BOOL takeValueDebugOn = YES;
     [(NSMutableDictionary *)_associations removeObjectForKey:@"type"];
     
     if ([_associations objectForKey:@"NAME"]) {
-      NSLog(@"WARNING: found 'NAME' association in element %@, "
-            @"'name' is probably the right thing ..",
-            self);
+      [self warnWithFormat:@"found 'NAME' association in element %@, "
+            @"'name' is probably the right thing.", _name];
     }
   }
   return self;
@@ -85,8 +85,8 @@ NSString *OWFormElementName(WOInput *self, WOContext *_ctx) {
     return name;
   
   [[_ctx component]
-         logWithFormat:
-               @"WARNING: in element %@, 'name' attribute configured (%@),"
+         warnWithFormat:
+               @"in element %@, 'name' attribute configured (%@),"
                @"but no name assigned (using elementID as name) !",
                self, self->name];
   return [_ctx elementID];
@@ -134,8 +134,9 @@ NSString *OWFormElementName(WOInput *self, WOContext *_ctx) {
   NSMutableString *str;
   
   str = [NSMutableString stringWithCapacity:128];
-  if (self->value)    [str appendFormat:@" value=%@",    self->value];
-  if (self->name)     [str appendFormat:@" name=%@",     self->name];
+  if (self->value != nil) [str appendFormat:@" value=%@",    self->value];
+  if (self->name  != nil) [str appendFormat:@" name=%@",     self->name];
+  
   if (self->disabled) [str appendFormat:@" disabled=%@", self->disabled];
   return str;
 }
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 9c0d91a7..f385ac55 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=253
+SUBMINOR_VERSION:=254
 
 # v4.5.234 requires libDOM          v4.5.21
 # v4.5.214 requires libNGExtensions v4.5.179
diff --git a/sope-appserver/WOExtensions/WOTable.m b/sope-appserver/WOExtensions/WOTable.m
index b3cb0024..85eb8724 100644
--- a/sope-appserver/WOExtensions/WOTable.m
+++ b/sope-appserver/WOExtensions/WOTable.m
@@ -21,6 +21,11 @@
 
 #include <NGObjWeb/WODynamicElement.h>
 
+/*
+  WOTable
+  
+  TODO: document
+*/
 @interface WOTable : WODynamicElement
 {
   // WODynamicElement: extraAttributes