You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@harmony.apache.org by ml...@apache.org on 2006/10/20 13:44:27 UTC

svn commit: r466075 - /incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java

Author: mloenko
Date: Fri Oct 20 04:44:25 2006
New Revision: 466075

URL: http://svn.apache.org/viewvc?view=rev&rev=466075
Log:
applied patch from HARMONY-1536
[classlib][swing] JOptionPane creates dialogs with double decorations if default look&feel is undecorated

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java?view=diff&rev=466075&r1=466074&r2=466075
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/JOptionPane.java Fri Oct 20 04:44:25 2006
@@ -632,6 +632,9 @@
     }
     
     private static void setDialogDecorations(final JDialog dialog, final int messageType) {
+        if (!JDialog.isDefaultLookAndFeelDecorated()) {
+            return;
+        }
         dialog.getRootPane().setWindowDecorationStyle(messageTypeToRootPaneDecoration(messageType));
     }
 }