* EOInterface/EODetailSelectionAssociation.h/m: New files.

* EOInterface/EOMasterCopyAssociation.h/m: Ditto.
        * EOInterface/EOMasterDetailAssociation.h/m: Ditto.
        * EOInterface/EOMasterPeerAssociation.m: Ditto.
        * EOInterface/EOMatrixAssociation.h/m: Ditto.
        * EOInterface/EOPickTextAssociation.h/m: Ditto.
        * EOInterface/EOPopUpAssociation.h/m: Ditto.
        * EOInterface/EORadioMatrixAssociation.h/m: Ditto.
        * EOInterface/EORecursiveBrowserAssociation.h/m: Ditto.
        * EOInterface/EOTextAssociation.h/m: Ditto.
        * EOInterface/EODeprecated.h: Ditto.
        * EOInterface/EOInterface.h: Added new header files.
        * EOInterface/GNUmakefile: Added new files.

        * EOInterface/EODisplayGroup.m: Update includes.
        (setSortOrdering:, sortOrdering): Add deprecated methods.
        * EOInterface/EOAssociation.h: Remove redundant include.


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

ChangeLog

@@ -1,3 +1,23 @@
+2004-10-20  David Ayers  <d.ayers@inode.at>
+
+	* EOInterface/EODetailSelectionAssociation.h/m: New files.
+	* EOInterface/EOMasterCopyAssociation.h/m: Ditto.
+	* EOInterface/EOMasterDetailAssociation.h/m: Ditto.
+	* EOInterface/EOMasterPeerAssociation.m: Ditto.
+	* EOInterface/EOMatrixAssociation.h/m: Ditto.
+	* EOInterface/EOPickTextAssociation.h/m: Ditto.
+	* EOInterface/EOPopUpAssociation.h/m: Ditto.
+	* EOInterface/EORadioMatrixAssociation.h/m: Ditto.
+	* EOInterface/EORecursiveBrowserAssociation.h/m: Ditto.
+	* EOInterface/EOTextAssociation.h/m: Ditto.
+	* EOInterface/EODeprecated.h: Ditto.
+	* EOInterface/EOInterface.h: Added new header files.
+	* EOInterface/GNUmakefile: Added new files.
+	
+	* EOInterface/EODisplayGroup.m: Update includes.
+	(setSortOrdering:, sortOrdering): Add deprecated methods.
+	* EOInterface/EOAssociation.h: Remove redundant include.
+	
 2004-10-17  David Ayers  <d.ayers@inode.at>
 
 	* EOInterface/EOComboBoxAssociation.h/m: New files.

EOInterface/EOAssociation.h

@@ -27,7 +27,6 @@
 #define __EOInterface_EOAssociation_h__
 
 #ifdef GNUSTEP
-#include <Foundation/NSObject.h>
 #include <Foundation/NSMapTable.h>
 #else
 #include <Foundation/Foundation.h>

EOInterface/EODeprecated.h

@@ -0,0 +1,38 @@
+/** -*-ObjC-*-
+   EODprecated.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EODeprecated_h__
+#define __EOInterface_EODeprecated_h__
+
+#include <EOInterface/EODisplayGroup.h>
+
+@class NSArray;
+
+@interface EODisplayGroup (EODeprecated)
+- (void)setSortOrdering: (NSArray *)sortOrderings;
+- (NSArray *)sortOrdering;
+@end
+
+#endif

EOInterface/EODetailSelectionAssociation.h

@@ -0,0 +1,57 @@
+/** -*-ObjC-*-
+   EODetailSelectionAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EODetailSelectionAssociation_h__
+#define __EOInterface_EODetailSelectionAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@interface EODetailSelectionAssociation : EOAssociation
+{
+  id _nonRetainedObject;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSString *)displayName;
+
++ (NSString *)primaryAspect;
+
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+@end
+
+#endif

EOInterface/EODetailSelectionAssociation.m

@@ -0,0 +1,89 @@
+/**
+   EODetailSelectionAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#include "EODisplayGroup.h"
+#include "EODetailSelectionAssociation.h"
+
+@implementation EODetailSelectionAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      _aspects 
+	= RETAIN ([[super aspects] arrayByAddingObject: @"selectedObjects"]);
+    }
+  return _aspects;
+}
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"1M", @"A", nil];
+      /* TODO: Check if there is any good reason why we only have
+	 one aspect but two signatures.  */
+      arr = [[super aspectSignatures] arrayByAddingObjectsFromArray: arr];
+      _signatures = RETAIN(arr);
+    }
+  return _signatures;
+}
+
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [EODisplayGroup class]];
+}
+
++ (NSString *)displayName
+{
+  return @"EODetailSelection";
+}
+
++ (NSString *)primaryAspect
+{
+  return @"selectedObjects";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+@end

EOInterface/EODisplayGroup.m

@@ -42,9 +42,8 @@ RCS_ID("$Id$")
 #include <EOControl/EOQualifier.h>
 
 #include "EODisplayGroup.h"
-/*
+#include "EODeprecated.h"
 #include "EOAssociation.h"
-*/
 
 
 @implementation EODisplayGroup
@@ -525,4 +524,14 @@ failedToValidateValue: (NSString *)value
 }
 @end
 
