reverted WORepetition 'list' extension

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 4e57dc3e55d7b2dd3126fb0a02d642bd1bc00358..fd215036a5d2f53db8bcb4769e6385bc14b44a16 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-13  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * WORepetition.m: Reverted 'list' binding extensions as this had side
+         effects with existing code. I advise using 'asArray' trampolines in
+         situations where the 'list extension' was helpful. (v4.7.4)
+
 2007-03-06  Helge Hess  <helge.hess@opengroupware.org>
 
        * Templates/WOWrapperTemplateBuilder.m: allow component classes in

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
index e7e1ba6dc017200e5ce32f71c8693a9d11247706..83e369f4fbedf70a62af35dcb3386c357cf719d3 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WORepetition.m
@@ -137,8 +137,6 @@ static inline Class _classForConfig(NSDictionary *_config) {
 
 @implementation WORepetition
 
-static Class NSArrayClass = Nil;
-
 + (int)version {
   return [super version] + 1 /* v3 */;
 }
@@ -147,8 +145,6 @@ static Class NSArrayClass = Nil;
             @"invalid superclass (%@) version %i !",
             NSStringFromClass([self superclass]), [super version]);
 
-  NSArrayClass = [NSArray class];
-
   if (debugTakeValues == -1) {
     debugTakeValues = 
       [[NSUserDefaults standardUserDefaults] boolForKey:@"WODebugTakeValues"]
@@ -261,8 +257,6 @@ _applyIdentifier(_WOComplexRepetition *self,
 #endif
 
   array = [self->list valueInComponent:sComponent];
-  if ((array != nil) && ![array isKindOfClass:NSArrayClass])
-    array = [NSArray arrayWithObject:array];
   count = [array count];
 
   if (count > 0) {
@@ -303,8 +297,6 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
   NSArray *array;
   
   array = [self->list valueInComponent:sComponent];
-  if ((array != nil) && ![array isKindOfClass:NSArrayClass])
-    array = [NSArray arrayWithObject:array];
 
   if (self->index)
     [self->index setUnsignedIntValue:_idx inComponent:sComponent];
@@ -339,12 +331,10 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
 #endif
   
   sComponent = [_ctx component];
-  array = [self->list valueInContext:_ctx];
-  if ((array != nil) && ![array isKindOfClass:NSArrayClass])
-    array = [NSArray arrayWithObject:array];
-  aCount = [array count];
+  array      = [self->list valueInContext:_ctx];
+  aCount     = [array count];
   
-  goCount = self->count
+  goCount    = self->count
     ? [self->count unsignedIntValueInComponent:sComponent]
     : aCount;
   
@@ -487,13 +477,10 @@ _applyIndex(_WOComplexRepetition *self, WOComponent *sComponent, unsigned _idx)
   
   sComponent = [_ctx component];
   array      = [self->list valueInContext:_ctx];
-  if ((array != nil) && ![array isKindOfClass:NSArrayClass])
-    array = [NSArray arrayWithObject:array];
-
   aCount     = [array count];
   startIdx   = [self->startIndex unsignedIntValueInComponent:sComponent];
-  
-  goCount = self->count
+
+  goCount    = self->count
     ? [self->count unsignedIntValueInComponent:sComponent]
     : aCount;
   
@@ -795,8 +782,6 @@ _sapplyIndex(_WOSimpleRepetition *self, WOComponent *sComponent, NSArray *array,
   
   sComponent = [_ctx component];
   array      = [self->list valueInContext:_ctx];
-  if ((array != nil) && ![array isKindOfClass:NSArrayClass])
-    array = [NSArray arrayWithObject:array];
   aCount     = [array count];
   
   if (aCount > 0) {

diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
index 132f59fe370a967a8ef80fd3524f123e19ee8649..78bac319b1a85a850a298956002b586f2e90eaed 100644 (file)
--- a/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
+++ b/sope-appserver/NGObjWeb/NGObjWeb.xcodeproj/project.pbxproj
@@ -2313,8 +2313,8 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.7.255;
+                               DYLIB_COMPATIBILITY_VERSION = 4.7.0;
+                               DYLIB_CURRENT_VERSION = 4.7.4;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2338,7 +2338,7 @@
                                OTHER_CFLAGS = (
                                        "-DSOPE_MAJOR_VERSION=4",
                                        "-DSOPE_MINOR_VERSION=7",
-                                       "-DSOPE_SUBMINOR_VERSION=255",
+                                       "-DSOPE_SUBMINOR_VERSION=4",
                                );
                                OTHER_LDFLAGS = (
                                        "-seg1addr",

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index c765e0e4196800a9548c28d70071838d67a88218..b415afdf89b8e2b713000cd25cfd1c9230aa8e50 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4
 
 # v4.5.234 requires libDOM          v4.5.21
 # v4.5.214 requires libNGExtensions v4.5.179