[cp-patches] FYI: Always call MetalLookAndFeel.createDefaultTheme()

[Mark Wielaard]

Hi,

The KunstoffLookAndFeel (as used by myPod) depends on
createDefaultTheme() always being called since it overrides it to set
the theme. So this patch makes it so.

2006-01-03  Mark Wielaard  <address@hidden>

   * javax/swing/plaf/metal/MetalLookAndFeel.java (MetalLookAndFeel):
   Always call createDefaultTheme().
   (createDefaultTheme): Check whether theme is still null.

Committed,

Mark

Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: 
/sources/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.74
diff -u -r1.74 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java        3 Jan 2006 21:07:46 
-0000       1.74
+++ javax/swing/plaf/metal/MetalLookAndFeel.java        3 Jan 2006 22:46:54 
-0000
@@ -81,8 +81,7 @@
    */
   public MetalLookAndFeel()
   {
-    if (theme == null)
-      createDefaultTheme();
+    createDefaultTheme();
   }
 
   /**
@@ -90,7 +89,8 @@
    */
   protected void createDefaultTheme()
   {
-    setCurrentTheme(new DefaultMetalTheme());
+    if (theme == null)
+      setCurrentTheme(new DefaultMetalTheme());
   }
 
   /**

signature.asc
Description: This is a digitally signed message part