+@implementation EODisplayGroup (EODeprecated)
+- (void)setSortOrdering: (NSArray *)sortOrderings
+{
+  [self setSortOrderings: sortOrderings];
+}
+- (NSArray *)sortOrdering
+{
+  return [self sortOrderings];
+}
+@end
 

EOInterface/EOInterface.h

@@ -33,6 +33,15 @@
 #include <EOInterface/EOColumnAssociation.h>
 #include <EOInterface/EOComboBoxAssociation.h>
 #include <EOInterface/EOControlAssociation.h>
+#include <EOInterface/EODetailSelectionAssociation.h>
 #include <EOInterface/EODisplayGroup.h>
+#include <EOInterface/EOMasterCopyAssociation.h>
+#include <EOInterface/EOMasterDetailAssociation.h>
+#include <EOInterface/EOMatrixAssociation.h>
+#include <EOInterface/EOPickTextAssociation.h>
+#include <EOInterface/EOPopUpAssociation.h>
+#include <EOInterface/EORadioMatrixAssociation.h>
+#include <EOInterface/EORecursiveBrowserAssociation.h>
+#include <EOInterface/EOTextAssociation.h>
 
 #endif /* __EOInterface_h__ */

EOInterface/EOMasterCopyAssociation.h

@@ -0,0 +1,66 @@
+/** -*-ObjC-*-
+   EOMasterCopyAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EOMasterCopyAssociation_h__
+#define __EOInterface_EOMasterCopyAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@interface EOMasterCopyAssociation : EOAssociation
+{
+  id _currentMasterValue;
+  id _currentMasterEO;
+  id _nonRetainedObject;
+  BOOL _doneInit;
+  unsigned int _lastCount;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSString *)displayName;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+/* Overwritten EODelayedObserver to return EOObserverPrioritySecond.  */
+- (EOObserverPriority)priority;
+
+@end
+
+#endif
+

EOInterface/EOMasterCopyAssociation.m

@@ -0,0 +1,90 @@
+/**
+   EOMasterCopyAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#include "EODisplayGroup.h"
+#include "EOMasterCopyAssociation.h"
+
+@implementation EOMasterCopyAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      _aspects
+        = RETAIN ([[super aspects] arrayByAddingObject: @"parent"]);
+    }
+  return _aspects;
+}
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      _signatures
+        = RETAIN ([[super aspectSignatures] arrayByAddingObject: @""]);
+    }
+  return _signatures;
+}
+
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [EODisplayGroup class]];
+}
+
++ (NSString *)displayName
+{
+  return @"EOMasterCopyAssoc";
+}
+
++ (NSString *)primaryAspect
+{
+  return @"parent";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+- (EOObserverPriority)priority
+{
+  return EOObserverPrioritySecond;
+}
+
+@end

EOInterface/EOMasterDetailAssociation.h

@@ -0,0 +1,79 @@
+/** -*-ObjC-*-
+   EOMasterDetailAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EOMasterDetailAssociation_h__
+#define __EOInterface_EOMasterDetailAssociation_h__
+
+#ifdef GNUSTEP
+#include <Foundation/NSObject.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@interface EOMasterDetailAssociation : EOAssociation
+{
+  id _currentMasterValue;
+  id _currentMasterEO;
+  unsigned _lastCount;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSString *)displayName;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+/* Overwritten EODelayedObserver to return EOObserverPrioritySecond.  */
+- (EOObserverPriority)priority;
+
+@end
+
+@interface EOMasterPeerAssociation : EOMasterDetailAssociation
+{
+}
+
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSString *)displayName;
+
+@end
+
+#endif

