From 4f9533c7722fa07511a94d005227961f4a4dec23 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Thu, 18 May 2006 17:29:21 +0000
Subject: Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.

From-SVN: r113887
---
 libjava/classpath/java/awt/geom/GeneralPath.java | 14 +++++++++++---
 libjava/classpath/java/awt/geom/Point2D.java     | 10 +++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'libjava/classpath/java/awt/geom')

diff --git a/libjava/classpath/java/awt/geom/GeneralPath.java b/libjava/classpath/java/awt/geom/GeneralPath.java
index 15fb8ab..123833b 100644
--- a/libjava/classpath/java/awt/geom/GeneralPath.java
+++ b/libjava/classpath/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;
diff --git a/libjava/classpath/java/awt/geom/Point2D.java b/libjava/classpath/java/awt/geom/Point2D.java
index 9f22a5a..a2689ab 100644
--- a/libjava/classpath/java/awt/geom/Point2D.java
+++ b/libjava/classpath/java/awt/geom/Point2D.java
@@ -1,5 +1,5 @@
 /* Point2D.java -- generic point in 2-D space
-   Copyright (C) 1999, 2000, 2002, 2004  Free Software Foundation
+   Copyright (C) 1999, 2000, 2002, 2004, 2006,  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -135,7 +135,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distanceSq(double x, double y)
   {
-    return distanceSq(getX(), x, getY(), y);
+    return distanceSq(getX(), getY(), x, y);
   }
 
   /**
@@ -147,7 +147,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distanceSq(Point2D p)
   {
-    return distanceSq(getX(), p.getX(), getY(), p.getY());
+    return distanceSq(getX(), getY(), p.getX(), p.getY());
   }
 
   /**
@@ -159,7 +159,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distance(double x, double y)
   {
-    return distance(getX(), x, getY(), y);
+    return distance(getX(), getY(), x, y);
   }
 
   /**
@@ -171,7 +171,7 @@ public abstract class Point2D implements Cloneable
    */
   public double distance(Point2D p)
   {
-    return distance(getX(), p.getX(), getY(), p.getY());
+    return distance(getX(), getY(), p.getX(), p.getY());
   }
 
   /**
-- 
cgit v1.1