* EOControl/EODeprecated.h: Replaces EODepricated.h.

The original post was correct.  Sorry!
	* EOAccess/EODeprecated.h:  Ditto.
	* EOAccess/GNUmakefile: Ditto.
	* EOControl/EOUndoManager: Ditto.

	* EOControl/EOClassDescription: Added some comments.  Tidied line
	breakage.
	([EOClassDescription +delegete]): Moved to category named Deprecated.
	([EOClassDescription +setDelegate:]): Ditto.
	([EOClassDescription -displayNameForKey:]): Use AUTORELEASE macro.
	([NSObject -snapshot]): Ditto.
	([NSObject -updateFromSnapshot]): Ditto.
	([NSObject -addObject:toPropertyWithKey:]): Ditto.
	([NSObject -removeObject:fromPropertyWithKey:]): Ditto.
	([NSException +validateExceptionWithFormat:]): Ditto.
	([NSException +aggregateExceptionWithExceptions:]): Ditto.
	([NSException -exceptionAddingEntriesToUserInfo:]): Ditto.
	* EOControl/EOKeyValueCoding.h/m:
	([NSObject unableToSetNullForKey:]): Implemented.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@16321 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,27 @@
+2003-04-01  David Ayers  <d.ayers@inode.at>
+
+	* EOControl/EODeprecated.h:  Replaces EODepricated.h.
+	The original post was correct.  Sorry!
+	* EOAccess/EODeprecated.h:  Ditto.
+	* EOAccess/GNUmakefile: Ditto.
+	* EOControl/EOUndoManager: Ditto.
+
+	* EOControl/EOClassDescription: Added some comments.  Tidied line
+	breakage.
+	([EOClassDescription +delegete]): Moved to category named Deprecated.
+	([EOClassDescription +setDelegate:]): Ditto.
+	([EOClassDescription -displayNameForKey:]): Use AUTORELEASE macro.
+	([NSObject -snapshot]): Ditto.
+	([NSObject -updateFromSnapshot]): Ditto.
+	([NSObject -addObject:toPropertyWithKey:]): Ditto.
+	([NSObject -removeObject:fromPropertyWithKey:]): Ditto.
+	([NSException +validateExceptionWithFormat:]): Ditto.
+	([NSException +aggregateExceptionWithExceptions:]): Ditto.
+	([NSException -exceptionAddingEntriesToUserInfo:]): Ditto.
+	* EOControl/EOKeyValueCoding.h/m:
+	([NSObject unableToSetNullForKey:]): Implemented.
+	
+
 2003-03-31  David Ayers  <d.ayers@inode.at>
 
 	* EOControl/EOFault.m ([EOFault respondsToSelector:]): Replaced

EOAccess/GNUmakefile

@@ -89,7 +89,7 @@ EODatabaseDataSource.h \
 EOSchemaGeneration.h \
 EOUtilities.h \
 EODefines.h \
-EODepricated.h \
+EODeprecated.h \
 EOAccess.h \
 
 

EOControl/EOClassDescription.m

@@ -1,7 +1,7 @@
 /** 
    EOClassDescription.m <title>EOClassDescription Class</title>
 
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    Author: Mirko Viviani <mirko.viviani@rccr.cremona.it>
    Date: February 2000
@@ -64,15 +64,27 @@ RCS_ID("$Id$")
 
 // NOTE: (stephane@sente.ch) Should we subclass NSClassDescription?
 
+/*
+   d.ayers@inode.at:  Yes, once we wish to support code written for
+   for EOF > WO4.5. No, for now because we don't have direct access
+   to the NSMapTable of base/Foundation so we would loose efficiency
+   and gain no real benefit.
+*/
+
 @interface NSObject (SupressCompilerWarnings)
 +(id)defaultGroup;
 @end
 
 @implementation EOClassDescription
 
-NSString *EOClassDescriptionNeededNotification = @"EOClassDescriptionNeededNotification";
-NSString *EOClassDescriptionNeededForClassNotification = @"EOClassDescriptionNeededForClassNotification";
-NSString *EOClassDescriptionNeededForEntityNameNotification = @"EOClassDescriptionNeededForEntityNameNotification";
+NSString *EOClassDescriptionNeededNotification 
+      = @"EOClassDescriptionNeededNotification";
+
+NSString *EOClassDescriptionNeededForClassNotification 
+      = @"EOClassDescriptionNeededForClassNotification";
+
+NSString *EOClassDescriptionNeededForEntityNameNotification
+      = @"EOClassDescriptionNeededForEntityNameNotification";
 
 NSString *EOValidationException = @"EOValidationException";
 NSString *EOAdditionalExceptionsKey = @"EOAdditionalExceptionsKey";