EOInterface/EOMasterDetailAssociation.m

@@ -0,0 +1,94 @@
+/**
+   EOMasterDetailAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#include <EOControl/EODetailDataSource.h>
+
+#include "EODisplayGroup.h"
+#include "EOMasterDetailAssociation.h"
+
+@implementation EOMasterDetailAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      _aspects
+        = RETAIN ([[super aspects] arrayByAddingObject: @"parent"]);
+    }
+  return _aspects;
+}
+
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      _signatures
+        = RETAIN ([[super aspectSignatures] arrayByAddingObject: @"1M"]);
+    }
+  return _signatures;
+}
+
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [EODisplayGroup class]]
+    && [[object dataSource] isKindOfClass: [EODetailDataSource class]];
+}
+
++ (NSString *)displayName
+{
+  return @"EOMasterDetailAssoc";
+}
+
++ (NSString *)primaryAspect
+{
+  return @"parent";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+- (EOObserverPriority)priority
+{
+  return EOObserverPrioritySecond;
+}
+
+@end

EOInterface/EOMasterPeerAssociation.m

@@ -0,0 +1,51 @@
+/**
+   EOMasterPeerAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#include <EOControl/EODetailDataSource.h>
+
+#include "EODisplayGroup.h"
+#include "EOMasterDetailAssociation.h"
+
+@implementation EOMasterPeerAssociation
+
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [EODisplayGroup class]]
+    && [[object dataSource] isKindOfClass: [EODetailDataSource class]] == NO;
+}
+
++ (NSString *)displayName
+{
+  return @"EOMasterPeerAssociation";
+}
+
+@end
+

EOInterface/EOMatrixAssociation.h

@@ -0,0 +1,61 @@
+/** -*-ObjC-*-
+   EOMatrixAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EOMatrixAssociation_h__
+#define __EOInterface_EOMatrixAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@interface EOMatrixAssociation : EOAssociation
+{
+
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (NSArray *)objectKeysTaken;
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSArray *)associationClassesSuperseded;
+
++ (NSString *)displayName;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+@end
+
+#endif

EOInterface/EOMatrixAssociation.m

@@ -0,0 +1,115 @@
+/** -*-ObjC-*-
+   EOMatrixAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+
+#include <AppKit/NSMatrix.h>
+#else
+#include <Foundation/Foundation.h>
+#include <AppKit/AppKit.h>
+#endif
+
+#include "EOControlAssociation.h"
+#include "EOMatrixAssociation.h"
+
+@implementation EOMatrixAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"enabled", @"image", @"title", nil];
+      _aspects = RETAIN ([[super aspects] arrayByAddingObjectsFromArray: arr]);
+    }
+  return _aspects;
+}
+
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"A", @"A", @"A", nil];
+      arr = [[super aspectSignatures] arrayByAddingObjectsFromArray: arr];
+      _signatures = RETAIN(arr);
+    }
+  return _signatures;
+}
+
++ (NSArray *)objectKeysTaken
+{
+  static NSArray *_keys = nil;
+  if (_keys == nil)
+    {
+      _keys
+        = RETAIN ([[super objectKeysTaken] arrayByAddingObject: @"target"]);
+    }
+  return _keys;
+}
+
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [NSMatrix class]];
+}
+
++ (NSArray *)associationClassesSuperseded
+{
+  static NSArray *_classes = nil;
+  if (_classes == nil)
+    {
+      _classes
+        = RETAIN ([[super associationClassesSuperseded]
+                    arrayByAddingObject: [EOControlAssociation class]]);
+    }
+  return _classes;
+}
+
++ (NSString *)displayName
+{
+  return @"EOMatrixAssoc";
+}
+
++ (NSString *)primaryAspect
+{
+  return @"title";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+@end

EOInterface/EOPickTextAssociation.h

@@ -0,0 +1,61 @@
+/** -*-ObjC-*-
+   EOPickTextAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EOPickTextAssociation_h__
+#define __EOInterface_EOPickTextAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@class EODisplayGroup;
+
+@interface EOPickTextAssociation : EOAssociation
+{
+  BOOL _applyImmediately;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (NSArray *)objectKeysTaken;
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+- (void)action: (id)sender;
+
+@end
+
+#endif

EOInterface/EOPickTextAssociation.m

@@ -0,0 +1,102 @@
+/**
+   EOPickTextAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+
+#include <AppKit/NSControl.h>
+#else
+#include <Foundation/Foundation.h>
+#include <AppKit/AppKit.h>
+#endif
+
+#include "EOPickTextAssociation.h"
+
+@implementation EOPickTextAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"matchKey1", @"matchKey2", @"matchKey3", nil];
+      _aspects = RETAIN ([[super aspects] arrayByAddingObjectsFromArray: arr]);
+    }
+  return _aspects;
+}
+
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"A", @"A", @"A", nil];
+      arr = [[super aspectSignatures] arrayByAddingObjectsFromArray: arr];
+      _signatures = RETAIN(arr);
+    }
+  return _signatures;
+}
+
++ (NSArray *)objectKeysTaken
+{
+  static NSArray *_keys = nil;
+  if (_keys == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"target", @"delegate", nil];
+      arr = [[super objectKeysTaken] arrayByAddingObjectsFromArray: arr];
+      _keys = RETAIN (arr);
+    }
+  return _keys;
+}
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [NSControl class]];
+}
+
++ (NSString *)primaryAspect
+{
+  return @"matchKey1";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+- (void)action: (id)sender
+{
+}
+
+@end

EOInterface/EOPopUpAssociation.h

@@ -0,0 +1,66 @@
+/** -*-ObjC-*-
+   EOPopUpAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EOPopUpAssociation_h__
+#define __EOInterface_EOPopUpAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@interface EOPopUpAssociation : EOAssociation
+{
+  BOOL _addedTempItem;
+  int _tagValueForOther;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (NSArray *)objectKeysTaken;
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSArray *)associationClassesSuperseded;
+
+
++ (NSString *)displayName;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+- (void)setTagValueForOther: (int)value;
+- (int)tagValueForOther;
+
+@end
+
+#endif

EOInterface/EOPopUpAssociation.m

@@ -0,0 +1,123 @@
+/**
+   EOPopUpAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+
+#include <AppKit/NSPopUpButton.h>
+#else
+#include <Foundation/Foundation.h>
+#include <AppKit/AppKit.h>
+#endif
+
+#include "EOControlAssociation.h"
+#include "EOPopUpAssociation.h"
+
+@implementation EOPopUpAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"titles", @"selectedTitle", @"selectedTag",
+			      @"selectedObject", @"enabled", nil];
+      _aspects = RETAIN ([[super aspects] arrayByAddingObjectsFromArray: arr]);
+    }
+  return _aspects;
+}
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"A", @"A", @"A", @"1", @"A", nil];
+      arr = [[super aspectSignatures] arrayByAddingObjectsFromArray: arr];
+      _signatures = RETAIN(arr);
+    }
+  return _signatures;
+}
+
++ (NSArray *)objectKeysTaken
+{
+  static NSArray *_keys = nil;
+  if (_keys == nil)
+    {
+      _keys = [[NSArray alloc] initWithObject: @"target"];
+    }
+  return _keys;
+}
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [NSPopUpButton class]];
+}
+
++ (NSArray *)associationClassesSuperseded
+{
+  static NSArray *_classes = nil;
+  if (_classes == nil)
+    {
+      _classes
+        = RETAIN ([[super associationClassesSuperseded]
+                    arrayByAddingObject: [EOControlAssociation class]]);
+    }
+  return _classes;
+}
+
+
++ (NSString *)displayName
+{
+  return @"EOPopupAssoc";
+}
+
++ (NSString *)primaryAspect
+{
+  return @"selectedTitle";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+- (void)setTagValueForOther: (int)value
+{
+  _tagValueForOther = value;
+}
+- (int)tagValueForOther
+{
+  return _tagValueForOther;
+}
+
+@end

EOInterface/EORadioMatrixAssociation.h

@@ -0,0 +1,64 @@
+/** -*-ObjC-*-
+   EORadioMatrixAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EORadioMatrixAssociation_h__
+#define __EOInterface_EORadioMatrixAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@interface EORadioMatrixAssociation : EOAssociation
+{
+  int _tagValueForOther;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (NSArray *)objectKeysTaken;
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSArray *)associationClassesSuperseded;
+
++ (NSString *)displayName;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+- (void)setTagValueForOther: (int)value;
+- (int)tagValueForOther;
+
+@end
+
+#endif

EOInterface/EORadioMatrixAssociation.m

@@ -0,0 +1,125 @@
+/**
+   EORadioMatrixAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+
+#include <AppKit/NSMatrix.h>
+#else
+#include <Foundation/Foundation.h>
+#include <AppKit/AppKit.h>
+#endif
+
+#include "EOControlAssociation.h"
+#include "EORadioMatrixAssociation.h"
+
+@implementation EORadioMatrixAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"selectedTitle", @"selectedTag",
+                              @"enabled", nil];
+      _aspects = RETAIN ([[super aspects] arrayByAddingObjectsFromArray: arr]);
+    }
+  return _aspects;
+}
+
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"A", @"A", @"A", nil];
+      arr = [[super aspectSignatures] arrayByAddingObjectsFromArray: arr];
+      _signatures = RETAIN(arr);
+    }
+  return _signatures;
+}
+
++ (NSArray *)objectKeysTaken
+{
+  static NSArray *_keys = nil;
+  if (_keys == nil)
+    {
+      _keys = [[NSArray alloc] initWithObject: @"target"];
+    }
+  return _keys;
+}
+
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [NSMatrix class]];
+}
+
++ (NSArray *)associationClassesSuperseded
+{
+  static NSArray *_classes = nil;
+  if (_classes == nil)
+    {
+      _classes
+        = RETAIN ([[super associationClassesSuperseded]
+                    arrayByAddingObject: [EOControlAssociation class]]);
+    }
+  return _classes;
+}
+
++ (NSString *)displayName
+{
+  return @"EORadioAssoc";
+}
+
++ (NSString *)primaryAspect
+{
+  return @"selectedTitle";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+- (void)setTagValueForOther: (int)value
+{
+  _tagValueForOther = value;
+}
+
+- (int)tagValueForOther
+{
+  return _tagValueForOther;
+}
+
+@end

EOInterface/EORecursiveBrowserAssociation.h

@@ -0,0 +1,77 @@
+/** -*-ObjC-*-
+   EORecursiveBrowserAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EORecursiveBrowserAssociation_h__
+#define __EOInterface_EORecursiveBrowserAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+@class NSMutableArray;
+
+@class NSMatrix;
+@class NSBrowser;
+
+@class EODataSource;
+@class EODisplayGroup;
+
+@interface EORecursiveBrowserAssociation : EOAssociation
+{
+  NSMutableArray *_eoPath;
+  EODataSource *_orgChildDS;
+  EODisplayGroup *_rootDG;
+  EODisplayGroup *_currDG;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (NSArray *)objectKeysTaken;
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSArray *)associationClassesSuperseded;
+
++ (NSString *)displayName;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (id)initWithObject: (id)object;
+
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+
+- (void)browser: (NSBrowser *)sender
+createRowsForColumn: (int)column
+       inMatrix: (NSMatrix *)matrix;
+
+@end
+
+#endif

EOInterface/EORecursiveBrowserAssociation.m

@@ -0,0 +1,140 @@
+/**
+   EORecursiveBrowserAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+
+#include <AppKit/NSMatrix.h>
+#include <AppKit/NSBrowser.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#include <EOControl/EODataSource.h>
+
+#include "EOControlAssociation.h"
+#include "EODisplayGroup.h"
+#include "EORecursiveBrowserAssociation.h"
+
+@implementation EORecursiveBrowserAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"children", @"title", @"isLeaf",
+                              @"rootChildren", nil];
+      _aspects = RETAIN ([[super aspects] arrayByAddingObjectsFromArray: arr]);
+    }
+  return _aspects;
+}
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"M", @"A", @"A", @"M", nil];
+      arr = [[super aspectSignatures] arrayByAddingObjectsFromArray: arr];
+      _signatures = RETAIN(arr);
+    }
+  return _signatures;
+}
+
++ (NSArray *)objectKeysTaken
+{
+  static NSArray *_keys = nil;
+  if (_keys == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"target", @"delegate", nil];
+      arr = [[super objectKeysTaken] arrayByAddingObjectsFromArray: arr];
+      _keys = RETAIN (arr);
+    }
+  return _keys;
+}
++ (BOOL)isUsableWithObject: (id)object
+{
+  return [object isKindOfClass: [NSBrowser class]];
+}
+
++ (NSArray *)associationClassesSuperseded
+{
+  static NSArray *_classes = nil;
+  if (_classes == nil)
+    {
+      _classes
+        = RETAIN ([[super associationClassesSuperseded]
+                    arrayByAddingObject: [EOControlAssociation class]]);
+    }
+  return _classes;
+}
+
++ (NSString *)displayName
+{
+  return @"EORecBrowser";
+}
+
++ (NSString *)primaryAspect
+{
+  return @"rootChildren";
+}
+
+- (id)initWithObject: (id)object
+{
+  if ((self = [super initWithObject: object]))
+    {
+      _eoPath = [NSMutableArray new];
+    }
+  return self;
+}
+
+- (void)dealloc
+{
+  DESTROY(_eoPath);
+  [super dealloc];
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+
+- (void)browser: (NSBrowser *)sender
+createRowsForColumn: (int)column
+       inMatrix: (NSMatrix *)matrix
+{
+}
+
+@end

EOInterface/EOTextAssociation.h

@@ -0,0 +1,73 @@
+/** -*-ObjC-*-
+   EOTextAssociation.h
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifndef __EOInterface_EOTextAssociation_h__
+#define __EOInterface_EOTextAssociation_h__
+
+#include <EOInterface/EOAssociation.h>
+
+@class NSString;
+@class NSArray;
+
+@class NSControl;
+@class NSText;
+
+@interface EOTextAssociation : EOAssociation
+{
+  id _lastValue;
+  unsigned _didChange:1;
+}
+
+/* Defining capabilities of concete class.  */
++ (NSArray *)aspects;
++ (NSArray *)aspectSignatures;
+
++ (NSArray *)objectKeysTaken;
++ (BOOL)isUsableWithObject: (id)object;
+
++ (NSString *)primaryAspect;
+
+/* Creation and configuration.  */
+- (void)establishConnection;
+- (void)breakConnection;
+
+/* Display object value manipulation.  */
+- (void)subjectChanged;
+- (BOOL)endEditing;
+
+/* NSControl delegate methods.  */
+- (BOOL)control: (NSControl *)control isValidObject: (id)object;
+
+- (void)control: (NSControl *)control
+didFailToValidatePartialString: (NSString *)string
+errorDescription: (NSString *)description;
+
+/* NSText delegete methods.  */
+- (BOOL)textShouldBeginEditing: (NSText *) text;
+- (BOOL)textShouldEndEditing: (NSText *)text;
+
+@end
+
+#endif

