[cp-patches] buttons paramString fixes #2

[Robert Schuster]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,
please forget about the first patch.

This one is the same but fixes JRadioButton, too.

2005-07-13  Robert Schuster  <address@hidden>

    * javax/swing/JToggleButton.java:
    (paramString): Returns value of same method in superclass now.
    * javax/swing/JRadioButton.java:
    (paramString): Dito.
    * javax/swing/JButton.java:
    (paramString): Returns value of same method in superclass now,
    more verbose information added.
    * javax/swing/JCheckBox.java:
    (paramString): Dito.

cu
Robert
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFC1GIHG9cfwmwwEtoRAghnAJ9C07AY7FJGkOHrTD1COTT8RV+NdgCfWDVM
I0euWCKSk/g2XJ4aN6VsAv0=
=hxDt
-----END PGP SIGNATURE-----

Index: javax/swing//JButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JButton.java,v
retrieving revision 1.15
diff -u -r1.15 JButton.java
--- javax/swing//JButton.java   2 Jul 2005 20:32:47 -0000       1.15
+++ javax/swing//JButton.java   13 Jul 2005 00:31:00 -0000
@@ -1,5 +1,5 @@
 /* JButton.java --
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -123,7 +123,14 @@
 
   protected String paramString()
   {
-    return "JButton";
+    String superParam = super.paramString();
+
+    // 41 is the maximum number of chars which may be needed.
+    StringBuffer sb = new StringBuffer(41);
+    sb.append(",defaultButton=").append(is_def);
+    sb.append(",defaultCapable=").append(def);
+
+    return superParam + sb.toString();
   }
 
   /**
Index: javax/swing//JCheckBox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBox.java,v
retrieving revision 1.12
diff -u -r1.12 JCheckBox.java
--- javax/swing//JCheckBox.java 2 Jul 2005 20:32:47 -0000       1.12
+++ javax/swing//JCheckBox.java 13 Jul 2005 00:31:00 -0000
@@ -1,5 +1,5 @@
 /* JCheckBox.java -- 
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -127,7 +127,7 @@
   
   protected  String paramString()
   {
-    return "JCheckBox";
+    return super.paramString() + ",borderPaintedFlat=" + borderPaintedFlat;
   }
 
   public boolean isBorderPaintedFlat()
Index: javax/swing//JRadioButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRadioButton.java,v
retrieving revision 1.15
diff -u -r1.15 JRadioButton.java
--- javax/swing//JRadioButton.java      2 Jul 2005 20:32:48 -0000       1.15
+++ javax/swing//JRadioButton.java      13 Jul 2005 00:31:00 -0000
@@ -236,7 +236,7 @@
    */  
   protected  String paramString()
   {
-    return "JRadioButton";
+    return super.paramString();
   }
   
   /**
Index: javax/swing//JToggleButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JToggleButton.java,v
retrieving revision 1.19
diff -u -r1.19 JToggleButton.java
--- javax/swing//JToggleButton.java     2 Jul 2005 20:32:49 -0000       1.19
+++ javax/swing//JToggleButton.java     13 Jul 2005 00:31:00 -0000
@@ -287,7 +287,7 @@
    */
   protected  String paramString()
   {
-    return "JToggleButton";
+    return super.paramString();
   }
   
   /**