Here's a patch that's been lying around on my HD for a while now. IIRC, it makes some Intel testsuite tests pass.

2006-07-26  Roman Kennke  <[EMAIL PROTECTED]>

        * javax/swing/UIManager.java
        (getLookAndFeelDefaults): Return the look and feel defaults.
        (setLookAndFeel): Improved exception messsage.


/Roman
Index: javax/swing/UIManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/UIManager.java,v
retrieving revision 1.37
diff -u -1 -2 -r1.37 UIManager.java
--- javax/swing/UIManager.java	21 Jun 2006 13:43:45 -0000	1.37
+++ javax/swing/UIManager.java	26 Jul 2006 07:43:59 -0000
@@ -607,25 +607,25 @@
   {
     return currentLookAndFeel;
   }
 
   /**
    * Returns the <code>UIDefaults</code> table of the currently active
    * look and feel.
    * 
    * @return The [EMAIL PROTECTED] UIDefaults} for the current [EMAIL PROTECTED] LookAndFeel}.
    */
   public static UIDefaults getLookAndFeelDefaults()
   {
-    return currentUIDefaults;
+    return lookAndFeelDefaults;
   }
 
   /**
    * Returns a string from the defaults table.
    */
   public static String getString(Object key)
   {
     return (String) get(key);
   }
   
   /**
    * Returns a string from the defaults table.
@@ -705,25 +705,26 @@
    * 
    * @param newLookAndFeel  the new look and feel (<code>null</code> permitted).
    * 
    * @throws UnsupportedLookAndFeelException if the look and feel is not 
    *         supported on the current platform.
    * 
    * @see LookAndFeel#isSupportedLookAndFeel()
    */
   public static void setLookAndFeel(LookAndFeel newLookAndFeel)
     throws UnsupportedLookAndFeelException
   {
     if (newLookAndFeel != null && ! newLookAndFeel.isSupportedLookAndFeel())
-      throw new UnsupportedLookAndFeelException(newLookAndFeel.getName());
+      throw new UnsupportedLookAndFeelException(newLookAndFeel.getName()
+                                         + " not supported on this platform");
     LookAndFeel oldLookAndFeel = currentLookAndFeel;
     if (oldLookAndFeel != null)
       oldLookAndFeel.uninitialize();
 
     // Set the current default look and feel using a LookAndFeel object. 
     currentLookAndFeel = newLookAndFeel;
     if (newLookAndFeel != null)
       {
         newLookAndFeel.initialize();
         lookAndFeelDefaults = newLookAndFeel.getDefaults();
         if (currentUIDefaults == null)
           currentUIDefaults =

Reply via email to