Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 96363 invoked from network); 13 Jan 2007 19:51:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Jan 2007 19:51:25 -0000 Received: (qmail 76737 invoked by uid 500); 13 Jan 2007 19:51:32 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 76705 invoked by uid 500); 13 Jan 2007 19:51:32 -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 76696 invoked by uid 99); 13 Jan 2007 19:51:32 -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 11:51: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; Sat, 13 Jan 2007 11:51:25 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 46E671A981A; Sat, 13 Jan 2007 11:50:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r495957 - 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: Sat, 13 Jan 2007 19:50:23 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070113195023.46E671A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Sat Jan 13 11:50:22 2007 New Revision: 495957 URL: http://svn.apache.org/viewvc?view=rev&rev=495957 Log: Applying patch from "[#HARMONY-2606] [classlib][swing][plaf] javax.swing.plaf.basic.BasicFileChooserUI.ensureFileIsVisible(..) throws unexpected 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=495957&r1=495956&r2=495957 ============================================================================== --- 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 Sat Jan 13 11:50:22 2007 @@ -613,6 +613,7 @@ } public void ensureFileIsVisible(final JFileChooser fc, final File f) { + fileChooser = fc; fileChooser.ensureFileIsVisible(f); } 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=495957&r1=495956&r2=495957 ============================================================================== --- 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 Sat Jan 13 11:50:22 2007 @@ -164,4 +164,14 @@ ui.installUI(fc); assertNull(ui.getPreferredSize(fc)); } + + public void testEnsureFileIsVisible() { + try { + BasicFileChooserUI fc = new BasicFileChooserUI(null); + fc.ensureFileIsVisible(new JFileChooser(), new File("a")); + // PASSED + } catch (NullPointerException npe) { + fail("NPE should not be thrown"); + } + } }