I also cleaned up the Metal L&F, replacing all
UIManager.getLookAndFeelDefaults().getXXX() calls with
UIManager.getXXX(). I also removed some redundant init code from
MetalTreeUI() which is now delegated to the superclass, which does
exactly the same thing.

2005-11-15  Roman Kennke  <[EMAIL PROTECTED]>

        * javax/swing/plaf/metal/MetalBorders.java
        (OptionDialogBorder.paintBorder): Replaced
        UIManager.getLookAndFeelDefaults().get() with UIManager.get().
        * javax/swing/plaf/metal/MetalButtonUI.java
        (MetalButtonUI): Replaced UIManager.getLookAndFeelDefaults().get()
        with UIManager.get().
        * javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
        (installDefaults): Replaced UIManager.getLookAndFeelDefaults().get()
        with UIManager.get().
        * javax/swing/plaf/metal/MetalLabelUI.java
        (paintDisabledText): Replaced UIManager.getLookAndFeelDefaults().get()
        with UIManager.get().
        * javax/swing/plaf/metal/MetalRadioButtonUI.java
        (installDefaults): Replaced UIManager.getLookAndFeelDefaults().get()
        with UIManager.get().
        * javax/swing/plaf/metal/MetalScrollBarUI.java
        (createDecreaseButton): Replaced
        UIManager.getLookAndFeelDefaults().get() with UIManager.get().
        (createIncreaseButton): Replaced
        UIManager.getLookAndFeelDefaults().get() with UIManager.get().
        (paintThumbHorizontal): Replaced
        UIManager.getLookAndFeelDefaults().get() with UIManager.get().
        (paintThumbVertical): Replaced
        UIManager.getLookAndFeelDefaults().get() with UIManager.get().
        * javax/swing/plaf/metal/MetalSplitPaneUI.java
        (createDefaultDivider): Replaced
        UIManager.getLookAndFeelDefaults().get() with UIManager.get().
        * javax/swing/plaf/metal/MetalToggleButtonUI.java
        (installDefaults): Replaced UIManager.getLookAndFeelDefaults().get()
        with UIManager.get().
        * javax/swing/plaf/metal/MetalToolTipUI.java
        (MetalToolTipUI): Replaced UIManager.getLookAndFeelDefaults().get()
        with UIManager.get().
        * javax/swing/plaf/metal/MetalTreeUI.java
        Removed all listener fields.
        (installUI): Removed initialization and call super.installUI()
        instead.
        (uninstallUI): Removed initialization and call super.uninstallUI()
        instead.

/Roman
Index: javax/swing/plaf/metal/MetalBorders.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalBorders.java,v
retrieving revision 1.27
diff -u -r1.27 MetalBorders.java
--- javax/swing/plaf/metal/MetalBorders.java	27 Oct 2005 09:50:58 -0000	1.27
+++ javax/swing/plaf/metal/MetalBorders.java	15 Nov 2005 20:48:59 -0000
@@ -56,7 +56,6 @@
 import javax.swing.JToggleButton;
 import javax.swing.JToolBar;
 import javax.swing.SwingConstants;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.border.AbstractBorder;
 import javax.swing.border.Border;
