mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-19 03:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.in: Rebuilt.

Browse Source 
* Makefile.in: Rebuilt.
	* Makefile.am (awt_java_source_files): Added new file.
	* java/awt/GridLayout.java: New file.

From-SVN: r37967
This commit is contained in:
Tom Tromey 2000-12-03 07:16:20 +00:00 committed by Tom Tromey
parent cf466d6976
commit 8538fd010e
4 changed files with 287 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2000-12-03 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Added new file.
* java/awt/GridLayout.java: New file.
2000-12-02 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.

1
libjava/Makefile.am
View File

@ -591,6 +591,7 @@ java/awt/Frame.java \
java/awt/Graphics.java \
java/awt/Graphics2D.java \
java/awt/GraphicsConfiguration.java \
java/awt/GridLayout.java \
java/awt/IllegalComponentStateException.java \
java/awt/Image.java \
java/awt/Insets.java \

18
libjava/Makefile.in
View File

@ -362,6 +362,7 @@ java/awt/Frame.java \
java/awt/Graphics.java \
java/awt/Graphics2D.java \
java/awt/GraphicsConfiguration.java \
java/awt/GridLayout.java \
java/awt/IllegalComponentStateException.java \
java/awt/Image.java \
java/awt/Insets.java \
@ -712,6 +713,7 @@ java/util/EventListener.java \
java/util/EventObject.java \
java/util/GregorianCalendar.java \
java/util/HashMap.java \
java/util/HashSet.java \
java/util/Hashtable.java \
java/util/Iterator.java \
java/util/LinkedList.java \
@ -739,6 +741,8 @@ java/util/TimeZone.java \
java/util/Timer.java \
java/util/TimerTask.java \
java/util/TooManyListenersException.java \
java/util/TreeMap.java \
java/util/TreeSet.java \
java/util/Vector.java
@ -1326,6 +1330,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/awt/Font.P .deps/java/awt/FontMetrics.P \
.deps/java/awt/Frame.P .deps/java/awt/Graphics.P \
.deps/java/awt/Graphics2D.P .deps/java/awt/GraphicsConfiguration.P \
.deps/java/awt/GridLayout.P \
.deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \
.deps/java/awt/Insets.P .deps/java/awt/ItemSelectable.P \
.deps/java/awt/Label.P .deps/java/awt/LayoutManager.P \
@ -1682,11 +1687,11 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/util/EmptyStackException.P .deps/java/util/Enumeration.P \
.deps/java/util/EventListener.P .deps/java/util/EventObject.P \
.deps/java/util/GregorianCalendar.P .deps/java/util/HashMap.P \
.deps/java/util/Hashtable.P .deps/java/util/Iterator.P \
.deps/java/util/LinkedList.P .deps/java/util/List.P \
.deps/java/util/ListIterator.P .deps/java/util/ListResourceBundle.P \
.deps/java/util/Locale.P .deps/java/util/Map.P \
.deps/java/util/MissingResourceException.P \
.deps/java/util/HashSet.P .deps/java/util/Hashtable.P \
.deps/java/util/Iterator.P .deps/java/util/LinkedList.P \
.deps/java/util/List.P .deps/java/util/ListIterator.P \
.deps/java/util/ListResourceBundle.P .deps/java/util/Locale.P \
.deps/java/util/Map.P .deps/java/util/MissingResourceException.P \
.deps/java/util/NoSuchElementException.P .deps/java/util/Observable.P \
.deps/java/util/Observer.P .deps/java/util/Properties.P \
.deps/java/util/PropertyPermission.P \
@ -1696,7 +1701,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/util/SortedSet.P .deps/java/util/Stack.P \
.deps/java/util/StringTokenizer.P .deps/java/util/TimeZone.P \
.deps/java/util/Timer.P .deps/java/util/TimerTask.P \
.deps/java/util/TooManyListenersException.P .deps/java/util/Vector.P \
.deps/java/util/TooManyListenersException.P .deps/java/util/TreeMap.P \
.deps/java/util/TreeSet.P .deps/java/util/Vector.P \
.deps/java/util/jar/Attributes.P .deps/java/util/jar/JarEntry.P \
.deps/java/util/jar/JarException.P .deps/java/util/jar/JarFile.P \
.deps/java/util/jar/JarInputStream.P \

268
libjava/java/awt/GridLayout.java Normal file
View File

