diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-05-11 11:58:43 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-05-11 11:58:43 +0000 |
| commit | a9dc38185eb7b4eac9ef5f4544153e92c1623ffb (patch) | |
| tree | bd3c3521eb42efc6979ea7e0f6ff1b532bc8a7f7 | |
| parent | 2b9b3759704a3c84ee56ba77e0bd3cd5cd58e3ee (diff) | |
| download | classpath-a9dc38185eb7b4eac9ef5f4544153e92c1623ffb.tar.gz | |
2006-05-11 Mark Wielaard <mark@klomp.org>
* java/awt/geom/GeneralPath.java (WIND_EVEN_ODD, WIND_NON_ZERO):
Fully qualify PathIterator constants
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | java/awt/geom/GeneralPath.java | 14 |
2 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2006-05-11 Mark Wielaard <mark@klomp.org> + + * java/awt/geom/GeneralPath.java (WIND_EVEN_ODD, WIND_NON_ZERO): + Fully qualify PathIterator constants + 2006-05-10 Roman Kennke <kennke@aicas.com> PR classpath/27481 diff --git a/java/awt/geom/GeneralPath.java b/java/awt/geom/GeneralPath.java index 15fb8aba8..123833b11 100644 --- a/java/awt/geom/GeneralPath.java +++ b/java/awt/geom/GeneralPath.java @@ -1,5 +1,5 @@ /* GeneralPath.java -- represents a shape built from subpaths - Copyright (C) 2002, 2003, 2004 Free Software Foundation + Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation This file is part of GNU Classpath. @@ -79,8 +79,16 @@ import java.awt.Shape; */ public final class GeneralPath implements Shape, Cloneable { - public static final int WIND_EVEN_ODD = PathIterator.WIND_EVEN_ODD; - public static final int WIND_NON_ZERO = PathIterator.WIND_NON_ZERO; + // WORKAROUND for gcj 4.0.x (x < 3) + // fully qualify PathIterator constants. + + /** Same constant as {@link PathIterator#WIND_EVEN_ODD}. */ + public static final int WIND_EVEN_ODD + = java.awt.geom.PathIterator.WIND_EVEN_ODD; + + /** Same constant as {@link PathIterator.WIND_NON_ZERO}. */ + public static final int WIND_NON_ZERO + = java.awt.geom.PathIterator.WIND_NON_ZERO; /** Initial size if not specified. */ private static final int INIT_SIZE = 10; |