Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 25840 invoked from network); 13 Jan 2007 22:52:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Jan 2007 22:52:06 -0000 Received: (qmail 84332 invoked by uid 500); 13 Jan 2007 22:52:13 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 84312 invoked by uid 500); 13 Jan 2007 22:52:13 -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 84303 invoked by uid 99); 13 Jan 2007 22:52:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Jan 2007 14:52:13 -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; Sat, 13 Jan 2007 14:52:06 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 421F41A981D; Sat, 13 Jan 2007 14:51:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r495992 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/plaf/basic/BasicPopupMenuUI.java test/api/java/common/javax/swing/plaf/basic/BasicPopupMenuUITest.java Date: Sat, 13 Jan 2007 22:51:04 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070113225104.421F41A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Sat Jan 13 14:51:03 2007 New Revision: 495992 URL: http://svn.apache.org/viewvc?view=rev&rev=495992 Log: Applying patch from "[#HARMONY-2654] [classlib][swing] javax.swing.plaf.basic.BasicPopupMenuUI.installKeyboardActions() throws unspecified NPE". I fixed the stack overflow caused by the missing "super." in the test. Please test your tests! Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicPopupMenuUI.java harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPopupMenuUITest.java Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicPopupMenuUI.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicPopupMenuUI.java?view=diff&rev=495992&r1=495991&r2=495992 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicPopupMenuUI.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicPopupMenuUI.java Sat Jan 13 14:51:03 2007 @@ -56,6 +56,9 @@ } protected void installKeyboardActions() { + if (popupMenu == null) { + return; + } Utilities.installKeyboardActions(popupMenu, JComponent.WHEN_FOCUSED, PROPERTY_PREFIX + ".selectedWindowInputMapBindings", PROPERTY_PREFIX + ".selectedWindowInputMapBindings.RightToLeft"); Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPopupMenuUITest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPopupMenuUITest.java?view=diff&rev=495992&r1=495991&r2=495992 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPopupMenuUITest.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPopupMenuUITest.java Sat Jan 13 14:51:03 2007 @@ -176,4 +176,19 @@ assertEquals(0, menu.getPopupMenuListeners().length); } } + + /** + * Regression test for HARMONY-2654 + * */ + public void testInstallKeyboardActions() throws NullPointerException { + BasicPopupMenuUIForTest localBasicPopupMenuUI = new BasicPopupMenuUIForTest(); + localBasicPopupMenuUI.installKeyboardActions(); + } + + + class BasicPopupMenuUIForTest extends BasicPopupMenuUI { + public void installKeyboardActions () { + super.installKeyboardActions(); + } + } }