@ -0,0 +1,268 @@
// GridLayout.java - Grid-based layout engine
/* Copyright (C) 2000 Free Software Foundation
This file is part of libgcj.
This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
package java.awt;
import java.io.Serializable;
/** This class implements a grid-based layout scheme. Components are
* all given the same size and are laid out from left to right and top
* to bottom. A GridLayout is configured with a number of rows and a
* number of columns. If either is zero then that dimension is
* computed based on the actual size of the container. An exception
* is thrown if an attempt is made to set both the number of rows and
* the number of columns to 0. This class also support horizontal and
* vertical gaps; these are used as spacing between cells.
*/
public class GridLayout implements LayoutManager, Serializable
{
/** Add a new component to the layout. This particular implementation
* does nothing.
*/
public void addLayoutComponent (String name, Component comp)
{
// Nothing.
}
/** Return the number of columns in this layout. */
public int getColumns ()
{
return cols;
}
/** Return the horizontal gap. */
public int getHgap ()
{
return hgap;
}
/** Return the number of rows in this layout. */
public int getRows ()
{
return rows;
}
/** Return the vertical gap. */
public int getVgap ()
{
return vgap;
}
/** Create a new GridLayout with one row and any number of columns.
* Both gaps are set to 0.
*/
public GridLayout ()
{
this (1, 0, 0, 0);
}
/** Create a new GridLayout with the specified number of rows and
* columns. Both gaps are set to 0.
* @param rows Number of rows
* @param cols Number of columns
* @exception IllegalArgumentException If rows and columns are both
* 0, or if either are negative
*/
public GridLayout (int rows, int cols)
{
this (rows, cols, 0, 0);
}
/** Create a new GridLayout with the specified number of rows and
* columns and the specified gaps.
* @param rows Number of rows
* @param cols Number of columns
* @param hgap The horizontal gap
* @param vgap The vertical gap
* @exception IllegalArgumentException If rows and columns are both
* 0, if either are negative, or if either gap is negative
*/
public GridLayout (int rows, int cols, int hgap, int vgap)
{
if (rows < 0)
throw new IllegalArgumentException ("number of rows cannot be negative");
if (cols < 0)
throw new IllegalArgumentException ("number of columns cannot be negative");
if (rows == 0 && cols == 0)
throw new IllegalArgumentException ("both rows and columns cannot be 0");
if (hgap < 0)
throw new IllegalArgumentException ("horizontal gap must be nonnegative");
if (vgap < 0)
throw new IllegalArgumentException ("vertical gap must be nonnegative");
this.rows = rows;
this.cols = cols;
this.hgap = hgap;
this.vgap = vgap;
}
/** Lay out the container's components based on current settings.
* @param parent The parent container
*/
public void layoutContainer (Container parent)
{
int num = parent.getComponentCount ();
// This is more efficient than calling getComponents().
Component[] comps = parent.component;
int real_rows = rows;
int real_cols = cols;
if (real_rows == 0)
real_rows = (num + real_cols - 1) / real_cols;
else
real_cols = (num + real_rows - 1) / real_rows;
Dimension d = parent.getSize ();
Insets ins = parent.getInsets ();
int tw = d.width - ins.left - ins.right;
int th = d.height - ins.top - ins.bottom;
int w = (tw - (real_rows - 1) * hgap) / real_rows;
int h = (th - (real_cols - 1) * vgap) / real_cols;
int x = ins.left;
int y = ins.top;
int i = 0;
int recount = 0;
while (i < num)
{
comps[i].setBounds (x, y, tw, th);
++i;
++recount;
if (recount == real_cols)
{
recount = 0;
y += vgap + th;
x = ins.left;
}
else
x += hgap + tw;
}
}
/** Get the minimum layout size of the container.
* @param cont The parent container
*/
public Dimension minimumLayoutSize (Container cont)
{
return getSize (cont, true);
}
/** Get the preferred layout size of the container.
* @param cont The parent container
*/
public Dimension preferredLayoutSize (Container cont)
{
return getSize (cont, false);
}
/** Remove the indicated component from this layout manager.
* This particular implementation does nothing.
* @param comp The component to remove
*/
public void removeLayoutComponent (Component comp)
{
// Nothing.
}
/** Set the number of columns.
* @param newCols
* @exception IllegalArgumentException If the number of columns is
* negative, or if the number of columns is zero and the number
* of rows is already 0.
*/
public void setColumns (int newCols)
{
if (cols < 0)
throw new IllegalArgumentException ("number of columns cannot be negative");
if (newCols == 0 && rows == 0)
throw new IllegalArgumentException ("number of rows is already 0");
this.cols = newCols;
}
/** Set the horizontal gap
* @param hgap The horizontal gap
*/
public void setHgap (int hgap)
{
if (hgap < 0)
throw new IllegalArgumentException ("horizontal gap must be nonnegative");
this.hgap = hgap;
}
/** Set the number of rows
* @param newRows
* @exception IllegalArgumentException If the number of rows is
* negative, or if the number of rows is zero and the number
* of columns is already 0.
*/
public void setRows (int newRows)
{
if (rows < 0)
throw new IllegalArgumentException ("number of rows cannot be negative");
if (newRows == 0 && cols == 0)
throw new IllegalArgumentException ("number of columns is already 0");
this.rows = newRows;
}
/** Set the vertical gap.
* @param vgap The vertical gap
*/
public void setVgap (int vgap)
{
if (vgap < 0)
throw new IllegalArgumentException ("vertical gap must be nonnegative");
this.vgap = vgap;
}
// This method is used to compute the various sizes.
private Dimension getSize (Container parent, boolean is_min)
{
int w = 0, h = 0, num = parent.getComponentCount ();
// This is more efficient than calling getComponents().
Component[] comps = parent.component;
for (int i = 0; i < num; ++i)
{
// FIXME: can we just directly read the fields in Component?
// Or will that not work with subclassing?
Dimension d;
if (is_min)
d = comps[i].getMinimumSize ();
else
d = comps[i].getPreferredSize ();
w = Math.max (d.width, w);
h = Math.max (d.height, h);
}
int real_rows = rows;
int real_cols = cols;
if (real_rows == 0)
real_rows = (num + real_cols - 1) / real_cols;
else
real_cols = (num + real_rows - 1) / real_rows;
// We subtract out an extra gap here because the gaps are only
// between cells.
return new Dimension (real_rows * (w + hgap) - hgap,
real_cols * (h + vgap) - vgap);
}
// The gaps.
private int hgap;
private int vgap;
// Number of rows and columns.
private int rows;
private int cols;
}