--- /home/cpdev/src/classpath/javax/swing/plaf/metal/MetalTreeUI.java	2005-07-13 05:32:59.000000000 +0000
+++ javax/swing/plaf/metal/MetalTreeUI.java	2005-06-30 05:35:20.000000000 +0000
@@ -38,8 +38,6 @@
 
 package javax.swing.plaf.metal;
 
-import java.util.HashMap;
-
 import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicTreeUI;
@@ -48,8 +46,9 @@
   extends BasicTreeUI
 {
 
-  /** The UI instances for MetalTreeUIs */
-  private static HashMap instances = null;
+  // FIXME: maybe replace by a Map of instances when this becomes stateful
+  /** The shared UI instance for MetalTreeUIs */
+  private static MetalTreeUI instance = null;
 
   /**
    * Constructs a new instance of MetalTreeUI.
@@ -68,19 +67,8 @@
    */
   public static ComponentUI createUI(JComponent component)
   {
-    if (instances == null)
-      instances = new HashMap();
-
-    Object o = instances.get(component);
-    MetalTreeUI instance;
-    if (o == null)
-      {
-	instance = new MetalTreeUI();
-	instances.put(component, instance);
-      }
-    else
-      instance = (MetalTreeUI) o;
-
+    if (instance == null)
+      instance = new MetalTreeUI();
     return instance;
   }
 }