Fix for last update

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

ChangeLog

@@ -1,3 +1,16 @@
+2005-06-17  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSConnection.m: Removed bogus
+	NSConnection(ConnectionDelegate) category .. these methods must not be
+	implemented in NSObject.  I hope that removing the concrete
+	implementation of the category from the Object class will not cause
+	problems (I believe there used to be problems with older versions of
+	the compiler if we tried to use @selector(NN) where NN was not
+	implemented in the same code unit, but I can't remember what the
+	problems were and when they occurred).
+	* Headers/Foundation/NSConnection.h: Added comments/documentation from
+	NSConnection.h
+
 2005-06-17  Adam Fedor  <fedor@gnu.org>
 
 	* Remove objc/Protocol.h include from NSObject to avoid warnings

Headers/Foundation/NSConnection.h

@@ -214,51 +214,91 @@ GS_EXPORT NSString* const NSConnectionProxyCount;	/* Objects received */
 
 @end
 
-
+/**
+ * This category represents an informal protocol to which NSConnection
+ * delegates may conform ... These methods are not actually implemented
+ * by NSObject, so implementing these methods in your class has the effect
+ * documented.
+ */
 @interface	NSObject (NSConnectionDelegate)
-/**
- *	This method may be used to ask a delegate's permission to create
- *	a new connection from the old one.
- *	This method should be implemented in preference to the
- *	[makeNewConnection:sender:] which is obsolete.
- */
-- (BOOL) connection: (NSConnection*)parent
-  shouldMakeNewConnection: (NSConnection*)newConnection;
 
 /**
- *	This is the old way of doing the same thing as
+ * <p>
- *	[connection:shouldMakeNewConnection:]
+ *   This is not an NSConnection method, but is a method that may
- *	It is obsolete - don't use it.
+ *   be implemented by the delegate of an NSConnection object.
- */
+ * </p>
-- (BOOL) makeNewConnection: (NSConnection*)newConnection
+ * <p>
-		    sender: (NSConnection*)parent;
+ *   If the delegate implements this method, the NSConnection will
-
+ *   invoke the method for every message request or reply it receives
-/**
+ *   from the remote NSConnection.  The delegate should use the
- *	If the delegate responds to this method, it will be used to ask the
+ *   authentication data to check all the NSData objects
- *	delegate's permission to establish a new connection from the old one.
+ *   in the components array (ignoring NSPort objects),
- *	Often this is used so that the delegate can register for invalidation 
+ *   and return YES if they are valid, NO otherwise.
- *	notification on new child connections.
+ * </p>
- *	This is a GNUstep extension
+ * <p>
- *	Normally return newConn.
+ *   If the method returns NO then an
- */
+ *   NSFailedAuthentication exception will be raised.
-- (NSConnection*) connection: (NSConnection*)ancestorConn
+ * </p>
-		  didConnect: (NSConnection*)newConn;
+ * <p>
-
+ *   In GNUstep the components array is mutable, allowing
-/**
+ *   you to replace the NSData objects with your own version.
- * These are like the MacOS-X delegate methods, except that we provide the
+ * </p>
- * components in mutable arrays, so that the delegate can alter the data
- * items in the array.  Of course, you must do that WITH CARE.
  */
 - (BOOL) authenticateComponents: (NSMutableArray*)components
 		       withData: (NSData*)authenticationData;
 
 /**
- * These are like the MacOS-X delegate methods, except that we provide the
+ * <p>
- * components in mutable arrays, so that the delegate can alter the data
+ *   This is not an NSConnection method, but is a method that may
- * items in the array.  Of course, you must do that WITH CARE.
+ *   be implemented by the delegate of an NSConnection object.
+ * </p>
+ * <p>
+ *   If the delegate implements this method, the NSConnection will
+ *   invoke the method for every message request ro reply it sends
+ *   to the remote NSConnection.  The delegate should generate
+ *   authentication data by examining all the NSData objects
+ *   in the components array (ignoring NSPort objects),
+ *   and return the authentication data that can be used by the
+ *   remote NSConnection.
+ * </p>
+ * <p>
+ *   If the method returns nil then an
+ *   NSGenericException exception will be raised.
+ * </p>
+ * <p>
+ *   In GNUstep the components array is mutable, allowing
+ *   you to replace the NSData objects with your own version.
+ * </p>
  */
 - (NSData*) authenticationDataForComponents: (NSMutableArray*)components;
 