EOInterface/EOTextAssociation.m

@@ -0,0 +1,125 @@
+/**
+   EOTextAssociation.m
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author: David Ayers <d.ayers@inode.at>
+
+   This file is part of the GNUstep Database Library
+
+   The GNUstep Database Library is free software; you can redistribute it 
+   and/or modify it under the terms of the GNU Lesser General Public License 
+   as published by the Free Software Foundation; either version 2, 
+   or (at your option) any later version.
+
+   The GNUstep Database Library is distributed in the hope that it will be 
+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License 
+   along with the GNUstep Database Library; see the file COPYING. If not, 
+   write to the Free Software Foundation, Inc., 
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+*/
+
+#ifdef GNUSTEP
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+
+#include <AppKit/NSControl.h>
+#include <AppKit/NSText.h>
+#include <AppKit/NSTextView.h>
+#else
+#include <Foundation/Foundation.h>
+#include <AppKit/AppKit.h>
+#endif
+
+#include "EOTextAssociation.h"
+
+@implementation EOTextAssociation
+
++ (NSArray *)aspects
+{
+  static NSArray *_aspects = nil;
+  if (_aspects == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"value", @"URL", @"editable", nil];
+      _aspects = RETAIN ([[super aspects] arrayByAddingObjectsFromArray: arr]);
+    }
+  return _aspects;
+}
+
++ (NSArray *)aspectSignatures
+{
+  static NSArray *_signatures = nil;
+  if (_signatures == nil)
+    {
+      NSArray *arr = [NSArray arrayWithObjects:
+                                @"A", @"A", @"A", nil];
+      arr = [[super aspectSignatures] arrayByAddingObjectsFromArray: arr];
+      _signatures = RETAIN(arr);
+    }
+  return _signatures;
+}
+
++ (NSArray *)objectKeysTaken
+{
+  static NSArray *_keys = nil;
+  if (_keys == nil)
+    {
+      _keys
+        = RETAIN ([[super objectKeysTaken] arrayByAddingObject: @"delegate"]);
+    }
+  return _keys;
+}
++ (BOOL)isUsableWithObject: (id)object
+{
+  /* NB: NSCStringText is obsolete.  So unless someone asks for it,
+     ignore it for now.  */
+  return [object isKindOfClass: [NSText class]]
+    || [object isKindOfClass: [NSTextView class]];
+}
+
++ (NSString *)primaryAspect
+{
+  return @"value";
+}
+
+- (void)establishConnection
+{
+}
+- (void)breakConnection
+{
+}
+
+- (void)subjectChanged
+{
+}
+- (BOOL)endEditing
+{
+  return NO;
+}
+
+- (BOOL)control: (NSControl *)control isValidObject: (id)object
+{
+  return NO;
+}
+
+- (void)control: (NSControl *)control
+didFailToValidatePartialString: (NSString *)string
+errorDescription: (NSString *)description
+{
+}
+
+- (BOOL)textShouldBeginEditing: (NSText *) text
+{
+  return NO;
+}
+- (BOOL)textShouldEndEditing: (NSText *)text
+{
+  return NO;
+}
+
+@end

