Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 30600 invoked from network); 13 Mar 2007 14:34:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2007 14:34:39 -0000 Received: (qmail 11466 invoked by uid 500); 13 Mar 2007 14:34:48 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 11368 invoked by uid 500); 13 Mar 2007 14:34:47 -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 11359 invoked by uid 99); 13 Mar 2007 14:34:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 07:34:47 -0700 X-ASF-Spam-Status: No, hits=-99.5 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, 13 Mar 2007 07:34:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BB0ED1A9838; Tue, 13 Mar 2007 07:34:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517707 - in /harmony/enhanced/classlib/trunk/modules/swing/src: main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java Date: Tue, 13 Mar 2007 14:34:18 -0000 To: commits@harmony.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070313143418.BB0ED1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Tue Mar 13 07:34:17 2007 New Revision: 517707 URL: http://svn.apache.org/viewvc?view=rev&rev=517707 Log: Patch for HARMONY-1804 "[classlib][swing] javax.swing.plaf.basic.BasicTabbedPaneUI.paint(Graphics g, JComponent c) does not throw NullPointerException when g is null while RI does" Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java?view=diff&rev=517707&r1=517706&r2=517707 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicTabbedPaneUI.java Tue Mar 13 07:34:17 2007 @@ -1297,6 +1297,10 @@ } public void paint(final Graphics g, final JComponent c) { + if (g == null) { + throw new NullPointerException(); + } + if (tabPane.getTabCount() == 0) { return; } Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java?view=diff&rev=517707&r1=517706&r2=517707 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java (original) +++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java Tue Mar 13 07:34:17 2007 @@ -34,6 +34,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JTabbedPane; +import javax.swing.JToolBar; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.UIManager; @@ -543,7 +544,14 @@ } public void testPaintGraphicsJComponent() { - // Note: painting code, cannot test + BasicTabbedPaneUI localBasicTabbedPaneUI = new BasicTabbedPaneUI(); + localBasicTabbedPaneUI.installUI(new JTabbedPane()); + try { + localBasicTabbedPaneUI.paint(null, new JToolBar()); + fail("NPE is not thrown"); + } catch (NullPointerException e) { + // PASSED + } } public void testPaintContentBorder() {