Imported GNU Classpath gcj-import-20051117.

       * gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r107153

1 files changed, 1 insertions, 4 deletions

diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
index 2d3dbd350e0..7a63331b9c8 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
@@ -52,7 +52,6 @@ import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.LookAndFeel;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.ComponentUI;
@@ -161,7 +160,6 @@ public class BasicButtonUI extends ButtonUI
     b.setIconTextGap(UIManager.getInt(prefix + "textIconGap"));
     b.setInputMap(JComponent.WHEN_FOCUSED, 
                   (InputMap) UIManager.get(prefix + "focusInputMap"));
-    b.setRolloverEnabled(UIManager.getBoolean(prefix + "rollover"));
   }
 
   /**
@@ -444,9 +442,8 @@ public class BasicButtonUI extends ButtonUI
       }
     else
       {
-        UIDefaults defaults = UIManager.getLookAndFeelDefaults();
         String prefix = getPropertyPrefix();
-        g.setColor(defaults.getColor(prefix + "disabledText"));
+        g.setColor(UIManager.getColor(prefix + "disabledText"));
         g.drawString(text, textRect.x, textRect.y + fm.getAscent());
       }
   }