code cleanups

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

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 8eee3a432ae4008269b706fec11933c03c240a4f..c4236e36588c0e6ac342f9de7668ac5fa40a9115 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-10  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v4.7.61
+
+       * EOAttribute.m: minor code cleanups
+
+       * EOExpressionArray.m: copy prefix/suffix/infix strings in accessor
+         methods
+
 2007-06-01  Helge Hess  <helge.hess@opengroupware.org>
 
        * EOEntity.m, EOAttribute.m: minor improvements/comments on value

diff --git a/sope-gdl1/GDLAccess/EOAttribute.m b/sope-gdl1/GDLAccess/EOAttribute.m
index f5147b6e0ff51240639cb21f08b1bb39f0a70154..1ecc14dd534be79ba79e76056b7f22f2e3219ce2 100644 (file)
--- a/sope-gdl1/GDLAccess/EOAttribute.m
+++ b/sope-gdl1/GDLAccess/EOAttribute.m
@@ -108,7 +108,7 @@ static EONull   *null = nil;
 }
 
 - (NSString *)expressionValueForContext:(id<EOExpressionContext>)context {
-  return (context)
+  return (context != nil)
     ? [context expressionValueForAttribute:self]
     : columnName;
 }

diff --git a/sope-gdl1/GDLAccess/EOExpressionArray.m b/sope-gdl1/GDLAccess/EOExpressionArray.m
index c7b5d99ee2c32bc5f1f915daa18d85222f4fe22c..0b08964c69faedf5fdc076e616dcf0a05e916d7a 100644 (file)
--- a/sope-gdl1/GDLAccess/EOExpressionArray.m
+++ b/sope-gdl1/GDLAccess/EOExpressionArray.m
@@ -104,13 +104,13 @@
 }
 
 - (void)setPrefix:(NSString *)_prefix {
-    ASSIGN(self->prefix, _prefix);
+    ASSIGNCOPY(self->prefix, _prefix);
 }
 - (void)setInfix:(NSString *)_infix {
-    ASSIGN(self->infix, _infix);
+    ASSIGNCOPY(self->infix, _infix);
 }
 - (void)setSuffix:(NSString *)_suffix {
-    ASSIGN(self->suffix, _suffix);
+    ASSIGNCOPY(self->suffix, _suffix);
 }
 
 - (NSString *)prefix {
@@ -292,7 +292,7 @@
 
 - (NSString *)expressionValueForContext:(id<EOExpressionContext>)ctx {
     if([self respondsToSelector:@selector(stringValue)])
-       return [(id)self stringValue];
+           return [(id)self stringValue];
 
     return [self description];
 }

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 7fbe8ee140e3623022ccc65103109611c7a3231a..9846aa8db05721ef7bf9a4da045b7975d2286ffb 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=60
+SUBMINOR_VERSION:=61