@@ -172,7 +184,8 @@ static id classDelegate = nil;
 
       if (!classDescription)
         {
-          NSLog(@"Warning: No class description for entity named: %@", entityName);
+          NSLog(@"Warning: No class description for entity named: %@",
+		entityName);
         }
     }
 
@@ -181,22 +194,6 @@ static id classDelegate = nil;
   return classDescription;
 }
 
-+ (void)setDelegate: (id)delegate
-{
-  EOFLOGObjectFnStart();
-
-  NSDebugMLLog(@"gsdb", @"delegate %p=%@", delegate, delegate);
-
-  [EOClassDescription setClassDelegate: delegate];
-
-  EOFLOGObjectFnStop();
-}
-
-+ (id)delegate
-{
-  return [EOClassDescription classDelegate];
-}
-
 + (void)invalidateClassDescriptionCache
 {
   NSResetMapTable(classDescriptionForClass);
@@ -343,7 +340,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
   if (s != ckey)
     [str appendString: [NSString stringWithCString: ckey length: s - ckey]];
 
-  return [[key mutableCopy] autorelease];
+  return AUTORELEASE([key copy]);
 }
 
 - (NSString *)entityName
@@ -505,29 +502,34 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
 				 fromPropertyWithKey:inverseKey];
                   */
 		}
-              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray);
+              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@",
+			   toManyArray, toManyArray);
 	      break;
 
 	    case EODeleteRuleCascade:
               //OK
               EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleCascade");
-              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray);
+              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@",
+			   toManyArray, toManyArray);
 
 	      while ((destination = [toManyArray lastObject]))
 		{
-                  NSDebugMLLog(@"gsdb", @"destination %p=%@", destination, destination);
+                  NSDebugMLLog(@"gsdb", @"destination %p=%@",
+			       destination, destination);
 
                   [object removeObject: destination
                           fromBothSidesOfRelationshipWithKey: key];
 		  [context deleteObject: destination];
 		  [destination propagateDeleteWithEditingContext: context];
 		}
-              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray);
+              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@",
+			   toManyArray, toManyArray);
 	      break;
 
 	    case EODeleteRuleDeny:
               EOFLOGObjectLevel(@"gsdb", @"EODeleteRuleDeny");
-              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@", toManyArray, toManyArray);
+              NSDebugMLLog(@"gsdb", @"toManyArray %p=%@",
+			   toManyArray, toManyArray);
 	      if ([toManyArray count] > 0)
 		{
 		  // TODO don't know how to do yet, if raise an exception
@@ -611,6 +613,25 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
 
 @end
 
+@implementation EOClassDescription (Deprecated)
+
++ (void)setDelegate: (id)delegate
+{
+  EOFLOGObjectFnStart();
+
+  NSDebugMLLog(@"gsdb", @"delegate %p=%@", delegate, delegate);
+
+  [EOClassDescription setClassDelegate: delegate];
+
+  EOFLOGObjectFnStop();
+}
+
++ (id)delegate
+{
+  return [EOClassDescription classDelegate];
+}
+
+@end
 
 @implementation NSObject (EOInitialization)
 
@@ -1032,7 +1053,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
           NSDebugMLLog(@"gsdb", @"TOMANY snap=%p key=%@ ==> value %p=%@",
 		       snapshot, key, value, value);
 
-          value = [[value shallowCopy] autorelease];
+          value = AUTORELEASE([value shallowCopy]);
           NSDebugMLLog(@"gsdb", @"TOMANY snap=%p key=%@ ==> value %p=%@",
 		       snapshot, key, value, value);
 
@@ -1072,7 +1093,7 @@ fromInsertionInEditingContext: (EOEditingContext *)anEditingContext
 	val = nil;
 
       if ([val isKindOfClass: [NSArray class]])
-	val = [[[[val shallowCopy] autorelease] mutableCopy] autorelease];
+	val = AUTORELEASE([AUTORELEASE([val shallowCopy]) mutableCopy]);
 
       [self takeStoredValue: val forKey: key];
     }
@@ -1268,7 +1289,7 @@ toPropertyWithKey: (NSString *)key
                       NSMutableArray *relArray;
 
                       if (val)
-                        relArray = [[val mutableCopy] autorelease];
+                        relArray = AUTORELEASE([val mutableCopy]);
                       else
                         relArray = [NSMutableArray arrayWithCapacity: 10];
 
