Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 73690 invoked from network); 16 Jan 2007 14:11:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Jan 2007 14:11:57 -0000 Received: (qmail 74020 invoked by uid 500); 16 Jan 2007 14:12:04 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 73997 invoked by uid 500); 16 Jan 2007 14:12:04 -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 73988 invoked by uid 99); 16 Jan 2007 14:12:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jan 2007 06:12:03 -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; Tue, 16 Jan 2007 06:11:57 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8D0E91A981A; Tue, 16 Jan 2007 06:10:53 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r496695 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java test/api/java/common/javax/swing/plaf/basic/BasicFileChooserUITest.java Date: Tue, 16 Jan 2007 14:10:52 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070116141053.8D0E91A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Tue Jan 16 06:10:50 2007 New Revision: 496695 URL: http://svn.apache.org/viewvc?view=rev&rev=496695 Log: Applying patches from "[#HARMONY-2822] [classlib][swing] javax.swing.plaf.basic.BasicFileChooserUI.installDefaults(null) returns null while RI throws NPE". Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicFileChooserUITest.java Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java?view=diff&rev=496695&r1=496694&r2=496695 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicFileChooserUI.java Tue Jan 16 06:10:50 2007 @@ -524,6 +524,10 @@ } protected void installDefaults(final JFileChooser fc) { + if (fc == null) { + throw new NullPointerException(); + } + helpButtonMnemonic = UIManager.getInt("FileChooser.helpButtonMnemonic"); directoryOpenButtonMnemonic = UIManager.getInt("FileChooser.directoryOpenButtonMnemonic"); Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicFileChooserUITest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicFileChooserUITest.java?view=diff&rev=496695&r1=496694&r2=496695 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicFileChooserUITest.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicFileChooserUITest.java Tue Jan 16 06:10:50 2007 @@ -185,4 +185,17 @@ fail("NPE should not be thrown"); } } + + public void testInstallDefaults() { + try { + new BasicFileChooserUI(null) { + public void installDefaults(JFileChooser fc) { + super.installDefaults(fc); + } + }.installDefaults(null); + fail("NPE should be thrown"); + } catch (NullPointerException npe) { + // Passed + } + } }