Start of AWT merge with Classpath:

	* 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

1 files changed, 96 insertions, 31 deletions

diff --git a/libjava/java/awt/FlowLayout.java b/libjava/java/awt/FlowLayout.java
index d33059bf252..a377d302190 100644
--- a/libjava/java/awt/FlowLayout.java
+++ b/libjava/java/awt/FlowLayout.java
@@ -1,12 +1,30 @@
 // FlowLayout.java - Grid-based layout engine
 
-/* Copyright (C) 2000, 2001  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2002  Free Software Foundation
 
-   This file is part of libgcj.
+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. */
 
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
 
 package java.awt;
 
@@ -17,6 +35,9 @@ import java.io.Serializable;
  * without horizontal clipping, a new row is started.  This class
  * supports horizontal and vertical gaps.  These are used for spacing
  * between components.
+ *
+ * @author Tom Tromey <tromey@redhat.com>
+ * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public class FlowLayout implements LayoutManager, Serializable
 {
@@ -34,6 +55,9 @@ public class FlowLayout implements LayoutManager, Serializable
    * orientation.  */
   public static final int TRAILING = 4;
 
+  // Serialization constant
+  private static final long serialVersionUID = -7262534875583282631L;
+
   /** Add a new component to the layout.  This particular implementation
    * does nothing.
    */
@@ -42,42 +66,60 @@ public class FlowLayout implements LayoutManager, Serializable
     // Nothing.
   }
 
-  /** Return the alignment.  */
+  /**
+   * Returns the current justification value for this object.
+   *
+   * @return The current justification value for this object.
+   */
   public int getAlignment ()
   {
     return align;
   }
 
-  /** Return the horizontal gap.  */
+  /**
+   * Returns the horizontal gap between components.
+   *
+   * @return The horizontal gap between components.
+   */
   public int getHgap ()
   {
     return hgap;
   }
 
-  /** Return the vertical gap.  */
+  /**
+   * Returns the vertical gap between lines of components.
+   *
+   * @return The vertical gap between lines of components.
+   */
   public int getVgap ()
   {
     return vgap;
   }
 
-  /** Create a new FlowLayout with center alignment.
-   * Both gaps are set to 5.
+  /**
+   * Initializes a new instance of <code>FlowLayout</code> with a center
+   * justification and a default horizontal and vertical gap of 5.
    */
   public FlowLayout ()
   {
     this (CENTER, 5, 5);
   }
 
-  /** Create a new FlowLayout with the alignment.
-   * columns.  Both gaps are set to 5.
-   * @param align Alignment
+  /**
+   * Initializes a new instance of <code>FlowLayout</code> with the specified
+   * justification and a default horizontal and vertical gap of 5.
+   *
+   * @param align The justification setting, which should be one of the
+   * contants in this class.
    */
   public FlowLayout (int align)
   {
     this (align, 5, 5);
   }
 
-  /** Create a new FlowLayout with the specified alignment and gaps.
+  /**
+   * Initializes a new instance of <code>FlowLayout</code> with the specified
+   * justification and gap values
    * @param align Alignment
    * @param hgap The horizontal gap
    * @param vgap The vertical gap
@@ -118,13 +160,12 @@ public class FlowLayout implements LayoutManager, Serializable
 	boolean found_one = false;
 	for (j = i; j < num && ! found_one; ++j)
 	  {
-	    // FIXME: this is very inefficient.
-	    Dimension c = comps[i].getPreferredSize ();
-
 	    // Skip invisible items.
 	    if (! comps[i].visible)
 	      continue;
 
+	    Dimension c = comps[i].getPreferredSize ();
+
 	    int next_w = new_w + hgap + c.width;
 	    if (next_w <= d.width || ! found_one)
 	      {
@@ -157,10 +198,9 @@ public class FlowLayout implements LayoutManager, Serializable
 
 	for (int k = i; i < j; ++k)
 	  {
-	    // FIXME: this is very inefficient.
-	    Dimension c = comps[i].getPreferredSize ();
 	    if (comps[i].visible)
 	      {
+		Dimension c = comps[i].getPreferredSize ();
 		comps[i].setLocation (x, y);
 		x += c.width + vgap;
 	      }
@@ -172,16 +212,22 @@ public class FlowLayout implements LayoutManager, Serializable
       }
   }
 
-  /** Get the minimum layout size of the container.
+  /**
+   * Returns the minimum layout size for the specified container using
+   * this layout.
    * @param cont The parent container
+   * @return The minimum layout size.
    */
   public Dimension minimumLayoutSize (Container cont)
   {
     return getSize (cont, true);
   }
 
-  /** Get the preferred layout size of the container.
+  /**
+   * Returns the preferred layout size for the specified container using
+   * this layout.
    * @param cont The parent container
+   * @return The preferred layout size.
    */
   public Dimension preferredLayoutSize (Container cont)
   {
@@ -197,19 +243,24 @@ public class FlowLayout implements LayoutManager, Serializable
     // Nothing.
   }
 
-  /** Set the alignment.
-   * @param align The alignment
+  /**
+   * Sets the justification value for this object to the specified value.
+   *
+   * @param align The new justification value for this object, which must
+   * be one of the constants in this class.
    */
   public void setAlignment (int align)
   {
     if (align != LEFT && align != RIGHT && align != CENTER
 	&& align != LEADING && align != TRAILING)
-      throw new IllegalArgumentException ("invalid align: " + align);
+      throw new IllegalArgumentException ("invalid alignment: " + align);
     this.align = align;
   }
 
-  /** Set the horizontal gap
-   * @param hgap The horizontal gap
+  /**
+   * Sets the horizontal gap between components to the specified value.
+   *
+   * @param hgap The new horizontal gap between components.
    */
   public void setHgap (int hgap)
   {
@@ -218,8 +269,10 @@ public class FlowLayout implements LayoutManager, Serializable
     this.hgap = hgap;
   }
 
-  /** Set the vertical gap.
-   * @param vgap The vertical gap
+  /**
+   * Sets the vertical gap between lines of components to the specified value.
+   *
+   * @param vgap The new vertical gap.
    */
   public void setVgap (int vgap)
   {
@@ -228,7 +281,9 @@ public class FlowLayout implements LayoutManager, Serializable
     this.vgap = vgap;
   }
 
-  /** Return String description of this object.  */
+  /** Return String description of this object.
+   * @return A string representation of this object.
+   */
   public String toString ()
   {
     return ("[" + getClass ().getName () + ",hgap=" + hgap + ",vgap=" + vgap
@@ -270,9 +325,19 @@ public class FlowLayout implements LayoutManager, Serializable
     return new Dimension (w, h);
   }
 
-  // Alignment.
+  /**
+   * @serial The justification alignment of the lines of components, which
+   * will be one of the constants defined in this class.
+   */
   private int align;
-  // The gaps.
+
+  /**
+   * @serial The horizontal gap between components.
+   */
   private int hgap;
+
+  /**
+   * @serial The vertical gap between lines of components.
+   */
   private int vgap;
 }