Patch: FYI: Dimension merge

[Tom Tromey <tromey at redhat dot com>]

I'm checking this in.

This merges Dimension with Classpath.
It also fixes the copyright info on Point.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* java/awt/Dimension.java: Updated copyright.  Added javadoc from
	Classpath.
	* java/awt/Point.java: Updated copyright.

Index: java/awt/Dimension.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Dimension.java,v
retrieving revision 1.4
diff -u -r1.4 Dimension.java
--- java/awt/Dimension.java 2000/12/26 00:25:12 1.4
+++ java/awt/Dimension.java 2002/01/16 23:08:26
@@ -1,17 +1,30 @@
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2002  Free Software Foundation
 
-   This file is part of libjava.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libjava License.  Please consult the file "LIBJAVA_LICENSE" for
-details.  */
+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;
 
-/**
- * @author Per Bothner <bothner@cygnus.com>
- * @date Fenruary 8, 1999.
- */
+package java.awt;
 
 /* Written using "Java Class Libraries", 2nd edition, plus online
  * API docs for JDK 1.2 beta from http://www.javasoft.com.
@@ -19,26 +32,72 @@
  * has not been compared with JDK output.
  */
 
+/**
+  * This class holds a width and height value pair.
+  *
+  * @author Per Bothner <bothner@cygnus.com>
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  * @date Fenruary 8, 1999.
+  */
 public class Dimension extends java.awt.geom.Dimension2D
   implements java.io.Serializable
 {
-  public int height;
+  /**
+   * This width of this object.
+   */
   public int width;
 
+  /**
+   * The height of this object.
+   */
+  public int height;
+
+  /**
+   * Initializes a new instance of <code>Dimension</code> with a width
+   * and height of zero.
+   */
   public Dimension () { }
 
+  /**
+   * Initializes a new instance of <code>Dimension</code> to have a width
+   * and height identical to that of the specified dimension object.
+   *
+   * @param dim The <code>Dimension</code> to take the width and height from.
+   */
   public Dimension (Dimension dim)
   {
     this.width = dim.width;
     this.height = dim.height;
   }
 
+  /**
+   * Initializes a new instance of <code>Dimension</code> with the
+   * specified width and height.
+   *
+   * @param width The width of this object.
+   * @param height The height of this object.
+   */
   public Dimension (int width, int height)
   {
     this.width = width;
     this.height = height;
   }
 
+  /**
+   * Tests this object for equality against the specified object.  This will
+   * be true if and only if the specified object:
+   * <p>
+   * <ul>
+   * <li>Is not <code>null</code>.
+   * <li>Is an instance of <code>Dimension</code>.
+   * <li>Has width and height values identical to this object.
+   * </ul>
+   *
+   * @param obj The object to test against.
+   *
+   * @return <code>true</code> if the specified object is equal to this
+   * object, <code>false</code> otherwise.
+   */
   public boolean equals (Object obj)
   {
     if (! (obj instanceof Dimension))
@@ -47,20 +106,43 @@
     return height == dim.height && width == dim.width;
   }
 
+  /**
+   * Returns the size of this object.  Not very useful.
+   *
+   * @return This object.
+   */
   public Dimension getSize () { return new Dimension(this); }
 
+  /**
+   * Sets the width and height of this object to match that of the
+   * specified object.
+   *
+   * @param dim The <code>Dimension</code> object to get the new width and
+   * height from.
+   */
   public void setSize (Dimension dim)
   {
     this.width = dim.width;
     this.height = dim.height;
   }
 
+  /**
+   * Sets the width and height of this object to the specified values.
+   *
+   * @param width The new width value.
+   * @param height The new height value.
+   */
   public void setSize (int width, int height)
   {
     this.width = width;
     this.height = height;
   }
 
+  /**
+   * Returns a string representation of this object.
+   *
+   * @return A string representation of this object.
+   */
   public String toString ()
   {
     return "Dimension[w:"+width+",h:"+height+']';
Index: java/awt/Point.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Point.java,v
retrieving revision 1.4
diff -u -r1.4 Point.java
--- java/awt/Point.java 2002/01/16 21:35:51 1.4
+++ java/awt/Point.java 2002/01/16 23:08:26
@@ -1,10 +1,28 @@
 /* Copyright (C) 1999, 2002  Free Software Foundation
 
-   This file is part of libjava.
+This file is part of GNU Classpath.
 
-This software is copyrighted work licensed under the terms of the
-Libjava License.  Please consult the file "LIBJAVA_LICENSE" for
-details.  */
+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;
 import java.awt.geom.Point2D;