Index: javax/swing/plaf/metal/MetalScrollPaneUI.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java,v retrieving revision 1.4 diff -u -r1.4 MetalScrollPaneUI.java --- javax/swing/plaf/metal/MetalScrollPaneUI.java 27 Oct 2005 09:50:58 -0000 1.4 +++ javax/swing/plaf/metal/MetalScrollPaneUI.java 1 Nov 2005 22:46:06 -0000 @@ -49,11 +49,6 @@ 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 MetalScrollPaneUI. */ @@ -71,8 +66,6 @@ */ public static ComponentUI createUI(JComponent component) { - if (instance == null) - instance = new MetalScrollPaneUI(); - return instance; + return new MetalScrollPaneUI(); } }