1 files changed, 5 insertions, 13 deletions
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
index bb9ce6cb1d9..c8f677fa0a0 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
@@ -50,9 +50,8 @@ import java.beans.PropertyChangeListener;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
+import javax.swing.LookAndFeel;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.LabelUI;
 
@@ -60,9 +59,7 @@ import javax.swing.plaf.LabelUI;
  * This is the Basic Look and Feel class for the JLabel.  One BasicLabelUI
  * object is used to paint all JLabels that utilize the Basic Look and Feel.
  */
-public class BasicLabelUI
-    extends LabelUI
-    implements PropertyChangeListener
+public class BasicLabelUI extends LabelUI implements PropertyChangeListener
 {
   /** The labelUI that is shared by all labels. */
   protected static BasicLabelUI labelUI;
@@ -345,11 +342,8 @@ public class BasicLabelUI
    */
   protected void installDefaults(JLabel c)
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-
-    c.setForeground(defaults.getColor("Label.foreground"));
-    c.setBackground(defaults.getColor("Label.background"));
-    c.setFont(defaults.getFont("Label.font"));
+    LookAndFeel.installColorsAndFont(c, "Label.background", "Label.foreground",
+                                     "Label.font");
     //XXX: There are properties we don't use called disabledForeground
     //and disabledShadow.
   }
@@ -417,8 +411,6 @@ public class BasicLabelUI
    */
   public void propertyChange(PropertyChangeEvent e)
   {
-    JLabel c = (JLabel) e.getSource();
-    c.revalidate();
-    c.repaint();
+    // What to do here?
   }
 }