EOInterface/GNUmakefile

@@ -41,9 +41,19 @@ EOAssociation.m \
 EOColumnAssociation.m \
 EOComboBoxAssociation.m \
 EOControlAssociation.m \
+EODetailSelectionAssociation.m \
 EODisplayGroup.m \
 EOGenericControlAssociation.m \
+EOMasterCopyAssociation.m \
+EOMasterDetailAssociation.m \
+EOMasterPeerAssociation.m \
+EOMatrixAssociation.m \
+EOPickTextAssociation.m \
+EOPopUpAssociation.m \
+EORadioMatrixAssociation.m \
+EORecursiveBrowserAssociation.m \
 EOTableViewAssociation.m \
+EOTextAssociation.m \
 NSImage+Additions.m
 
 EOInterface_HEADER_FILES = \
@@ -53,8 +63,17 @@ EOAssociation.h \
 EOColumnAssociation.h \
 EOComboBoxAssociation.h \
 EOControlAssociation.h \
+EODetailSelectionAssociation.h \
 EODisplayGroup.h \
-EOInterface.h
+EOInterface.h \
+EOMasterCopyAssociation.h \
+EOMasterDetailAssociation.h \
+EOMatrixAssociation.h \
+EOPickTextAssociation.h \
+EOPopUpAssociation.h \
+EORadioMatrixAssociation.h \
+EORecursiveBrowserAssociation.h \
+EOTextAssociation.h
 
 gdl2_AUTOGSDOC_HEADERS = $(EOInterface_HEADER_FILES)
 gdl2_AUTOGSDOC_SOURCE = $(EOInterface_OBJC_FILES)