@@ -1367,7 +1388,7 @@ toPropertyWithKey: (NSString *)key
 
 		  if (val)
 		    {
-		      relArray = [[val mutableCopy] autorelease];
+		      relArray = AUTORELEASE([val mutableCopy]);
 
 		      [relArray removeObject: object];
 		      [self takeValue: relArray
@@ -1541,8 +1562,8 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
 
   va_start(args, format);
 
-  aName = [[[NSString alloc] initWithFormat: format arguments: args]
-	    autorelease];
+  aName = AUTORELEASE([[NSString alloc] initWithFormat: format
+					arguments: args]);
   exp = [NSException exceptionWithName: EOValidationException
 		     reason: aName
 		     userInfo: nil];
@@ -1567,7 +1588,7 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
 
       aName     = [exp name];
       aReason   = [exp reason];
-      aUserInfo = [[[exp userInfo] mutableCopy] autorelease];
+      aUserInfo = AUTORELEASE([[exp userInfo] mutableCopy]);
 
       [aUserInfo setObject: subexceptions
 		 forKey: EOAdditionalExceptionsKey];
@@ -1588,7 +1609,7 @@ fromBothSidesOfRelationshipWithKey: (NSString *)key
 
   aName     = [self name];
   aReason   = [self reason];
-  aUserInfo = [[[self userInfo] mutableCopy] autorelease];
+  aUserInfo = AUTORELEASE([[self userInfo] mutableCopy]);
 
   [aUserInfo setObject: [additions allValues]
 	     forKey: EOValidatedObjectUserInfoKey];

EOControl/EODeprecated.h

@@ -38,32 +38,32 @@
 #include <EOControl/EOFetchSpecification.h>
 
 @interface NSObject (EODeprecated)
-/** Depricated. GDL2 doesn't cache key bindungs.*/
+/** Deprecated. GDL2 doesn't cache key bindungs.*/
 + (void) flushClassKeyBindings;
 @end
 
 @interface EOClassDescription (EODeprecated)
-/** Depricated. Use +setClassDelegate. */
+/** Deprecated. Use +setClassDelegate. */
 + (void) setDelegate:(id)delegate;
-/** Depricated. Use +classDelegate. */
+/** Deprecated. Use +classDelegate. */
 + (id) delegate;
 @end
 
-/** Depricated. Use NSUndoManager. */
+/** Deprecated. Use NSUndoManager. */
 @interface EOUndoManager : NSUndoManager
 
-/** Depricated. Use -removeAllActionsWithTarget:. */
+/** Deprecated. Use -removeAllActionsWithTarget:. */
 - (void) forgetAllWithTarget: (id)param0;
 
-/** Depricated. Use -removeAllActionsWithTarget:. */
+/** Deprecated. Use -removeAllActionsWithTarget:. */
 - (void) forgetAll;
 
-/** Depricated. Use -registerUndoWithTarget:selector:object:. */
+/** Deprecated. Use -registerUndoWithTarget:selector:object:. */
 - (void) registerUndoWithTarget: (id)param0
                        selector: (SEL)param1
                             arg: (id)param2;
 
-/** Depricated. Use -enableUndoRegistration. */
+/** Deprecated. Use -enableUndoRegistration. */
 - (void) reenableUndoRegistration; 
 
 @end

EOControl/EOKeyValueCoding.h

@@ -52,6 +52,7 @@
 #endif
 - (NSDictionary *)valuesForKeyPaths: (NSArray *)keyPaths;
 - (NSDictionary *)storedValuesForKeyPaths: (NSArray *)keyPaths;
+- (void)unableToSetNullForKey: (NSString *)key;
 @end
 
 #if NeXT_Foundation_LIBRARY

EOControl/EOKeyValueCoding.m

@@ -80,6 +80,14 @@ RCS_ID("$Id$")
 {
 }
 
+- (void) unableToSetNullForKey: (NSString *)key
+{
+  [NSException raise: NSInvalidArgumentException
+	       format: @"%@ -- %@ 0x%x: Given nil value to set for key \"%@\"",
+	       NSStringFromSelector(_cmd), NSStringFromClass([self class]), 
+	       self, key];
+}
+
 /** if key is a bidirectional rel, use addObject:toBothSidesOfRelationship otherwise call  takeValue:forKey: **/
 - (void)smartTakeValue: (id)anObject 
                 forKey: (NSString *)aKey

EOControl/EOUndoManager.m

@@ -35,7 +35,7 @@
 
 RCS_ID("$Id$")
 
-#include <EOControl/EODepricated.h>
+#include <EOControl/EODeprecated.h>
 #include <EOControl/EODebug.h>