@@ -654,24 +653,23 @@
         {
           JOptionPane pane = (JOptionPane) f.getContentPane();
           int type = pane.getMessageType();
-          UIDefaults defaults = UIManager.getLookAndFeelDefaults();
           if (type == JOptionPane.QUESTION_MESSAGE)
             {
-              Color bc = defaults.getColor(
+              Color bc = UIManager.getColor(
                   "OptionPane.questionDialog.border.background");
               if (bc != null)
                 g.setColor(bc);
             }
           if (type == JOptionPane.WARNING_MESSAGE)
             {
-              Color bc = defaults.getColor(
+              Color bc = UIManager.getColor(
                   "OptionPane.warningDialog.border.background");
               if (bc != null)
                 g.setColor(bc);              
             }
           else if (type == JOptionPane.ERROR_MESSAGE)
             {
-              Color bc = defaults.getColor(
+              Color bc = UIManager.getColor(
                   "OptionPane.errorDialog.border.background");
               if (bc != null)
                 g.setColor(bc);              
Index: javax/swing/plaf/metal/MetalButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalButtonUI.java,v
retrieving revision 1.10
diff -u -r1.10 MetalButtonUI.java
--- javax/swing/plaf/metal/MetalButtonUI.java	7 Nov 2005 18:26:50 -0000	1.10
+++ javax/swing/plaf/metal/MetalButtonUI.java	15 Nov 2005 20:48:59 -0000
@@ -47,7 +47,6 @@
 import javax.swing.AbstractButton;
 import javax.swing.JButton;
 import javax.swing.JComponent;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
@@ -78,10 +77,9 @@
   public MetalButtonUI()
   {
     super();
-    UIDefaults def = UIManager.getLookAndFeelDefaults();
-    focusColor = def.getColor(getPropertyPrefix() + "focus");
-    selectColor = def.getColor(getPropertyPrefix() + "select");
-    disabledTextColor = def.getColor(getPropertyPrefix() + "disabledText");
+    focusColor = UIManager.getColor(getPropertyPrefix() + "focus");
+    selectColor = UIManager.getColor(getPropertyPrefix() + "select");
+    disabledTextColor = UIManager.getColor(getPropertyPrefix() + "disabledText");
   }
 
   /**
Index: javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java,v
retrieving revision 1.5
diff -u -r1.5 MetalInternalFrameTitlePane.java
--- javax/swing/plaf/metal/MetalInternalFrameTitlePane.java	27 Oct 2005 09:50:58 -0000	1.5
+++ javax/swing/plaf/metal/MetalInternalFrameTitlePane.java	15 Nov 2005 20:48:59 -0000
@@ -55,7 +55,6 @@
 import javax.swing.JMenu;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicInternalFrameTitlePane;
 
@@ -260,9 +259,8 @@
     notSelectedTextColor = MetalLookAndFeel.getInactiveControlTextColor();
     notSelectedTitleColor = MetalLookAndFeel.getWindowTitleInactiveBackground();
     
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    paletteTitleHeight = defaults.getInt("InternalFrame.paletteTitleHeight");
-    paletteCloseIcon = defaults.getIcon("InternalFrame.paletteCloseIcon");
+    paletteTitleHeight = UIManager.getInt("InternalFrame.paletteTitleHeight");
+    paletteCloseIcon = UIManager.getIcon("InternalFrame.paletteCloseIcon");
     minIcon = MetalIconFactory.getInternalFrameAltMaximizeIcon(16);
     
     title = new JLabel(frame.getTitle(), 
Index: javax/swing/plaf/metal/MetalLabelUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLabelUI.java,v
retrieving revision 1.5
diff -u -r1.5 MetalLabelUI.java
--- javax/swing/plaf/metal/MetalLabelUI.java	27 Oct 2005 09:50:58 -0000	1.5
+++ javax/swing/plaf/metal/MetalLabelUI.java	15 Nov 2005 20:48:59 -0000
@@ -43,7 +43,6 @@
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicGraphicsUtils;
@@ -83,22 +82,20 @@
   
   /**
    * Draws the text for a disabled label, using the color defined in the 
-   * [EMAIL PROTECTED] UIDefaults} with the key <code>Label.disabledForeground</code>.
+   * [EMAIL PROTECTED] UIManager} defaults with the key
+   * <code>Label.disabledForeground</code>.
    * 
    * @param l  the label.
    * @param g  the graphics device.
    * @param s  the label text.
    * @param textX  the x-coordinate for the label.
    * @param textY  the y-coordinate for the label.
-   * 
-   * @see UIManager#getLookAndFeelDefaults()
    */
   protected void paintDisabledText(JLabel l, Graphics g, String s, int textX,
                                  int textY)
   {
     Color savedColor = g.getColor();
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    g.setColor(defaults.getColor("Label.disabledForeground"));
+    g.setColor(UIManager.getColor("Label.disabledForeground"));
     int mnemIndex = l.getDisplayedMnemonicIndex();
     if (mnemIndex != -1)
       BasicGraphicsUtils.drawStringUnderlineCharAt(g, s, mnemIndex, textX,
Index: javax/swing/plaf/metal/MetalRadioButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java,v
retrieving revision 1.7
diff -u -r1.7 MetalRadioButtonUI.java
--- javax/swing/plaf/metal/MetalRadioButtonUI.java	10 Nov 2005 22:59:26 -0000	1.7
+++ javax/swing/plaf/metal/MetalRadioButtonUI.java	15 Nov 2005 20:48:59 -0000
@@ -46,7 +46,6 @@
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
 import javax.swing.JRadioButton;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicRadioButtonUI;
@@ -96,10 +95,9 @@
   public void installDefaults(AbstractButton b)
   {
     super.installDefaults(b);
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    disabledTextColor = defaults.getColor("RadioButton.disabledText");
-    focusColor = defaults.getColor("RadioButton.focus");
-    selectColor = defaults.getColor("RadioButton.select");
+    disabledTextColor = UIManager.getColor("RadioButton.disabledText");
+    focusColor = UIManager.getColor("RadioButton.focus");
+    selectColor = UIManager.getColor("RadioButton.select");
   }
   
   /**
@@ -118,7 +116,7 @@
   /**
    * Returns the color used to fill the [EMAIL PROTECTED] JRadioButton}'s icon when the
    * button is pressed.  The default color is obtained from the 
-   * [EMAIL PROTECTED] UIDefaults} via an entry with the key 
+   * [EMAIL PROTECTED] UIManager} defaults via an entry with the key 
    * <code>RadioButton.select</code>.
    * 
    * @return The select color.
@@ -130,8 +128,8 @@
   
   /**
    * Returns the color for the [EMAIL PROTECTED] JRadioButton}'s text when the button is
-   * disabled.  The default color is obtained from the [EMAIL PROTECTED] UIDefaults} via 
-   * an entry with the key <code>RadioButton.disabledText</code>.
+   * disabled.  The default color is obtained from the [EMAIL PROTECTED] UIManager}
+   * defaults via an entry with the key <code>RadioButton.disabledText</code>.
    * 
    * @return The disabled text color.
    */
@@ -143,7 +141,7 @@
   /**
    * Returns the color used to draw the focus rectangle when the 
    * [EMAIL PROTECTED] JRadioButton} has the focus.  The default color is obtained from 
-   * the [EMAIL PROTECTED] UIDefaults} via an entry with the key 
+   * the [EMAIL PROTECTED] UIManager} defaults via an entry with the key 
    * <code>RadioButton.focus</code>.
    * 
    * @return The color used to draw the focus rectangle.
Index: javax/swing/plaf/metal/MetalScrollBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java,v
retrieving revision 1.11
diff -u -r1.11 MetalScrollBarUI.java
--- javax/swing/plaf/metal/MetalScrollBarUI.java	27 Oct 2005 09:50:58 -0000	1.11
+++ javax/swing/plaf/metal/MetalScrollBarUI.java	15 Nov 2005 20:48:59 -0000
@@ -48,7 +48,6 @@
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JScrollBar;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicScrollBarUI;
@@ -195,8 +194,7 @@
    */
   protected JButton createDecreaseButton(int orientation)
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    scrollBarWidth = defaults.getInt("ScrollBar.width");
+    scrollBarWidth = UIManager.getInt("ScrollBar.width");
     decreaseButton = new MetalScrollButton(orientation, scrollBarWidth, 
             isFreeStanding);
     return decreaseButton;
@@ -213,8 +211,7 @@
    */
   protected JButton createIncreaseButton(int orientation)
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    scrollBarWidth = defaults.getInt("ScrollBar.width");
+    scrollBarWidth = UIManager.getInt("ScrollBar.width");
     increaseButton = new MetalScrollButton(orientation, scrollBarWidth, 
             isFreeStanding);
     return increaseButton;
@@ -403,8 +400,7 @@
       }
     
     // draw the shadow line
-    UIDefaults def = UIManager.getLookAndFeelDefaults();
-    g.setColor(def.getColor("ScrollBar.shadow"));
+    g.setColor(UIManager.getColor("ScrollBar.shadow"));
     g.drawLine(x + w, y + 1, x + w, y + h - 1);
 
   }
@@ -456,8 +452,7 @@
       }
     
     // draw the shadow line
-    UIDefaults def = UIManager.getLookAndFeelDefaults();
-    g.setColor(def.getColor("ScrollBar.shadow"));
+    g.setColor(UIManager.getColor("ScrollBar.shadow"));
     g.drawLine(x + 1, y + h, x + w - 2, y + h);
   }
   
Index: javax/swing/plaf/metal/MetalSplitPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java,v
retrieving revision 1.7
diff -u -r1.7 MetalSplitPaneUI.java
--- javax/swing/plaf/metal/MetalSplitPaneUI.java	27 Oct 2005 09:50:58 -0000	1.7
+++ javax/swing/plaf/metal/MetalSplitPaneUI.java	15 Nov 2005 20:48:59 -0000
@@ -42,7 +42,6 @@
 
 import javax.swing.JComponent;
 import javax.swing.JSplitPane;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
@@ -83,9 +82,8 @@
    */
   public BasicSplitPaneDivider createDefaultDivider()
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    Color light = defaults.getColor("SplitPane.highlight");
-    Color dark = defaults.getColor("SplitPane.darkShadow");
+    Color light = UIManager.getColor("SplitPane.highlight");
+    Color dark = UIManager.getColor("SplitPane.darkShadow");
     return new MetalSplitPaneDivider(this, light, dark);
   }
 }
Index: javax/swing/plaf/metal/MetalToggleButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java,v
retrieving revision 1.6
diff -u -r1.6 MetalToggleButtonUI.java
--- javax/swing/plaf/metal/MetalToggleButtonUI.java	27 Oct 2005 08:33:13 -0000	1.6
+++ javax/swing/plaf/metal/MetalToggleButtonUI.java	15 Nov 2005 20:48:59 -0000
@@ -48,7 +48,6 @@
 import javax.swing.JComponent;
 import javax.swing.JToggleButton;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicButtonUI;
@@ -131,10 +130,9 @@
   public void installDefaults(AbstractButton b)
   {
     super.installDefaults(b);
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    focusColor = defaults.getColor(getPropertyPrefix() + "focus");
-    selectColor = defaults.getColor(getPropertyPrefix() + "select");
-    disabledTextColor = defaults.getColor(getPropertyPrefix() + "disabledText");
+    focusColor = UIManager.getColor(getPropertyPrefix() + "focus");
+    selectColor = UIManager.getColor(getPropertyPrefix() + "select");
+    disabledTextColor = UIManager.getColor(getPropertyPrefix() + "disabledText");
   }
   
   /**
Index: javax/swing/plaf/metal/MetalToolTipUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalToolTipUI.java,v
retrieving revision 1.5
diff -u -r1.5 MetalToolTipUI.java
--- javax/swing/plaf/metal/MetalToolTipUI.java	27 Oct 2005 09:50:58 -0000	1.5
+++ javax/swing/plaf/metal/MetalToolTipUI.java	15 Nov 2005 20:48:59 -0000
@@ -56,7 +56,6 @@
 import javax.swing.KeyStroke;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
@@ -107,13 +106,12 @@
   public MetalToolTipUI()
   {
     super();
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    activeBorder = defaults.getBorder("ToolTip.border");
-    inactiveBorder = defaults.getBorder("ToolTip.borderInactive");
-    isAcceleratorHidden = defaults.getBoolean("ToolTip.hideAccelerator");
-    acceleratorFont = defaults.getFont("MenuItem.acceleratorFont");
-    acceleratorForeground = defaults.getColor("MenuItem.acceleratorForeground");
-    acceleratorDelimiter = defaults.getString("MenuItem.acceleratorDelimiter");
+    activeBorder = UIManager.getBorder("ToolTip.border");
+    inactiveBorder = UIManager.getBorder("ToolTip.borderInactive");
+    isAcceleratorHidden = UIManager.getBoolean("ToolTip.hideAccelerator");
+    acceleratorFont = UIManager.getFont("MenuItem.acceleratorFont");
+    acceleratorForeground = UIManager.getColor("MenuItem.acceleratorForeground");
+    acceleratorDelimiter = UIManager.getString("MenuItem.acceleratorDelimiter");
   }
 
   /**
Index: javax/swing/plaf/metal/MetalTreeUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalTreeUI.java,v
retrieving revision 1.15
diff -u -r1.15 MetalTreeUI.java
--- javax/swing/plaf/metal/MetalTreeUI.java	27 Oct 2005 09:50:58 -0000	1.15
+++ javax/swing/plaf/metal/MetalTreeUI.java	15 Nov 2005 20:48:59 -0000
@@ -41,24 +41,10 @@
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Rectangle;
-import java.awt.event.ComponentListener;
-import java.awt.event.FocusListener;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseListener;
-import java.beans.PropertyChangeListener;
-import java.util.Hashtable;
 
 import javax.swing.JComponent;
 import javax.swing.JTree;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
-import javax.swing.tree.TreeCellEditor;
-import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
-import javax.swing.event.CellEditorListener;
-import javax.swing.event.TreeExpansionListener;
-import javax.swing.event.TreeModelListener;
-import javax.swing.event.TreeSelectionListener;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicTreeUI;
 
@@ -67,19 +53,6 @@
  */
 public class MetalTreeUI extends BasicTreeUI
 {
-
-  /** Listeners */
-  private PropertyChangeListener propertyChangeListener;
-  private FocusListener focusListener;
-  private TreeSelectionListener treeSelectionListener;
-  private MouseListener mouseListener;
-  private KeyListener keyListener;
-  private PropertyChangeListener selectionModelPropertyChangeListener;
-  private ComponentListener componentListener;
-  private CellEditorListener cellEditorListener;
-  private TreeExpansionListener treeExpansionListener;
-  private TreeModelListener treeModelListener;
-    
   /**
    * Constructs a new instance of <code>MetalTreeUI</code>.
    */
@@ -128,71 +101,8 @@
    */
   public void installUI(JComponent c)
   {
-    tree = (JTree) c;
-    configureLayoutCache();
-    
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    tree.setFont(defaults.getFont("Tree.font"));
-    tree.setForeground(defaults.getColor("Tree.foreground"));
-    tree.setBackground(defaults.getColor("Tree.background"));
-    tree.setOpaque(true);
-    tree.setScrollsOnExpand(defaults.getBoolean("Tree.scrollsOnExpand"));
-    rightChildIndent = defaults.getInt("Tree.rightChildIndent");
-    leftChildIndent = defaults.getInt("Tree.leftChildIndent");
-    setRowHeight(defaults.getInt("Tree.rowHeight"));
-    tree.setRowHeight(defaults.getInt("Tree.rowHeight"));
-    tree.requestFocusInWindow(false);
-    
-    setExpandedIcon(defaults.getIcon("Tree.expandedIcon"));
-    setCollapsedIcon(defaults.getIcon("Tree.collapsedIcon"));
-    
-    currentCellRenderer = createDefaultCellRenderer();
-    rendererPane = createCellRendererPane();
-    createdRenderer = true;
-    setCellEditor(createDefaultCellEditor());
-    createdCellEditor = true;
-    TreeModel mod = tree.getModel();
-    setModel(mod);
-
-    treeSelectionModel = tree.getSelectionModel();
-    drawingCache = new Hashtable();
-    nodeDimensions = createNodeDimensions();
-    
-    propertyChangeListener = createPropertyChangeListener();
-    focusListener = createFocusListener();
-    treeSelectionListener = createTreeSelectionListener();
-    mouseListener = createMouseListener();
-    keyListener = createKeyListener();
-    selectionModelPropertyChangeListener = createSelectionModelPropertyChangeListener();
-    componentListener = createComponentListener();
-    cellEditorListener = createCellEditorListener();
-    treeExpansionListener = createTreeExpansionListener();
-    treeModelListener = createTreeModelListener();
-
-    editingRow = -1;
-    lastSelectedRow = -1;
-    
-    installKeyboardActions();
-    
-    tree.addPropertyChangeListener(propertyChangeListener);
-    tree.addFocusListener(focusListener);
-    tree.addTreeSelectionListener(treeSelectionListener);
-    tree.addMouseListener(mouseListener);
-    tree.addKeyListener(keyListener);
-    tree.addPropertyChangeListener(selectionModelPropertyChangeListener);
-    tree.addComponentListener(componentListener);
-    tree.addTreeExpansionListener(treeExpansionListener);
-    if (treeModel != null)
-      treeModel.addTreeModelListener(treeModelListener);
-    
-    if (mod != null)
-      {
-        TreePath path = new TreePath(mod.getRoot());
-        if (!tree.isExpanded(path))
-          toggleExpandState(path);
-      }
-    
-    completeUIInstall();
+    // TODO: What to do here, if anything?
+    super.installUI(c);
   }
   
   /**
@@ -212,31 +122,8 @@
    */
   public void uninstallUI(JComponent c)
   {
-    tree.setFont(null);
-    tree.setForeground(null);
-    tree.setBackground(null);
-    
-    uninstallKeyboardActions();
-    
-    tree.removePropertyChangeListener(propertyChangeListener);
-    tree.removeFocusListener(focusListener);
-    tree.removeTreeSelectionListener(treeSelectionListener);
-    tree.removeMouseListener(mouseListener);
-    tree.removeKeyListener(keyListener);
-    tree.removePropertyChangeListener(selectionModelPropertyChangeListener);
-    tree.removeComponentListener(componentListener);
-    tree.removeTreeExpansionListener(treeExpansionListener);
-
-    TreeCellEditor tce = tree.getCellEditor();
-    if (tce != null)
-      tce.removeCellEditorListener(cellEditorListener);
-    TreeModel tm = tree.getModel();
-    if (tm != null)
-      tm.removeTreeModelListener(treeModelListener);
-    
-    tree = null;
-    uninstallComponents();
-    completeUIUninstall();
+    // TODO: What to do here?
+    super.uninstallUI(c);
   }
   
   /**
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches

Reply via email to