diff options
author | Tom Tromey <tromey@redhat.com> | 2002-01-16 04:20:14 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2002-01-16 04:20:14 +0000 |
commit | 1c06809e1604a7a558c042e86a0719ed10910d4e (patch) | |
tree | 17c6f53120ddcdb875ab73471430dbddc7f31190 /java/awt/geom/Point2D.java | |
parent | 3dd52d4ee5052a80a09cc42a6bd69743c05d30e8 (diff) | |
download | classpath-1c06809e1604a7a558c042e86a0719ed10910d4e.tar.gz |
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(getGraphicsConfiguration): New method.
(setMask): Likewise.
Start of AWT merge with libgcj:
* java/awt/CardLayout.java: Merged with libgcj.
* java/awt/Rectangle.java: Merged with libgcj.
* java/awt/Frame.java (Frame): Use `super()'.
(setIconImage): Only notify peer if it exists.
(setResizable): Likewise.
(setTitle): Likewise.
(setMenuBar): Likewise.
(getState): New method from libgcj.
(Frame(GraphicsConfiguration)): Likewise.
(Frame(String,GraphicsConfiguration)): Likewise.
(addNotify): New implementation from libgcj.
(getFrames): New stub from libgcj.
* java/awt/Paint.java: New file from libgcj.
* java/awt/RenderingHints.java: New file from libgcj.
* java/awt/Graphics.java (drawRect(int,int,int,int)): New
implementation from libgcj.
(draw3DRect): New method from libgcj.
(drawBytes): Likewise.
(hitClip): Likewise.
(getClipBounds(Rectangle)): Likewise.
(fill3DRect): Implementation from libgcj.
* java/awt/image/DirectColorModel.java: Merged with libgcj.
* java/awt/Transparency.java: New file from libgcj.
* java/awt/image/ColorModel.java: Merged with libgcj.
* java/awt/geom/AffineTransform.java: New file from libgcj.
* java/awt/geom/Dimension2D.java: New file from libgcj.
* java/awt/geom/Ellipse2D.java: New file from libgcj.
* java/awt/geom/IllegalPathStateException.java: New file from libgcj.
* java/awt/geom/Line2D.java: New file from libgcj.
* java/awt/geom/NoninvertibleTransformException.java: New file
from libgcj.
* java/awt/geom/PathIterator.java: New file from libgcj.
* java/awt/geom/Point2D.java: New file from libgcj.
* java/awt/geom/Rectangle2D.java: New file from libgcj.
* java/awt/geom/Rectangle2D.java: New file from libgcj.
* java/awt/geom/RectanglularShape.java: New file from libgcj.
* java/awt/geom/RoundRectangle2D.java: New file from libgcj.
* java/awt/Graphics2D.java: New file from libgcj.
* java/awt/image/Raster.java: New file from libgcj.
* java/awt/image/ComponentColorModel.java: New file from libgcj.
* java/awt/image/BufferedImage.java: New file from libgcj.
* java/awt/image/DataBuffer.java: New file from libgcj.
* java/awt/image/DataBufferByte.java: New file from libgcj.
* java/awt/image/DataBufferInt.java: New file from libgcj.
* java/awt/image/DataBufferUShort.java: New file from libgcj.
* java/awt/image/WritableRaster.java: New file from libgcj.
* java/awt/image/ComponentSampleModel.java: New file from libgcj.
* java/awt/image/PackedColorModel.java: New file from libgcj.
* java/awt/image/RasterOp.java: New file from libgcj.
* java/awt/image/SampleModel.java: New file from libgcj.
* java/awt/image/SinglePixelPackedSampleModel.java: New file from
libgcj.
* java/awt/EventDispatcher.java: Removed.
* java/awt/EventDispatchThread.java: New file from libgcj.
* java/awt/Window.java: Merged with libgcj.
* java/awt/color/ColorSpace.java: New file from libgcj.
* java/awt/color/ICC_ColorSpace.java: Likewise.
* java/awt/color/ICC_Profile.java: Likewise.
* java/awt/AWTEventMulticaster.java: Merged with libgcj.
* java/awt/event/HierarchyListener.java: New file from libgcj.
* java/awt/event/HierarchyEvent.java: New file from libgcj.
* java/awt/event/HierarchyBoundsListener.java: New file from
libgcj.
* java/awt/event/HierarchyBoundsAdapter.java: New file from
libgcj.
* java/awt/peer/ComponentPeer.java (getGraphicsConfiguration): New
method.
(setEventMask): Likewise.
* java/awt/AWTEvent.java: Merged with libgcj.
* java/awt/Event.java: New file from libgcj.
* java/awt/GraphicsConfiguration.java: New file from libgcj.
* java/awt/Component.java: Merged with libgcj.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/ComponentOrientation.java: New file from libgcj.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
Diffstat (limited to 'java/awt/geom/Point2D.java')
-rw-r--r-- | java/awt/geom/Point2D.java | 186 |
1 files changed, 186 insertions, 0 deletions
diff --git a/java/awt/geom/Point2D.java b/java/awt/geom/Point2D.java new file mode 100644 index 000000000..12fd761b0 --- /dev/null +++ b/java/awt/geom/Point2D.java @@ -0,0 +1,186 @@ +/* Copyright (C) 1999, 2000, 2002 Free Software Foundation + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. */ + +package java.awt.geom; + +/** + * @author Per Bothner <bothner@cygnus.com> + * @date February 8, 1999. + */ + +/* Written using "Java Class Libraries", 2nd edition, plus online + * API docs for JDK 1.2 beta from http://www.javasoft.com. + * Status: Believed complete and correct, except that neither toString + * nor hashCode have been compared with JDK output. + */ + +public abstract class Point2D implements Cloneable +{ + public abstract double getX(); + public abstract double getY(); + + 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) + { + X2 -= X1; + Y2 -= Y1; + return X2*X2 + Y2*Y2; + } + + static public double distance (double X1, double Y1, double X2, double Y2) + { + return Math.sqrt(distance(X1, Y1, X2, Y2)); + } + + public double distanceSq (double PX, double PY) + { + return distanceSq (getX(), PX, getY(), PY); + } + + public double distance (double PX, double PY) + { + return distance (getX(), PX, getY(), PY); + } + + public double distanceSq (Point2D pt) + { + return distanceSq (getX(), pt.getX(), getY(), pt.getY()); + } + + public double distance (Point2D pt) + { + return distance (getX(), pt.getX(), getY(), pt.getY()); + } + + public int hashCode() { return (int) getX() ^ (int) getY(); } + + public Object clone() + { + try + { + return super.clone (); + } + 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; + public double y; + + public Double () + { + x = 0; + y = 0; + } + + public Double (double x, double y) + { + this.x = x; + this.y = y; + } + + public double getX () + { + return x; + } + + public double getY () + { + return y; + } + + public void setLocation (double x, double y) + { + this.x = x; + this.y = y; + } + + public String toString () + { + return "(" + x + ", " + y + ")"; + } + } + + public static class Float extends Point2D + { + public float x; + public float y; + + public Float () + { + x = 0; + y = 0; + } + + public Float (float x, float y) + { + this.x = x; + this.y = y; + } + + public double getX () + { + return x; + } + + public double getY () + { + return y; + } + + public void setLocation (double x, double y) + { + this.x = (float) x; + this.y = (float) y; + } + + public void setLocation (float x, float y) + { + this.x = x; + this.y = y; + } + + public String toString () + { + return "(" + x + ", " + y + ")"; + } + } +} |