mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-22 18:39:54 +08:00
3bd483f2a1
* Makefile.in: Rebuilt. * Makefile.am (awt_java_source_files): Reference files in gnu/java/awt, not gnu/gcj/awt. * java/awt/image/BufferedImage.java: Updated copyright. * java/awt/image/ComponentColorModel.java: Updated copyright. * java/awt/image/ComponentSampleModel.java: Updated copyright. * java/awt/image/DataBuffer.java: Updated copyright. * java/awt/image/DataBufferByte.java: Updated copyright. * java/awt/image/DataBufferInt.java: Updated copyright. * java/awt/image/DataBufferUShort.java: Updated copyright. * java/awt/image/IndexColorModel.java: Updated copyright. * java/awt/image/PackedColorModel.java: Updated copyright. * java/awt/image/Raster.java: Updated copyright. * java/awt/image/RasterOp.java: Updated copyright. * java/awt/image/SampleModel.java: Updated copyright. * java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright. * java/awt/image/WritableRaster.java: Updated copyright. * java/awt/color/ColorSpace.java: Updated copyright. * java/awt/color/ICC_ColorSpace.java: Updated copyright * java/awt/color/ICC_Profile.java: Updated copyright. * java/awt/event/HierarchyBoundsAdapter.java: Updated copyright. * java/awt/event/HierarchyBoundsListener.java: Updated copyright. * java/awt/event/HierarchyEvent.java: Updated copyright. * java/awt/event/HierarchyListener.java: Updated copyright. * java/awt/geom/AffineTransform.java: Updated copyright. * java/awt/geom/Dimension2D.java: Updated copyright. * java/awt/geom/Ellipse2D.java: Updated copyright. * java/awt/geom/IllegalPathStateException.java: Updated copyright. * java/awt/geom/Line2D.java: Updated copyright. * java/awt/geom/NoninvertibleTransformException.java: Updated copyright. * java/awt/geom/PathIterator.java: Updated copyright. * java/awt/geom/Point2D.java: Updated copyright. * java/awt/geom/Rectangle2D.java: Updated copyright. * java/awt/geom/RectangularShape.java: Updated copyright. * java/awt/geom/RoundRectangle2D.java: Updated copyright. * java/awt/Toolkit.java: Updated import for file moves. * java/awt/Rectangle.java: Updated copyright; added javadoc from Classpath. (hashCode): New method from Classpath. * java/awt/Graphics2D.java: Updated copyright. * java/awt/Transparency.java: Updated copyright. * java/awt/Paint.java: Updated copyright. * java/awt/Graphics.java: New version from Classpath. * java/awt/EventDispatchThread.java: Updated copyright. * java/awt/CardLayout.java (layoutContainer): Don't skip invisible children. (gotoComponent): Wrap around on next/previous. * gnu/gcj/awt/BitMaskExtent.java: Removed. * gnu/gcj/awt/Buffers.java: Removed. * gnu/gcj/awt/ComponentDataBlitOp.java: Removed. * gnu/gcj/awt/GLightweightPeer.java: Removed. * gnu/java/awt/BitMaskExtent.java: Added. * gnu/java/awt/Buffers.java: Added. * gnu/java/awt/ComponentDataBlitOp.java: Added. * gnu/java/awt/GLightweightPeer.java: Added. * java/awt/geom/Line2D.java (clone): Ignore CloneNotSupportedException. * gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method. * java/awt/Frame.java: Merged with Classpath. * java/awt/RenderingHints.java: Copyright update. * java/awt/Paint.java: Copyright update. * java/awt/image/DirectColorModel.java: Merged with Classpath. * java/awt/image/ColorModel.java: Merged with Classpath. * java/awt/Window.java (show): New Implementation from Classpath. (isShowing): Use super.isShowing(). * java/awt/EventQueue.java: Merged with Classpath. * java/awt/AWTEventMulticaster.java (save): Throw RuntimeException. (saveInternal): Likewise. * java/awt/AWTEvent.java: Now implements Serializable. * java/awt/Event.java: Copyright update. * java/awt/peer/ComponentPeer.java: Merged with Classpath. * java/awt/image/BufferedImage.java: Copyright update. * java/awt/GraphicsConfiguration.java: Copyright update. * java/awt/Component.java: (addNotify): Don't call addNotifyContainerChildren(). (addNotifyContainerChildren): Removed. (setPeer): New method from Classpath. (setTreeLock): Likewise. (setVisible): Rewrote. (show): Use it. (hide): Likewise. (validate): Set `valid'. (checkImage(Image,ImageObserver)): Implementation from Classpath. (createImage(ImageProducer)): Likewise. (prepareImage): Likewise. * 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/ComponentOrientation.java: Updated copyright. Added @author. * 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/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. From-SVN: r48896
187 lines
3.9 KiB
Java
187 lines
3.9 KiB
Java
/* 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 + ")";
|
|
}
|
|
}
|
|
}
|