Shape.java: Merged with Classpath.

	* java/awt/Shape.java: Merged with Classpath.
	* java/awt/Scrollbar.java: Merged with Classpath.

From-SVN: r49208

1 files changed, 54 insertions, 12 deletions

diff --git a/libjava/java/awt/Shape.java b/libjava/java/awt/Shape.java
index a5cc730..7f2fda0 100644
--- a/libjava/java/awt/Shape.java
+++ b/libjava/java/awt/Shape.java
@@ -1,33 +1,75 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Shape.java -- Interface for shape abstractions.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
-   This file is part of libjava.
+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.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
-This software is copyrighted work licensed under the terms of the
-Libjava License.  Please consult the file "LIBJAVA_LICENSE" for
-details.  */
 
 package java.awt;
-import java.awt.geom.*;
 
-/**
- * @author Per Bothner <bothner@cygnus.com>
- * @date February 8, 1999.
- */
+import java.awt.geom.*;
 
 /* Written using "Java Class Libraries", 2nd edition.
  * Status:  Believed complete and correct to JDK 1.2.
  */
 
+/**
+  * This interface represents an abstract shape.
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  * @author Per Bothner <bothner@cygnus.com>
+  */
 public interface Shape
 {
+
+/**
+  * Returns a <code>Rectange</code> that bounds the shape.
+  *
+  * @return A <code>Rectange</code> that bounds the shape.
+  */
+public abstract Rectangle
+getBounds();
+
   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);
-}
+
+} // interface Shape
+