fixed a bug in selector processing

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index edce86be5258c1c2e960383ee1b18ffd4aab1c43..9b96516f9074e6387f35611d785ec2e30a8db91b 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-11  Helge Hess  <helge.hess@opengroupware.org>
 
+       * SoObjects/SoObjCClass.m: fixed a bug in "Action" selector processing
+         (v4.3.62)
+
        * v4.3.61
 
        * SoObjects/product.plist: properly export SoActionInvocation

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
index 4352811ba55bd023704205a1b54fa35ce429056a..5db7e94c8032ee7714f113aca01e26008093d236 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOJavaScript.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "WOHTMLDynamicElement.h"
 
@@ -123,7 +122,7 @@
   
   sComponent = [_ctx component];
   hide = [self->hideInComment boolValueInComponent:sComponent];
-    
+  
   WOResponse_AddCString(_response, "<script language=\"JavaScript\" ");
 
   /* add URL to script */

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
index 39d3c5dace3d5ae1bd1992b7e6d6a7c4bc2f4b0f..237dc6cd6cc05a74e25bddd908968f86e2eb306c 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.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 <NGObjWeb/WODynamicElement.h>
 #include "WOElement+private.h"
@@ -854,7 +853,9 @@ _sapplyIndex(_WOSimpleRepetition *self, WOComponent *sComponent, NSArray *array,
 /* description */
 
 - (NSString *)associationDescription {
-  NSMutableString *str = [NSMutableString stringWithCapacity:24];
+  NSMutableString *str;
+  
+  str = [NSMutableString stringWithCapacity:24];
   if (self->list)     [str appendFormat:@" list=%@",     self->list];
   if (self->item)     [str appendFormat:@" item=%@",     self->item];
   if (self->template) [str appendFormat:@" template=%@", self->template];

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m b/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m
index 0d045f4aabd35acdaa1213e3d9e6d08bc8c1d753..d0435d02f3027bf7d5c7992f47dfd60ae4e902d9 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjCClass.m
@@ -18,7 +18,7 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: SoObjCClass.m 1 2004-08-20 10:08:27Z znek $
 
 #include "SoObjCClass.h"
 #include "SoSelectorInvocation.h"
@@ -61,9 +61,10 @@
     r = [methodName rangeOfString:@"Action"];
     if (r.length == 0) continue;
     
+    /* eg: doItAction:abc: => doItAction */
     methodPrefix = [methodName substringToIndex:(r.location + r.length)];
     
-    if ((r.location + r.length) > len) {
+    if (len > (r.location + r.length)) {
       /* something is beyond the xxxAction, *must* be followed by a colon */
       if ([methodName characterAtIndex:(r.location + r.length)] != ':')
        continue;

diff --git a/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m b/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m
index 01d2ed12a74fc1d235a8e285b9e1c7da542ba6da..9c89a88fadc9619978ba7a87ce3ee25cc249b8f6 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m
+++ b/sope-appserver/NGObjWeb/SoObjects/WODirectAction+SoObjects.m
@@ -52,7 +52,7 @@
   SEL sel;
   
   daName = [_name stringByAppendingString:@"Action"];
-  sel    = NSSelectorFromString(daName);
+  sel    = daName ? NSSelectorFromString(daName) : NULL;
   
   if (![self respondsToSelector:sel])
     return [super lookupName:_name inContext:_ctx acquire:_flag];

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index ca7d1576fde41a7b58eed2ca497eb0d35f424157..5bc45e6da394f1eaeaa2dfb019b1ef3b0be782ee 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=61
+SUBMINOR_VERSION:=62
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115