Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 35111 invoked from network); 2 Feb 2007 14:34:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Feb 2007 14:34:41 -0000 Received: (qmail 93005 invoked by uid 500); 2 Feb 2007 14:34:34 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 92718 invoked by uid 500); 2 Feb 2007 14:34:33 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 92598 invoked by uid 99); 2 Feb 2007 14:34:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 06:34:32 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 06:34:23 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 088FC1A9820; Fri, 2 Feb 2007 06:34:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r502613 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/plaf/basic/BasicMenuUI.java test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java Date: Fri, 02 Feb 2007 14:34:02 -0000 To: commits@harmony.apache.org From: ayza@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070202143403.088FC1A9820@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ayza Date: Fri Feb 2 06:34:01 2007 New Revision: 502613 URL: http://svn.apache.org/viewvc?view=rev&rev=502613 Log: Committing patches from HARMONY-2663 ([classlib][swing] javax.swing.plaf.basic.BasicMenuUI is inconsistent with RI) Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuUI.java harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuUI.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuUI.java?view=diff&rev=502613&r1=502612&r2=502613 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuUI.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicMenuUI.java Fri Feb 2 06:34:01 2007 @@ -219,7 +219,7 @@ } protected MenuListener createMenuListener(final JComponent c) { - return (menuHandler == null) ? new MenuHandler() : menuHandler; + return menuHandler; } protected PropertyChangeListener createPropertyChangeListener(final JComponent c) { @@ -247,7 +247,7 @@ } public Dimension getMaximumSize(final JComponent c) { - if (!((JMenu)c).isTopLevelMenu()) { + if (!((JMenu) menuItem).isTopLevelMenu()) { return super.getMaximumSize(c); } Dimension result = c.getPreferredSize(); @@ -324,4 +324,4 @@ boolean isPaintArmed() { return menuItem.isArmed() || menuItem.isSelected(); } -} \ No newline at end of file +} Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java?view=diff&rev=502613&r1=502612&r2=502613 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java Fri Feb 2 06:34:01 2007 @@ -30,6 +30,7 @@ import javax.swing.ImageIcon; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.SwingTestCase; import javax.swing.SwingUtilities; import javax.swing.UIManager; @@ -77,6 +78,18 @@ menu1.setPreferredSize(new Dimension(1000, 1000)); assertEquals(1000, menuUI.getMaximumSize(menu1).width); assertEquals(Short.MAX_VALUE, menuUI.getMaximumSize(menu1).height); + testExceptionalCase(new NullPointerCase() { + @Override + public void exceptionalAction() throws Exception { + new BasicMenuUI().getMaximumSize(null); + } + }); + testExceptionalCase(new NullPointerCase() { + @Override // Regression for HARMONY-2663 + public void exceptionalAction() throws Exception { + new BasicMenuUI().getMaximumSize(new JOptionPane()); + } + }); } /* @@ -178,9 +191,7 @@ menuUI.menuItem = menu; menuUI.installListeners(); assertNull(menuUI.changeListener); - if (isHarmony()) { - assertNotNull(menuUI.menuListener); - } + assertNull(menuUI.menuListener); assertNotNull(menuUI.propertyChangeListener); assertNotNull(menuUI.mouseInputListener); if (!isHarmony()) { @@ -284,8 +295,9 @@ if (!isHarmony()) { return; } - assertNotNull(menuUI.createMenuListener(null)); - assertNotNull(menuUI.createMenuListener(new JMenu())); + // Updated for regression of HARMONY-2663 + assertNull(menuUI.createMenuListener(null)); + assertNull(menuUI.createMenuListener(new JMenu())); } /*