--- /home/cpdev/src/classpath/javax/swing/JButton.java	2005-07-15 17:32:40.000000000 +0000
+++ javax/swing/JButton.java	2005-06-30 05:35:08.000000000 +0000
@@ -1,5 +1,5 @@
 /* JButton.java --
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -77,9 +77,7 @@
 
   public JButton(String text, Icon icon)
   {
-    super();
-    init(text, icon);
-    setModel(new DefaultButtonModel());
+    super(text, icon);
   }
 
   public Object[] getSelectedObjects()
@@ -89,48 +87,37 @@
 
   protected void configurePropertiesFromAction(Action a)
   {
-    // Factory method which sets the AbstractButton's properties according to
-    // values from the Action instance. 
+    //Factory method which sets the AbstractButton's properties according to values from the Action instance. 
     super.configurePropertiesFromAction(a);
   }
 
   public AccessibleContext getAccessibleContext()
   {
-    // Gets the AccessibleContext associated with this JButton. 
+    //Gets the AccessibleContext associated with this JButton. 
     return null;
   }
 
   public String getUIClassID()
   {
-    // Returns a string that specifies the name of the L&F class that renders
-    // this component.  
+    //Returns a string that specifies the name of the L&F class that renders this component.  
     return "ButtonUI";
   }
 
   public boolean isDefaultButton()
   {
-    // Returns whether or not this button is the default button on the
-    // RootPane.
+    //Returns whether or not this button is the default button on the RootPane.  
     return is_def;
   }
 
   public boolean isDefaultCapable()
   {
-    // Returns whether or not this button is capable of being the default
-    // button on the RootPane. 
+    //Returns whether or not this button is capable of being the default button on the RootPane. 
     return def;
   }
 
   protected String paramString()
   {
-    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();
+    return "JButton";
   }
 
   /**
