Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 30010 invoked from network); 14 Jan 2007 10:19:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jan 2007 10:19:13 -0000 Received: (qmail 37995 invoked by uid 500); 14 Jan 2007 10:19:19 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 37896 invoked by uid 500); 14 Jan 2007 10:19:19 -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 37887 invoked by uid 99); 14 Jan 2007 10:19:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jan 2007 02:19:19 -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; Sun, 14 Jan 2007 02:19:12 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 6476E1A981A; Sun, 14 Jan 2007 02:18:10 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r496057 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/LookAndFeel.java test/api/java/common/javax/swing/LookAndFeelTest.java Date: Sun, 14 Jan 2007 10:18:10 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070114101810.6476E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Sun Jan 14 02:18:08 2007 New Revision: 496057 URL: http://svn.apache.org/viewvc?view=rev&rev=496057 Log: Applying patches from "[#HARMONY-2706] [classlib][swing] javax.swing.plaf.basic.BasicMenuBarUI.uninstallDefaults() throws unspecified NPE". I modified the test slightly to let junit handle the exceptions. Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/LookAndFeel.java harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/LookAndFeel.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/LookAndFeel.java?view=diff&rev=496057&r1=496056&r2=496057 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/LookAndFeel.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/LookAndFeel.java Sun Jan 14 02:18:08 2007 @@ -157,7 +157,7 @@ } public static void uninstallBorder(final JComponent comp) { - if (Utilities.isUIResource(comp.getBorder())) { + if (comp != null && Utilities.isUIResource(comp.getBorder())) { comp.setBorder(null); } } Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java?view=diff&rev=496057&r1=496056&r2=496057 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java Sun Jan 14 02:18:08 2007 @@ -156,7 +156,7 @@ assertEquals(UIManager.get("CheckBox.font"), label.getFont()); } - public void testInstallUninstallBorder() { + public void testInstallUninstallBorder() throws NullPointerException { lf = new MetalLookAndFeel(); JPanel p = new JPanel(); UIDefaults defaults = lf.getDefaults(); @@ -170,6 +170,16 @@ assertEquals(UIManager.get("Menu.border"), p.getBorder()); LookAndFeel.uninstallBorder(p); assertNull(p.getBorder()); + + BasicMenuBarUIExt m = + new BasicMenuBarUIExt(); + m.uninstallDefaults(); + } + + class BasicMenuBarUIExt extends javax.swing.plaf.basic.BasicMenuBarUI { + public void uninstallDefaults() { + super.uninstallDefaults(); + } } public void testLoadKeyBindings() {