+/**
+ * <p>
+ *   This is not an NSConnection method, but is a method that may
+ *   be implemented by the delegate of an NSConnection object.
+ * </p>
+ * <p>
+ *   If the delegate implements this method, it will be called
+ *   whenever a new NSConnection is created that has this
+ *   NSConnection as its parent.  The delegate may take this
+ *   opportunity to adjust the configuration of the new
+ *   connection and may return a boolean value to tell the
+ *   parent whether the creation of the new connection is to
+ *   be permitted or not.
+ * </p>
+ */
+ - (BOOL) connection: (NSConnection*)parent
+  shouldMakeNewConnection: (NSConnection*)newConnection;
+
+- (NSConnection*) connection: (NSConnection*)ancestorConn
+		  didConnect: (NSConnection*)newConn;
+
+/**
+ * An old fashioned synonym for -connection:shouldMakeNewConnection: -
+ * don't use this.
+ */
+- (BOOL) makeNewConnection: (NSConnection*)newConnection
+                    sender: (NSConnection*)parent;
 @end
 
 /**

Source/NSConnection.m

@@ -3585,105 +3585,3 @@ static void callEncoder (DOContext *ctxt)
 
 @end
 
-
-
-/**
- * This category represents an informal protocol to which NSConnection
- * delegates may conform ...  implementing these methods has the effect
- * documented.
- */
-@implementation NSObject (NSConnectionDelegate)
-/**
- * <p>
- *   This is not an NSConnection method, but is a method that may
- *   be implemented by the delegate of an NSConnection object.
- * </p>
- * <p>
- *   If the delegate implements this method, the NSConnection will
- *   invoke the method for every message request or reply it receives
- *   from the remote NSConnection.  The delegate should use the
- *   authentication data to check all the NSData objects
- *   in the components array (ignoring NSPort objects),
- *   and return YES if they are valid, NO otherwise.
- * </p>
- * <p>
- *   If the method returns NO then an
- *   NSFailedAuthentication exception will be raised.
- * </p>
- * <p>
- *   In GNUstep the components array is mutable, allowing
- *   you to replace the NSData objects with your own version.
- * </p>
- */
-- (BOOL) authenticateComponents: (NSMutableArray*)components
-		       withData: (NSData*)authenticationData
-{
-  return NO;
-}
-
-/**
- * <p>
- *   This is not an NSConnection method, but is a method that may
- *   be implemented by the delegate of an NSConnection object.
- * </p>
- * <p>
- *   If the delegate implements this method, the NSConnection will
- *   invoke the method for every message request ro reply it sends
- *   to the remote NSConnection.  The delegate should generate
- *   authentication data by examining all the NSData objects
- *   in the components array (ignoring NSPort objects),
- *   and return the authentication data that can be used by the
- *   remote NSConnection.
- * </p>
- * <p>
- *   If the method returns nil then an
- *   NSGenericException exception will be raised.
- * </p>
- * <p>
- *   In GNUstep the components array is mutable, allowing
- *   you to replace the NSData objects with your own version.
- * </p>
- */
-- (NSData*) authenticationDataForComponents: (NSMutableArray*)components
-{
-  return nil;
-}
-
-/**
- * <p>
- *   This is not an NSConnection method, but is a method that may
- *   be implemented by the delegate of an NSConnection object.
- * </p>
- * <p>
- *   If the delegate implements this method, it will be called
- *   whenever a new NSConnection is created that has this
- *   NSConnection as its parent.  The delegate may take this
- *   opportunity to adjust the configuration of the new
- *   connection and may return a boolean value to tell the
- *   parent whether the creation of the new connection is to
- *   be permitted or not.
- * </p>
- */
- - (BOOL) connection: (NSConnection*)parent
-  shouldMakeNewConnection: (NSConnection*)newConnection
-{
-  return NO;
-}
-
-- (NSConnection*) connection: (NSConnection*)ancestorConn
-		  didConnect: (NSConnection*)newConn
-{
-  return nil;
-}
-
-/**
- * An old fashioned synonym for -connection:shouldMakeNewConnection: -
- * don't use this.
- */
-- (BOOL) makeNewConnection: (NSConnection*)newConnection
-                    sender: (NSConnection*)parent
-{
-  return NO;
-}
-@end
-