From da6a07ec811545f61cd23ff8f609299e29bd30cd Mon Sep 17 00:00:00 2001
From: David Ayers <ayers@fsfe.org>
Date: Wed, 2 Mar 2005 14:10:36 +0000
Subject: [PATCH]         * EOControl/EOKeyValueCoding.h/m:
 (-setNilValueForKey:):         Override NSObject's category to invoke        
 -unableToSetNullForKey:.

        * EOControl/EOSortOrdering.m: Include EONull.h instead of
        NSNull.h.

        * EOAccess/EODatabaseChannel.m: Update formatting,


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@20830 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                    | 10 ++++++++++
 EOAccess/EODatabaseChannel.m |  3 ++-
 EOControl/EOKeyValueCoding.h |  3 ++-
 EOControl/EOKeyValueCoding.m |  5 +++++
 EOControl/EOSortOrdering.m   |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 719393c..ec8be9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-02  David Ayers  <d.ayers@inode.at>
+
+	* EOControl/EOKeyValueCoding.h/m: (-setNilValueForKey:):
+	Override NSObject's category to invoke -unableToSetNullForKey:.
+
+	* EOControl/EOSortOrdering.m: Include EONull.h instead of
+	NSNull.h.
+
+	* EOAccess/EODatabaseChannel.m: Update formatting,
+	
 2005-02-22  David Ayers  <d.ayers@inode.at>
 
 	* EOAccess/EOAdaptor.m (-hasOpenChannels): Make safe for
diff --git a/EOAccess/EODatabaseChannel.m b/EOAccess/EODatabaseChannel.m
index 4a28f1e..d4a4c51 100644
--- a/EOAccess/EODatabaseChannel.m
+++ b/EOAccess/EODatabaseChannel.m
@@ -425,7 +425,8 @@ RCS_ID("$Id$")
               EOFLOGObjectLevelArgs(@"gsdb", @"object=%@", object);
               NSAssert1(object, @"No Object. entityClassDescripton=%@", entityClassDescripton);
 
-              EOEditingContext_recordObjectGlobalIDWithImpPtr(_currentEditingContext,NULL,object,gid);
+              EOEditingContext_recordObjectGlobalIDWithImpPtr(_currentEditingContext,
+							      NULL,object,gid);
             }
           else if (object && [EOFault isFault: object])
             {
diff --git a/EOControl/EOKeyValueCoding.h b/EOControl/EOKeyValueCoding.h
index 4a8f304..902a504 100644
--- a/EOControl/EOKeyValueCoding.h
+++ b/EOControl/EOKeyValueCoding.h
@@ -105,7 +105,8 @@
  * This method is invoked by the EOKeyValueCoding mechanism when an attempt
  * is made to set an null value for a scalar attribute.  This implementation
  * raises an NSInvalidArgument exception. <br/>
- * The NSKeyValueCoding -unableToSetNilForKey: is overriden to invoke this
+ * The NSKeyValueCoding -unableToSetNilForKey: and -setNilValueForKey:
+ * are overriden to invoke this
  * method instead.  We manipulate the runtime to insure that our implementation
  * of unableToSetNilForKey: is used in favor of the one in gnustep-base or
  * Foundation.
diff --git a/EOControl/EOKeyValueCoding.m b/EOControl/EOKeyValueCoding.m
index 18b4e2b..d303009 100644
--- a/EOControl/EOKeyValueCoding.m
+++ b/EOControl/EOKeyValueCoding.m
@@ -109,6 +109,11 @@ initialize(void)
   [self unableToSetNullForKey: key];
 }
 
+- (void) setNilValueForKey: (NSString *)key
+{
+  [self unableToSetNullForKey: key];
+}
+
 /* See EODeprecated.h. */
 + (void) flushClassKeyBindings
 {
diff --git a/EOControl/EOSortOrdering.m b/EOControl/EOSortOrdering.m
index 1373f16..1e655ff 100644
--- a/EOControl/EOSortOrdering.m
+++ b/EOControl/EOSortOrdering.m
@@ -39,7 +39,6 @@ RCS_ID("$Id$")
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSDebug.h>
-#include <Foundation/NSNull.h>
 #else
 #include <Foundation/Foundation.h>
 #endif
@@ -51,6 +50,7 @@ RCS_ID("$Id$")
 #include <EOControl/EOSortOrdering.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOKeyValueArchiver.h>
+#include <EOControl/EONull.h>
 #include <EOControl/EODebug.h>
 
 #include "EOPrivate.h"