[PATCH] misc. toString fixes

[Dalibor Topic]

--------------Boundary-00=_SH2XAGU6YSOVGYDW3TYI
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hi,

here's yet another small fix for toString, in order to improve
comparability of output with JDK. This one adds a toString method in
java.awt.image.DirectColorModel, and adapts the existing ones in
java.awt.BorderLayout, java.awt.Event and java.util.EventObject.

Dalibor Topic

--------------Boundary-00=_SH2XAGU6YSOVGYDW3TYI
Content-Type: text/plain;
  charset="us-ascii";
  name="ChangeLog"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="ChangeLog"

	* libraries/javalib/java/awt/BorderLayout.java:
	(toString) Improved comparability with JDK.
	
	* libraries/javalib/java/awt/awt/Event.java:
	(toString) Improved comparability with JDK.
	
	* libraries/javalib/java/awt/awt/image/DirectColorModel.java:
	(toString) New method.

	* libraries/javalib/java/awt/util/EventObject.java:
	(toString) Improved comparability with JDK.


--------------Boundary-00=_SH2XAGU6YSOVGYDW3TYI
Content-Type: text/x-diff;
  charset="us-ascii";
  name="patch.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch.diff"

diff -urB kaffe/libraries/javalib/java/awt/BorderLayout.java patched-kaffe/libraries/javalib/java/awt/BorderLayout.java
--- kaffe/libraries/javalib/java/awt/BorderLayout.java	Wed Mar 24 08:56:18 1999
+++ patched-kaffe/libraries/javalib/java/awt/BorderLayout.java	Tue Mar 12 12:57:27 2002
@@ -318,6 +318,6 @@
  * Returns the String representation of this BorderLayout's values.
  */
 public String toString() {
-	return getClass().getName() + " [" + hGap + ',' + vGap + ']';
+	return getClass().getName() + "[hgap=" + hGap + ",vgap=" + vGap + ']';
 }
 }
diff -urB kaffe/libraries/javalib/java/awt/Event.java patched-kaffe/libraries/javalib/java/awt/Event.java
--- kaffe/libraries/javalib/java/awt/Event.java	Thu Feb 28 22:54:10 2002
+++ patched-kaffe/libraries/javalib/java/awt/Event.java	Tue Mar 12 12:59:52 2002
@@ -156,7 +156,7 @@
 }
 
 protected String paramString() {
-	return ("id=" + id + ",x=" + x + ",y=" + y + ",key=" + key 
+	return ("id=" + id + ",x=" + x + ",y=" + y
 		+ ",target=" + target + ",arg=" + arg);
 }
 
diff -urB kaffe/libraries/javalib/java/awt/image/DirectColorModel.java patched-kaffe/libraries/javalib/java/awt/image/DirectColorModel.java
--- kaffe/libraries/javalib/java/awt/image/DirectColorModel.java	Sat Jul 24 02:56:16 1999
+++ patched-kaffe/libraries/javalib/java/awt/image/DirectColorModel.java	Tue Mar 12 13:36:34 2002
@@ -126,4 +126,11 @@
 
 	return (i + (j - 8));
 }
+
+public String toString() {
+	return "DirectColorModel: rmask=" + Integer.toHexString(getRedMask())
+		+ " gmask=" + Integer.toHexString(getGreenMask())
+		+ " bmask=" + Integer.toHexString(getBlueMask())
+		+ " amask=" + Integer.toHexString(getAlphaMask());
+}
 }
diff -urB kaffe/libraries/javalib/java/util/EventObject.java patched-kaffe/libraries/javalib/java/util/EventObject.java
--- kaffe/libraries/javalib/java/util/EventObject.java	Fri Nov 23 00:38:12 2001
+++ patched-kaffe/libraries/javalib/java/util/EventObject.java	Tue Mar 12 13:29:09 2002
@@ -26,6 +26,6 @@
 }
 
 public String toString() {
-	return (source.toString());
+	return (getClass().getName() + "[source=" + source.toString() + ']');
 }
 }

--------------Boundary-00=_SH2XAGU6YSOVGYDW3TYI--


_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com