Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 87724 invoked from network); 23 Mar 2007 15:28:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Mar 2007 15:28:17 -0000 Received: (qmail 6952 invoked by uid 500); 23 Mar 2007 15:28:25 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 6927 invoked by uid 500); 23 Mar 2007 15:28:25 -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 6918 invoked by uid 99); 23 Mar 2007 15:28:25 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2007 08:28:25 -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; Fri, 23 Mar 2007 08:28:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B1DF61A9838; Fri, 23 Mar 2007 08:27:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r521764 - in /harmony/enhanced/classlib/trunk/modules/awt/src: main/java/common/java/awt/Container.java test/api/java/common/java/awt/ContainerRTest.java Date: Fri, 23 Mar 2007 15:27:56 -0000 To: commits@harmony.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070323152756.B1DF61A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Fri Mar 23 08:27:55 2007 New Revision: 521764 URL: http://svn.apache.org/viewvc?view=rev&rev=521764 Log: Patch for HARMONY-3443 "[classlib][awt][netbeans] Container.paint() throws NPE" Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java?view=diff&rev=521764&r1=521763&r2=521764 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java (original) +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Container.java Fri Mar 23 08:27:55 2007 @@ -989,7 +989,7 @@ private void paintComponentsImpl(Graphics g) { Shape clip; - if (g == null) { + if ((!isShowing()) || (g == null)) { return; } @@ -999,7 +999,7 @@ Component comp = children.get(i); if (comp.isLightweight() && comp.isVisible()) { - if (!clip.intersects(comp.getBounds())) { + if ((clip != null) && !clip.intersects(comp.getBounds())) { continue; } Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java?view=diff&rev=521764&r1=521763&r2=521764 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/ContainerRTest.java Fri Mar 23 08:27:55 2007 @@ -17,6 +17,9 @@ package java.awt; +import javax.swing.DebugGraphics; +import javax.swing.JButton; + import junit.framework.TestCase; @@ -63,6 +66,28 @@ // Regression test for HARMONY-2527 final Component c = new Frame(); c.paint(c.getGraphics()); + // End of regression for HARMONY-2527 + + // Regression for HARMONY-3443 + final Graphics g; + final Frame f = new Frame(); + + f.add(new JButton()); + f.setVisible(true); + g = f.getGraphics(); + + try { + g.setClip(null); + assertNull(g.getClip()); + f.paint(g); + } finally { + f.dispose(); + } + // End of regression for HARMONY-3443 + + // Regression for HARMONY-3430 + new Container().paint(new DebugGraphics()); + // End of regression for HARMONY-3430 } public void testAddComponent() {