Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 54121 invoked from network); 16 Oct 2006 13:23:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Oct 2006 13:23:31 -0000 Received: (qmail 8897 invoked by uid 500); 16 Oct 2006 13:23:31 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 8789 invoked by uid 500); 16 Oct 2006 13:23:30 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 8778 invoked by uid 99); 16 Oct 2006 13:23:30 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2006 06:23:30 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2006 06:23:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F17DB1A981A; Mon, 16 Oct 2006 06:23:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r464480 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src: main/java/common/java/awt/geom/ test/api/java/common/java/awt/geom/ Date: Mon, 16 Oct 2006 13:23:08 -0000 To: harmony-commits@incubator.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061016132308.F17DB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: hindessm Date: Mon Oct 16 06:23:07 2006 New Revision: 464480 URL: http://svn.apache.org/viewvc?view=rev&rev=464480 Log: Applied patch from "[#HARMONY-1585] [classlib][awt] Empty Arc, Ellipse and RoundRectangle have PathIterator which is differ from RI". Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java?view=diff&rev=464480&r1=464479&r2=464480 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Arc2D.java Mon Oct 16 06:23:07 2006 @@ -341,7 +341,7 @@ * @param at - the AffineTransform object to apply rectangle path */ Iterator(Arc2D a, AffineTransform t) { - if (a.isEmpty()) { + if (width < 0 || height < 0) { arcCount = 0; lineCount = 0; index = 1; Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java?view=diff&rev=464480&r1=464479&r2=464480 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/Ellipse2D.java Mon Oct 16 06:23:07 2006 @@ -203,7 +203,7 @@ this.width = e.getWidth(); this.height = e.getHeight(); this.t = t; - if (width <= 0.0 || height <= 0.0) { + if (width < 0.0 || height < 0.0) { index = 6; } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java?view=diff&rev=464480&r1=464479&r2=464480 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/geom/RoundRectangle2D.java Mon Oct 16 06:23:07 2006 @@ -288,7 +288,7 @@ this.aw = Math.min(width, rr.getArcWidth()); this.ah = Math.min(height, rr.getArcHeight()); this.t = at; - if (width <= 0.0 || height <= 0.0 || aw <= 0.0 || ah <= 0.0) { + if (width < 0.0 || height < 0.0 || aw < 0.0 || ah < 0.0) { index = points.length; } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java?view=diff&rev=464480&r1=464479&r2=464480 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java Mon Oct 16 06:23:07 2006 @@ -371,6 +371,13 @@ } } + public void testGetPathIteratorEmpty() { + // Regression test HARMONY-1585 + Arc2D a = new Arc2D.Double(); + PathIterator p = a.getPathIterator(null); + checkPathMove(p, true, 0, 0, 0.0); + } + public static void main(String[] args) { junit.textui.TestRunner.run(Arc2DTest.class); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java?view=diff&rev=464480&r1=464479&r2=464480 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java Mon Oct 16 06:23:07 2006 @@ -28,6 +28,18 @@ filterShape = createFilter("^(ellipse).*([.]shape)$", null); } + public void testGetPathIteratorEmpty() { + // Regression test HARMONY-1585 + Ellipse2D e = new Ellipse2D.Double(); + PathIterator p = e.getPathIterator(null); + checkPathMove(p, false, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathClose(p, true); + } + public static void main(String[] args) { junit.textui.TestRunner.run(Ellipse2DTest.class); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java?view=diff&rev=464480&r1=464479&r2=464480 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java Mon Oct 16 06:23:07 2006 @@ -52,6 +52,22 @@ assertEquals(6.0, r.getArcHeight(), 0.0); } + public void testGetPathIteratorEmpty() { + // Regression test HARMONY-1585 + RoundRectangle2D e = new RoundRectangle2D.Double(); + PathIterator p = e.getPathIterator(null); + checkPathMove(p, false, 0, 0, 0.0); + checkPathLine(p, false, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathLine(p, false, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathLine(p, false, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathLine(p, false, 0, 0, 0.0); + checkPathCubic(p, false, 0, 0, 0, 0, 0, 0, 0.0); + checkPathClose(p, true); + } + public static void main(String[] args) { junit.textui.TestRunner.run(RoundRectangle2DTest.class); }