1 files changed, 8 insertions, 24 deletions
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
index d6e50e12239..6984daeccbe 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
@@ -38,19 +38,16 @@ exception statement from your version. */
 
 package javax.swing.plaf.metal;
 
-import java.util.HashMap;
-
 import javax.swing.JComponent;
+import javax.swing.JTextField;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicTextFieldUI;
 
-public class MetalTextFieldUI
-  extends BasicTextFieldUI
+/**
+ * A UI delegate for the {@link JTextField} component.
+ */
+public class MetalTextFieldUI extends BasicTextFieldUI
 {
-
-  /** The UI instances for MetalTextFieldUIs */
-  private static HashMap instances = null;
-
   /**
    * Constructs a new instance of MetalTextFieldUI.
    */
@@ -60,27 +57,14 @@ public class MetalTextFieldUI
   }
 
   /**
-   * Returns an instance of MetalTextFieldUI.
+   * Returns a new instance of <code>MetalTextFieldUI</code>.
    *
    * @param component the component for which we return an UI instance
    *
-   * @return an instance of MetalTextFieldUI
+   * @return A new instance of <code>MetalTextFieldUI</code>.
    */
   public static ComponentUI createUI(JComponent component)
   {
-    if (instances == null)
-      instances = new HashMap();
-
-    Object o = instances.get(component);
-    MetalTextFieldUI instance;
-    if (o == null)
-      {
-	instance = new MetalTextFieldUI();
-	instances.put(component, instance);
-      }
-    else
-      instance = (MetalTextFieldUI) o;
-
-    return instance;
+    return new MetalTextFieldUI();
   }
 }