2005-11-01 Roman Kennke <kennke@aicas.com>

	* javax/swing/plaf/metal/MetalScrollPaneUI.java
	(instance): Removed unnecessary field.
	(createUI): Always return a new instance instead of returning a
	shared instance.

2 files changed, 8 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index d2b536ae1..2c7634b9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-01  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/plaf/metal/MetalScrollPaneUI.java
+	(instance): Removed unnecessary field.
+	(createUI): Always return a new instance instead of returning a
+	shared instance.
+
 2005-11-01  Lillian Angel  <langel@redhat.com>
 
 	* java/awt/Window.java
diff --git a/javax/swing/plaf/metal/MetalScrollPaneUI.java b/javax/swing/plaf/metal/MetalScrollPaneUI.java
index 31fd19d26..d5bf175f9 100644
--- a/javax/swing/plaf/metal/MetalScrollPaneUI.java
+++ b/javax/swing/plaf/metal/MetalScrollPaneUI.java
@@ -49,11 +49,6 @@ import javax.swing.plaf.basic.BasicScrollPaneUI;
 public class MetalScrollPaneUI
   extends BasicScrollPaneUI
 {
-
-  // FIXME: maybe replace by a Map of instances when this becomes stateful
-  /** The shared UI instance for JScrollPanes. */
-  private static MetalScrollPaneUI instance = null;
-
   /**
    * Constructs a new instance of <code>MetalScrollPaneUI</code>.
    */
@@ -71,8 +66,6 @@ public class MetalScrollPaneUI
    */
   public static ComponentUI createUI(JComponent component)
   {
-    if (instance == null)
-      instance = new MetalScrollPaneUI();
-    return instance;
+    return new MetalScrollPaneUI();
   }
 }