diff options
Diffstat (limited to 'libjava/java/awt/geom')
| -rw-r--r-- | libjava/java/awt/geom/AffineTransform.java | 22 | ||||
| -rw-r--r-- | libjava/java/awt/geom/Dimension2D.java | 8 | ||||
| -rw-r--r-- | libjava/java/awt/geom/Point2D.java | 18 |
3 files changed, 35 insertions, 13 deletions
diff --git a/libjava/java/awt/geom/AffineTransform.java b/libjava/java/awt/geom/AffineTransform.java index 71208c0..3e9bb8a 100644 --- a/libjava/java/awt/geom/AffineTransform.java +++ b/libjava/java/awt/geom/AffineTransform.java @@ -20,16 +20,16 @@ import java.io.Serializable; public class AffineTransform implements Cloneable, Serializable { - static final int TYPE_IDENTITY = 0; - static final int TYPE_FLIP = 64; - static final int TYPE_GENERAL_ROTATION = 16; - static final int TYPE_GENERAL_SCALE = 4; - static final int TYPE_GENERAL_TRANSFORM = 32; - static final int TYPE_MASK_ROTATION = 24; - static final int TYPE_MASK_SCALE = 6; - static final int TYPE_QUADRANT_ROTATION = 8; - static final int TYPE_TRANSLATION = 1; - static final int TYPE_UNIFORM_SCALE = 2; + public static final int TYPE_IDENTITY = 0; + public static final int TYPE_FLIP = 64; + public static final int TYPE_GENERAL_ROTATION = 16; + public static final int TYPE_GENERAL_SCALE = 4; + public static final int TYPE_GENERAL_TRANSFORM = 32; + public static final int TYPE_MASK_ROTATION = 24; + public static final int TYPE_MASK_SCALE = 6; + public static final int TYPE_QUADRANT_ROTATION = 8; + public static final int TYPE_TRANSLATION = 1; + public static final int TYPE_UNIFORM_SCALE = 2; public AffineTransform () { @@ -300,7 +300,7 @@ public class AffineTransform implements Cloneable, Serializable this.type = 0; // FIXME } - public void concatentate (AffineTransform tx) + public void concatenate (AffineTransform tx) { double n00 = m00 * tx.m00 + m01 * tx.m10; double n01 = m00 * tx.m01 + m01 * tx.m11; diff --git a/libjava/java/awt/geom/Dimension2D.java b/libjava/java/awt/geom/Dimension2D.java index f891bf0..47bfb78 100644 --- a/libjava/java/awt/geom/Dimension2D.java +++ b/libjava/java/awt/geom/Dimension2D.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libjava. @@ -10,7 +10,7 @@ package java.awt.geom; /** * @author Per Bothner <bothner@cygnus.com> - * @date Fenruary, 1999. + * @date February, 1999. */ /* Written using online API docs for JDK 1.2 beta from http://www.javasoft.com. @@ -37,4 +37,8 @@ public abstract class Dimension2D implements Cloneable } catch (CloneNotSupportedException _) {return null;} } + + protected Dimension2D () + { + } } diff --git a/libjava/java/awt/geom/Point2D.java b/libjava/java/awt/geom/Point2D.java index 1e92adc..df631a4 100644 --- a/libjava/java/awt/geom/Point2D.java +++ b/libjava/java/awt/geom/Point2D.java @@ -26,6 +26,10 @@ public abstract class Point2D implements Cloneable public abstract void setLocation (double x, double y); + protected Point2D () + { + } + public void setLocation (Point2D pt) { setLocation(pt.getX(), pt.getY()); } static public double distanceSq (double X1, double Y1, double X2, double Y2) @@ -71,6 +75,14 @@ public abstract class Point2D implements Cloneable catch (CloneNotSupportedException _) {return null;} } + public boolean equals (Object o) + { + if (! (o instanceof Point2D)) + return false; + Point2D p = (Point2D) o; + return getX () == p.getX () && getY () == p.getY (); + } + public static class Double extends Point2D { public double x; @@ -143,6 +155,12 @@ public abstract class Point2D implements Cloneable this.y = (float) y; } + public void setLocation (float x, float y) + { + this.x = x; + this.y = y; + } + public String toString () { return "(" + x + ", " + y + ")"; |