harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r496055 - in /harmony/enhanced/classlib/trunk/modules/swing: make/ src/main/java/common/javax/swing/plaf/basic/ src/test/api/java/common/javax/swing/plaf/basic/
Date Sun, 14 Jan 2007 10:03:37 GMT
Author: hindessm
Date: Sun Jan 14 02:03:36 2007
New Revision: 496055

URL: http://svn.apache.org/viewvc?view=rev&rev=496055
Log:
Applying patches from "[#HARMONY-2704] [classlib][swing]
javax.swing.plaf.basic.BasicMenuItemUI.uninstallUI(new JOptionPane())
throws unspecified NPE while RI throws ClassCastException".  I removed the
test from all exclude lists not just two as in the patch.

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuItemUI.java
    harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuItemUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.drl Sun Jan 14 02:03:36
2007
@@ -77,7 +77,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86.ibm Sun Jan 14 02:03:36
2007
@@ -77,7 +77,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.drl Sun Jan 14
02:03:36 2007
@@ -80,7 +80,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.linux.x86_64.ibm Sun Jan 14
02:03:36 2007
@@ -77,7 +77,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.drl Sun Jan 14
02:03:36 2007
@@ -81,7 +81,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86.ibm Sun Jan 14
02:03:36 2007
@@ -88,7 +88,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.drl Sun Jan
14 02:03:36 2007
@@ -77,7 +77,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/make/exclude.windows.x86_64.ibm Sun Jan
14 02:03:36 2007
@@ -77,7 +77,6 @@
 javax/swing/plaf/basic/BasicEditorPaneUITest.java
 javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
 javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
-javax/swing/plaf/basic/BasicMenuItemUITest.java
 javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
 javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
 javax/swing/plaf/basic/BasicRootPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuItemUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuItemUI.java?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuItemUI.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuItemUI.java
Sun Jan 14 02:03:36 2007
@@ -192,6 +192,9 @@
     }
 
     public void uninstallUI(final JComponent c) {
+        // Fix for HARMONY-2704, for compatibility with RI
+        JMenuItem jMenuItem = (JMenuItem) c;
+
         uninstallKeyboardActions();
         uninstallListeners();
         uninstallComponents(menuItem);

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuItemUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuItemUITest.java?view=diff&rev=496055&r1=496054&r2=496055
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuItemUITest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuItemUITest.java
Sun Jan 14 02:03:36 2007
@@ -34,6 +34,7 @@
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 import javax.swing.MenuElement;
 import javax.swing.MenuSelectionManager;
@@ -138,6 +139,13 @@
         assertNull(SwingUtilities.getUIActionMap(item));
         assertNull(menuItemUI.mouseInputListener);
         assertEquals(0, item.getComponentCount());
+
+        try { //Regression test for HARMONY-2704
+            menuItemUI.uninstallUI(new JOptionPane());
+            fail("ClassCastException should have been thrown");
+        } catch (ClassCastException e) {
+            // Expected
+        }
     }
 
     /*



Mime
View raw message