LayoutManager2.java: Merged with Classpath.

	* java/awt/LayoutManager2.java: Merged with Classpath.
	* java/awt/LayoutManager.java: Merged with Classpath.
	* java/awt/GridLayout.java: Updated copyright and javadoc.
	(getSize): Use `parent.ncomponents'.  Handle insets.
	(layoutContainer): Use `parent.ncomponents'.  Handle case where
	there are fewer children than columns.  Correctly compute size of
	each cell in the grid.  Handle case where there isn't enough
	space.
	* java/awt/CardLayout.java (tab): Renamed from `map'.  Updated
	all users.
	(gotoComponent): Use parent.ncomponents.  Ensure child exists
	before calling setVisible() on it.  Last item is `num - 1', not
	`num'.
	(layoutContainer): Hoist invariants out of loop.

From-SVN: r48898

1 files changed, 90 insertions, 13 deletions

diff --git a/libjava/java/awt/LayoutManager2.java b/libjava/java/awt/LayoutManager2.java
index a79d64e..3600ca3 100644
--- a/libjava/java/awt/LayoutManager2.java
+++ b/libjava/java/awt/LayoutManager2.java
@@ -1,20 +1,97 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* LayoutManager2.java -- Enhanced layout manager.
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
-   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;
 
-/* Status:  Believed complete and correct. */
+package java.awt;
 
+/**
+  * Layout manager for laying out containers based on contraints.
+  *
+  * @author Aaron M. Renn (arenn@urbanophile.com)
+  */
 public interface LayoutManager2 extends LayoutManager
 {
-  public void addLayoutComponent (Component comp, Object constraints);
-  public float getLayoutAlignmentX (Container target);
-  public float getLayoutAlignmentY (Container target);
-  public void invalidateLayout (Container target);
-  public Dimension maximumLayoutSize (Container target);
-}
+
+/**
+  * Adds the specified component to the layout, with the specified
+  * constraint object.
+  *
+  * @param component The component to add.
+  * @param constraint The constraint object.
+  */
+public abstract void
+addLayoutComponent(Component component, Object contraint);
+
+/*************************************************************************/
+
+/**
+  * Determines the minimum size of the specified target container.
+  *
+  * @param target The target container.
+  */
+public abstract Dimension
+maximumLayoutSize(Container target);
+
+/*************************************************************************/
+
+/**
+  * Returns the preferred X axis alignment for the specified target
+  * container.  This value will range from 0 to 1 where 0 is alignment 
+  * closest to the origin, 0.5 is centered, and 1 is aligned furthest 
+  * from the origin.
+  *
+  * @param target The target container.
+  */
+public abstract float
+getLayoutAlignmentX(Container target);
+
+/*************************************************************************/
+
+/**
+  * Returns the preferred Y axis alignment for the specified target
+  * container.  This value will range from 0 to 1 where 0 is alignment 
+  * closest to the origin, 0.5 is centered, and 1 is aligned furthest 
+  * from the origin.
+  *
+  * @param target The target container.
+  */
+public abstract float
+getLayoutAlignmentY(Container target);
+
+/*************************************************************************/
+
+/**
+  * Forces the layout manager to purge any cached information about
+  * the layout of the target container.  This will force it to be
+  * recalculated.
+  *
+  * @param target The target container.
+  */
+public abstract void
+invalidateLayout(Container target);
+
+} // interface LayoutManager2 
+