* EOControl/EOAndQualifier.m,

* EOControl/EOKeyComparisonQualifier.m,
	* EOControl/EOKeyValueQualifier.m,
	* EOControl/EOOrQualifier.m: ([-description]) Make qualifiers
	user presentable like in WO.
	(-[debugDescription]): New deprecated method for old descriptions.


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

ChangeLog

@@ -1,3 +1,12 @@
+2005-10-02  David Ayers  <d.ayers@inode.at>
+
+	* EOControl/EOAndQualifier.m,
+	* EOControl/EOKeyComparisonQualifier.m,
+	* EOControl/EOKeyValueQualifier.m,
+	* EOControl/EOOrQualifier.m: ([-description]) Make qualifiers
+	user presentable like in WO.
+	(-[debugDescription]): New deprecated method for old description.
+	
 2005-08-25  Manuel Guesdon  <mguesdon@orange-concept.com>
 
 	* EOAccess/EOSQLQualifier.m: change in EOAndQualifier and 

EOControl/EOAndQualifier.m

@@ -231,7 +231,19 @@ RCS_ID("$Id$")
   return nil;//TODO
 }
 
-- (id) description
+- (NSString *) description
+{
+  NSString *dscr;
+  
+  dscr = [NSString stringWithFormat: @"(%@)",
+		   [_qualifiers componentsJoinedByString: @" AND "]];
+
+  return dscr;
+}
+/**
+ * Deprecated debug description.  Expect it to be removed.
+ */
+- (NSString *) debugDescription
 {
   NSString *dscr;
 

EOControl/EOKeyComparisonQualifier.m

@@ -236,6 +236,22 @@ RCS_ID("$Id$")
  * Returns a human readable representation of the receiver.
  */
 - (NSString *) description
+{
+  NSString *selectorString;
+  selectorString = [isa stringForOperatorSelector: _selector];
+  if (selectorString == nil)
+    {
+      selectorString = NSStringFromSelector(_selector);
+    }
+  return [NSString stringWithFormat:@"(%@ %@ %@)",
+		   _leftKey,
+		   selectorString,
+		   _rightKey];
+}
+/**
+ * Deprecated debug description.  Expect it to be removed.
+ */
+- (NSString *) debugDescription
 {
   NSString *selectorString;
   selectorString = [isa stringForOperatorSelector: _selector];

EOControl/EOKeyValueQualifier.m

@@ -310,6 +310,22 @@ RCS_ID("$Id$")
  * Returns a human readable representation of the receiver.
  */
 - (NSString *) description
+{
+  NSString *selectorString;
+  selectorString = [isa stringForOperatorSelector: _selector];
+  if (selectorString == nil)
+    {
+      selectorString = NSStringFromSelector(_selector);
+    }
+  return [NSString stringWithFormat:@"(%@ %@ '%@')",
+		   _key,
+		   selectorString,
+		   _value];
+}
+/**
+ * Deprecated debug description.  Expect it to be removed.
+ */
+- (NSString *) debugDescription
 {
   NSString *selectorString;
   selectorString = [isa stringForOperatorSelector: _selector];

EOControl/EOOrQualifier.m

@@ -216,7 +216,20 @@ RCS_ID("$Id$")
   return nil;
 }
 
-- (id) description
+- (NSString *) description
+{
+  NSString *dscr;
+  
+  dscr = [NSString stringWithFormat: @"(%@)",
+		   [_qualifiers componentsJoinedByString: @" OR "]];
+
+  return dscr;
+}
+
+/**
+ * Deprecated debug description.  Expect it to be removed.
+ */
+- (NSString *)debugDescription
 {
   NSString *dscr;