From 7b1c54e78d5e8067e1f8177ba83a698cb794ebb0 Mon Sep 17 00:00:00 2001 From: tromey Date: Sun, 23 Jul 2000 00:24:14 +0000 Subject: * Makefile.in: Rebuilt. * Makefile.am (awt_java_source_files): Updated for new files. * java/awt/Adjustable.java (HORIZONTAL, VERTICAL): Set values. * java/awt/Label.java: New file. * java/awt/Rectangle.java (Rectangle): Extend Rectangle2D. (createIntersection, createUnion, getBounds2D): New methods. * java/awt/Scrollbar.java: New file. * java/awt/Shape.java: Updated to 1.2. * java/awt/geom/AffineTransform.java: New file. * java/awt/geom/Ellipse2D.java: New file. * java/awt/geom/NoninvertibleTransformException.java: New file. * java/awt/geom/PathIterator.java: New file. * java/awt/geom/Rectangle2D.java: New file. * java/awt/geom/RectangularShape.java: New file. * java/awt/geom/Point2D.java (Double, Float): New inner classes. * java/awt/geom/IllegalPathStateException.java: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35195 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/awt/Shape.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'libjava/java/awt/Shape.java') diff --git a/libjava/java/awt/Shape.java b/libjava/java/awt/Shape.java index d0f0e0835da..a5cc730adab 100644 --- a/libjava/java/awt/Shape.java +++ b/libjava/java/awt/Shape.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libjava. @@ -7,17 +7,27 @@ Libjava License. Please consult the file "LIBJAVA_LICENSE" for details. */ package java.awt; +import java.awt.geom.*; /** * @author Per Bothner - * @date Fenruary 8, 1999. + * @date February 8, 1999. */ /* Written using "Java Class Libraries", 2nd edition. - * Status: Believed complete and correct. + * Status: Believed complete and correct to JDK 1.2. */ public interface Shape { + public boolean contains (double x, double y); + public boolean contains (double x, double y, double w, double h); + public boolean contains (Point2D p); + public boolean contains (Rectangle2D r); public Rectangle getBounds (); + public Rectangle2D getBounds2D (); + public PathIterator getPathIterator (AffineTransform at); + public PathIterator getPathIterator (AffineTransform at, double flatness); + public boolean intersects (double x, double y, double w, double h); + public boolean intersects (Rectangle2D r); } -- cgit v1.2.3