--- /home/cpdev/src/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java	2005-07-02 21:04:08.000000000 +0000
+++ javax/swing/plaf/metal/MetalSplitPaneUI.java	2005-06-30 05:35:20.000000000 +0000
@@ -38,22 +38,17 @@
 
 package javax.swing.plaf.metal;
 
-import java.awt.Color;
-import java.util.HashMap;
-
 import javax.swing.JComponent;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicSplitPaneUI;
-import javax.swing.plaf.basic.BasicSplitPaneDivider;
 
 public class MetalSplitPaneUI
   extends BasicSplitPaneUI
 {
 
-  /** The UI instances for MetalSplitPaneUIs */
-  private static HashMap instances;
+  // FIXME: maybe replace by a Map of instances when this becomes stateful
+  /** The shared UI instance for MetalSplitPaneUIs */
+  private static MetalSplitPaneUI instance = null;
 
   /**
    * Constructs a new instance of MetalSplitPaneUI.
@@ -72,35 +67,8 @@
    */
   public static ComponentUI createUI(JComponent component)
   {
-    if (instances == null)
-      instances = new HashMap();
-
-    Object o = instances.get(component);
-    MetalSplitPaneUI instance;
-    if (o == null)
-      {
-	instance = new MetalSplitPaneUI();
-	instances.put(component, instance);
-      }
-    else
-      instance = (MetalSplitPaneUI) o;
-
+    if (instance == null)
+      instance = new MetalSplitPaneUI();
     return instance;
   }
-
-  /**
-   * Returns the divider that is used by the <code>JSplitPane</code>.
-   *
-   * The divider returned by this method is a {@link BasicSplitPaneDivider}
-   * that is drawn using the Metal look.
-   *
-   * @return the default divider to use for <code>JSplitPane</code>s. 
-   */
-  public BasicSplitPaneDivider createDefaultDivider()
-  {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    Color light = defaults.getColor("SplitPane.highlight");
-    Color dark = defaults.getColor("SplitPane.darkShadow");
-    return new MetalSplitPaneDivider(this, light, dark);
-  }
 }