added -isNotEmpty methods

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

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 0221c714ece68eda0897a3f6c9234d3f5c51ca49..c52ff18e7b3b45c88229c5fe102ce40340e2b876 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-13  Helge Hess  <helge.hess@skyrix.com>
+
+       * EOArrayProxy.m, EOPrimaryKeyDictionary.m, EOExpressionArray.m,
+         EORecordDictionary.m: added -isNotEmpty methods (v4.5.55)
+
 2005-08-16  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation

diff --git a/sope-gdl1/GDLAccess/EOArrayProxy.m b/sope-gdl1/GDLAccess/EOArrayProxy.m
index 2a5eca962db9aaf094a407a0e3af7f71b051ff80..e67058228a45019d8e23cb950b784e99d7ae6ff9 100644 (file)
--- a/sope-gdl1/GDLAccess/EOArrayProxy.m
+++ b/sope-gdl1/GDLAccess/EOArrayProxy.m
@@ -172,6 +172,10 @@ void _checkFetch(EOArrayProxy *self) {
   _checkFetch(self);
   return [self->content count];
 }
+- (BOOL)isNotEmpty {
+  _checkFetch(self);
+  return [self->content count] > 0 ? YES : NO;
+}
 - (unsigned int)indexOfObjectIdenticalTo:(id)_object {
   _checkFetch(self);
   return [self->content indexOfObjectIdenticalTo:_object];

diff --git a/sope-gdl1/GDLAccess/EOExpressionArray.m b/sope-gdl1/GDLAccess/EOExpressionArray.m
index 4f4f47edd545c8a8cc2630616e635509aa3d0624..2961ba9028d209a1b657d07fe91d47801125587b 100644 (file)
--- a/sope-gdl1/GDLAccess/EOExpressionArray.m
+++ b/sope-gdl1/GDLAccess/EOExpressionArray.m
@@ -260,6 +260,9 @@
 - (unsigned int)count {
     return [self->array count];
 }
+- (BOOL)isNotEmpty {
+    return [self->array count] > 0 ? YES : NO;
+}
 
 - (NSEnumerator *)objectEnumerator {
     return [self->array objectEnumerator];

diff --git a/sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m b/sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m
index 6d4fb36d8da1cfed2e75ea75671fd96995c141c6..b27d967cfa893f62b85da1d0e838d1a82e56d40e 100644 (file)
--- a/sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m
+++ b/sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.m
@@ -107,6 +107,9 @@
 - (unsigned int)count {
     return 1;
 }
+- (BOOL)isNotEmpty {
+  return YES;
+}
 
 - (unsigned int)hash {
     return 1;
@@ -263,6 +266,9 @@
 - (unsigned int)count {
     return self->count;
 }
+- (BOOL)isNotEmpty {
+  return self->count > 0 ? YES : NO;
+}
 
 - (unsigned int)hash {
     return self->count;

diff --git a/sope-gdl1/GDLAccess/EORecordDictionary.m b/sope-gdl1/GDLAccess/EORecordDictionary.m
index 37b289e7f5d2be2f76bd35976c6a36537d041ede..77e5acd9cf23cd919470a82f2075fa09b958e853 100644 (file)
--- a/sope-gdl1/GDLAccess/EORecordDictionary.m
+++ b/sope-gdl1/GDLAccess/EORecordDictionary.m
@@ -189,10 +189,14 @@ static NSDictionary *emptyDict = nil;
 - (unsigned int)count {
   return self->count;
 }
+- (BOOL)isNotEmpty {
+  return self->count > 0 ? YES : NO;
+}
+
 - (NSEnumerator *)keyEnumerator {
-  return AUTORELEASE([[_EORecordDictionaryKeyEnumerator alloc]
-                            initWithDictionary:self
-                            firstEntry:self->entries count:self->count]);
+  return [[[_EORecordDictionaryKeyEnumerator alloc]
+            initWithDictionary:self
+            firstEntry:self->entries count:self->count] autorelease];
 }
 
 @end /* NSConcreteSmallDictionary */

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 5a9103fbcfe3a90091d3e23c80df915537dcc5fd..1e1b1b4fc4a61239d7b40fff10fac21af915cc33 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=54
+SUBMINOR_VERSION:=55