86881a7b54
2004-03-12 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes. * javax/swing/JComponent.java (paint): Use persistent double buffer. * javax/swing/JList.java (ListListener): Revalidate on changes. * javax/swing/JScrollPane.java: Reimplement. * javax/swing/JViewport.java: Reimplement. * javax/swing/ScrollPaneLayout.java: Reimplement. * javax/swing/ViewportLayout.java: Tidy up. * javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns. * javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement. * javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels. * javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of backing store only. 2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (window_wm_protocols_filter): New function. (window_focus_in_cb): Remove function. (window_focus_out_cb): Likewise. (window_focus_or_active_state_change_cb): New function. (create): Add filter that removes WM_TAKE_FOCUS client messages. (connectSignals): Don't attach handlers to focus-in-event or focus-out-event signals. Handle notify signal. 2004-03-11 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java (gtkSetLabel): New native method declaration. (setLabel): Use gtkSetLabel. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method. 2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to black when color argument is null. 2004-03-10 Kim Ho <kho@redhat.com> * java/awt/Container.java: Remove check for drag events. 2004-03-10 Kim Ho <kho@redhat.com> * java/awt/Container.java: (visitChild): Remove candidate clip. Use the component clip to intersect. * gnu/java/awt/peer/gtk/GtkComponentPeer.java: (handleEvent): Use the PaintEvent's clip. 2004-03-10 Kim Ho <kho@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java: (handleEvent): Don't set the clip for the Graphics object. 2004-03-09 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c: Fix double <-> fixed macros, reset font transform. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Likewise. 2004-03-09�� Kim Ho <kho@redhat.com> * java/awt/Container.java: (visitChild): Move the x and y coordinate of the component rectangle to correct position. (handleEvent): Forward drag events to the pressed component. * javax/swing/plaf/basic/BasicScrollBarUI.java: Fix comments. (ArrowButtonListener::mousePressed): Stop the existing timer. (mouseDragged): Implement. (TrackListener::mousePressed): Only react if the press doesn't occur on the thumb, otherwise just set the offset. (TrackListener::mouseReleased): Unset the isAdjusting value. (createIncreaseIcon): Switch icon. (createDecreaseIcon): Switch icon. (calculatePreferredSize): Use width. (getThumbBounds): Use the top as the lower value. (layoutVScrollBar): Switch the button locations. (paintIncreaseHighlight): Paint correct side of thumb. (paintDecreaseHighlight): ditto. (valueForYPosition): Use top as the lower value. * javax/swing/plaf/basic/BasicSliderUI.java: Fix comments. (mouseDragged): Implement. (mousePressed): Only react when the thumb isn't pressed, otherwise just set offset. (mouseReleased): Handle a release of the thumb. (scrollDueToClickInTrack): Stop the timer first. * javax/swing/JProgressBar.java: (setString): Fix change condition. * javax/swing/JSeparator.java: Remove println's. 2004-03-08 David Jee <djee@redhat.com> * java/awt/image/AffineTransformOp.java: (filter): Use Graphics2D interface instead of directly using the GdkGraphics2D peer. 2004-03-05 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkButtonPeer.java (handleEvent): Action events are generated upon MOUSE_RELEASED. * java/awt/Container.java (acquireComponentForMouseEvent): Fixed. (handleEvent): Fixed. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (state_to_awt_mods_with_button_states): New method. (pre_event_handler): Fixed mouse event generation. 2004-03-05 Olga Rodimina <rodimina@redhat.com> gnu/java/awt/peer/gtk/GdkGraphics2D.java (GdkGraphics2D (BufferedImage)): Initialize pixmap associated with specified BufferedImage. (setPaint): Changed implementation of Texture Paint to use AffineTransformOp. * java/awt/image/AffineTransformOp.java (createCompatibleDestRaster): Throw RasterFormatException if resulting width or height of raster is 0. 2004-03-04 Olga Rodimina <rodimina@redhat.com> * java/awt/image/AffineTransformOp.java: Removed unnecessary field interpolationType. Formatted some of the lines to be consistent with the GNU style. (AffineTransformOp): Create new RenderingHints containing specified interpolation type. (createCompatibleDestImage): Implemented. (createCompatibleDestRaster): Implemented. (filter): Implemented. (getBounds2D(BufferedImage)): Implemented. (getBounds2D(Raster)): Implemented. (getInterpolationType): Get interpolation value from rendering hints. 2004-03-04 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setFont): Check if child peers are null. 2004-03-04 Graydon Hoare <graydon@redhat.com> * testsuite/lib/libjava.exp (libjava_find_lib): Don't include .libs in -L option. (libjava_arguments): Add new libraries to argument list. 2004-03-04 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. * Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la, lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la. (misc_java_source_files): New macro. (swing_java_source_files): Likewise. (awt_java_source_files): Pruned. (applet_java_source_files): New macro. (beans_java_source_files): Likewise. (lib_java_applet_la_SOURCES): Likewise. (lib_java_awt_la_SOURCES): Likewise. (lib_javax_swing_la_SOURCES): Likewise. (lib_java_beans_la_SOURCES): Likewise. (all_java_object_files): Likewise. (%.lo: %.java): Use all_java_object_files. (all_java_source_files): Added new _SOURCES. (ordinary_java_source_files): Removed awt_java_source_files. 2004-03-02 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added java/awt/image/AffineTransformOp.java * Makefile.in: Re-generated. * java/awt/image/AffineTransformOp.java: New Class. 2004-03-01 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (setPaint): Interpret correctly TexturePaint's anchor rectangle. (drawImage): Fixed scale factors of the affine transform. 2004-02-27 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (GdkGraphics(Component)): Inherit font from component. (drawString): Use font style. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java (gtkSetFont): New native method declaration. (setFont): New method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkSetFont): New native method declaration. (setFont): Call new native method gtkSetFont. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setFont): For all child components who do not their fonts set, set their peers' fonts with this container's font. * gnu/java/awt/peer/gtk/GtkLabelPeer.java: Move all native method declarations to the top for readability. (gtkSetFont): New native method declaration. (setFont): New method. * java/awt/Component.java (setFont): Invalidate after setting the font. * java/awt/Container.java (invalidateTree): New method. (setFont): Invalidate the container tree after setting the font. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method. 2004-02-27 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (updateBufferedImage): New helper function. Updates BufferedImage in memory if it was changed. (draw): changed to update BufferedImage in memory after this drawing operation (fill): Ditto. (draw3DRect): Ditto. (fill3DRect): Ditto. (clearRect): Ditto. (drawRaster): Ditto. (drawImage) : Ditto. Update only in case of GtkOffScreenImage with no affine transformation. (drawGlyphVector): Ditto. 2004-02-26 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (isBufferedImageGraphics): New Helper function. Returns true if this graphics2d can be used to draw into buffered image and false otherwise. (updateImagePixels): New Helper function. Updates pixels in the BufferedImage. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (getImagePixels): New function. Returns pixels of the buffered image associated with this Graphics2D. 2004-02-26 David Jee <djee@redhat.com> * java/awt/BorderLayout.java (layoutContainer): Fix width and height calculations to ensure that they're non-negative. * java/awt/Component.java (setBackground): If c is null, inherit from closest ancestor whose background color is set. 2004-02-26�� Kim Ho�� <kho@redhat.com> * Makefile.am: Add new files. * Makefile.in: Re-generate. * javax/swing/JProgressBar.java: (JProgressBar(int, int int)): Throw IllegalArgumentException if orientation is invalid. (JProgressBar(BoundedRangeModel)): Create ChangeListener and register it. UpdateUI. (getChangeListeners): Implement. (setModel): Reset ChangeListener. * javax/swing/JScrollBar.java: Implement. * javax/swing/JSeparator.java: Implement. * javax/swing/JSlider.java: (JSlider(int, int, int, int)): Throw IllegalArgumentException if orientation is invalid. (getChangeListeners): Fix method name. * javax/swing/SwingUtilities.java: (layoutCompoundLabel): If there is no text, set the text rectangle dimensions to 0. * javax/swing/plaf/basic/BasicButtonUI.java: (paint): If there is no text, don't paint it. * javax/swing/plaf/basic/BasicScrollBarUI.java: Implement. * javax/swing/plaf/basic/BasicSeparatorUI.java: Implement. * javax/swing/plaf/basic/BasicSliderUI.java: (propertyChange): If the model changes, change the listeners accordingly. 2004-02-25 Graydon Hoare <graydon@redhat.com> * javax/swing/AbstractButton.java: Add "final" qualifiers. * javax/swing/JList.java: Reimplement. * javax/swing/DefaultListSelectionModel.java: Reimplement. * javax/swing/plaf/basic/BasicListUI.java: Reimplement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values. * javax/swing/ListModel.java: Javadoc. * javax/swing/ListSelectionModel.java: Add missing methods. * javax/swing/AbstractListModel.java: Javadoc and corrections. * javax/swing/DefaultListModel.java: Javadoc and corrections. * javax/swing/ListModel.java: Javadoc and corrections. * javax/swing/DefaultListCellRenderer.java: Minor tidying. 2004-02-25 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFontPeer.java (GtkFontPeer): Change default size to 12. * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Change default size to 12. (getClasspathFontPeer): Likewise. Set default name to "Default". * java/awt/Font.java (Font(Map)): Call Font(String,Map). (Font(String,Map)): If attrs is null, initialize it as an empty HashMap, which will ensure that the Font will get default attributes. 2004-02-25 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFontPeer.java (GtkFontPeer(String,int)): Call the new constructor with size 1. (GtkFontPeer(String,int,int)): New constructor with size attribute. * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer(String,int)): Call the new overload method with size 1. (getFontPeer(String,int,int)): New method. Overloaded with size attribute. (getClasspathFontPeer): Set the size of the font. 2004-02-24 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (bimage): New field. (GdkGraphics2D): New Constructor. Constructs Graphics object that can be used to draw into the Buffered Image. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: (GdkGraphicsEnvironment): Fixed to include public keyword. (createGraphics): Implemented. * gnu/java/awt/peer/gtk/GtkToolkit.java (getLocalGraphicsEnvironment): Implemented. * java/awt/GraphicsEnvironment.java: (getLocalGraphicsEnvironment): Implemented. * java/awt/image/BufferedImage.java: (createGraphics): Implemented. 2004-02-24 David Jee <djee@redhat.com> * java/awt/Component.java (eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types. * java/awt/Container.java (addNotifyContainerChildren): Fix event enabling. 2004-02-23 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java * Makefile.in: Re-generated. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: New Class. 2004-02-19 Kim Ho <kho@redhat.com> * Makefile.am: Add BasicProgressBarUI * Makefile.in: Regenerate. * javax/swing/JProgressBar.java: Re-implement. * javax/swing/plaf/basic/BasicLookAndFeel.java Add constants for JProgressBar. * javax/swing/plaf/basic/BasicProgressBarUI.java Implement. * javax/swing/plaf/basic/BasicSliderUI.java Change comments. (calculateGeometry): New method (paint): Remove unnecessary size calculations. 2004-02-18 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawRaster): Fixed small error that caused imageToUser transformation to be set incorrectly. (toString): Implemented. 2004-02-18 David Jee <djee@redhat.com> * java/awt/CardLayout.java (addLayoutComponent): Show the first component added as the default. (removeLayoutComponent): After removing, show the next component. (gotoComponent): If there is only one component, show it and return. 2004-02-18 Kim Ho <kho@redhat.com> * javax/swing/JSlider.java: Re-order modifiers. * javax/swing/JLabel.java: Re-order modifiers. * javax/swing/JComponent.java: (addPropertyChangeListener): Implement. (removePropertyChangeListener): ditto. (firePropertyChangeEvent): ditto. 2004-02-17 David Jee <djee@redhat.com> * java/awt/Component.java (show): Dispatch ComponentEvent via system event queue. (hide): Likewise. (move): Likewise. (resize): Likewise. (reshape): Likewise. * java/awt/Window.java (setBoundsCallback): Likewise. 2004-02-17 David Jee <djee@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds): Use gtk_widget_set_size_request() instead of the deprecated gtk_widget_set_usize(). 2004-02-17 Kim Ho <kho@redhat.com> * javax/swing/JSlider.java: Fix comments and make property strings constants. (createStandardLabels): Use the labels preferred size as bounds. * javax/swing/plaf/basic/BasicSliderUI.java Fix comments. (ScrollHandler::actionPerformed): Don't calculate the timer stop value. Let the MouseListeners find the stop location. (getPreferredHorizontalSize): Re-implement. (getPreferredVerticalSize): ditto. (getMinimumHorizontalSize): ditto. (getMinimumVerticalSize): ditto. (getPreferredSize): ditto. (getMinimumSize): ditto. (getMaximumSize): ditto. (paintTicks): Use doubles to find the tick location. (paintHorizontalLabel):�� Use preferredSize as initial width and height. (paintVerticalLabel): ditto. 2004-02-17 Kim Ho <kho@redhat.com> * javax/swing/JLabel.java: Changed property strings to constants. (DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY): New property. (setText): Change mnemonic index if text is too short. (setDisplayedMnemonicIndex): Fire property change event. (getDisplayedMnemonicIndex): Remove check against short text. 2004-02-17 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: (drawImage(img,xform,obs)): Invert xform before passing the xform to cairo. (drawImage(img,x,y,bgcolor,obs)): Implemented. (drawImage (img,x,y,w,h,bgcolor,obs)): Partly implemented. (drawImage (img,x,y,w,h,obs)): Implemented. (drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2, bgcolor,obs)): Partly implemented. (drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)): Implemented. * java/awt/image/BufferedImage.java: (copyData): if dest is null, create raster with same dimensions as the current image. 2004-02-16 Graydon Hoare <graydon@redhat.com> * javax/swing/plaf/basic/BasicLabelUI.java (getPreferredSize): Use layoutCL. * javax/swing/plaf/basic/BasicGraphicsUtils.java (getPreferredButtonSize): Start with empty view rect, layout using component's preferred alignment. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and List defaults. 2004-02-16 David Jee <djee@redhat.com> * java/awt/Component.java (show): Dispatch COMPONENT_SHOWN ComponentEvent. (hide): Dispatch COMPONENT_HIDDEN ComponentEvent. (move): Erase old bounds and repaint new bounds. Dispatch COMPONENT_MOVED ComponentEvent. (resize): Erase old bounds and repaint new bounds. Dispatch COMPONENT_RESIZED ComponentEvent. (reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED ComponentEvents. * java/awt/Window.java (setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED ComponentEvents. 2004-02-16 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: (setRenderingHint): Added implementation of Interpolation rendering hints. (setRenderingHints): Ditto. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: (drawPixels): fixed to allow user to choose type of filtering that should be used when displaying images. (cairoSurfaceSetFilter): New method. Sets filter type for interpolation of pixel values. 2004-02-16 David Jee <djee@redhat.com> * java/awt/GridBagLayout.java (calcCellSizes): Rows or columns with zero sizes should still be considered for extra space distribution. 2004-02-16 Kim Ho <kho@redhat.com> * javax/swing/JLabel.java: Re-implement. * javax/swing/plaf/basic/BasicLabelUI.java Re-implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Added constant. 2004-02-16�� Kim Ho�� <kho@redhat.com> * javax/swing/JSlider.java: Fix indentation and comments. (setModel): Remove null check to conform with Sun's. (setOrientation): Throw exception if not HORIZONTAL or VERTICAL. (getInverted): Use private variable instead of ComponentOrientation. (setInverted): ditto. * javax/swing/plaf/basic/BasicSliderUI.java: Fix indentation and comments. (propertyChange): Remove check for inverted slider, handle in main paint. (getMinimumSize): Return preferred size. (getMaximumSize): ditto. (calculateFocusRect): Don't relocate rectangle. (drawInverted): Return XOR of the slider's inversion and the component's orientation. (paint): Update leftToRightCache 2004-02-13 David Jee <djee@redhat.com> * java/awt/GridBagLayout.java (GetLayoutInfo): Fix weight and size distribution. Relocate repeated code to helper methods. (sortBySpan): New helper method. (distributeSizeAndWeight): Likewise. (calcCellWeights): Likewise. (calcCellSizes): Add comments. 2004-02-13 David Jee <djee@redhat.com> * java/awt/Component.java (show): Only do something if component is invisible at the moment. (hide): Only do something if component is visible at the moment. (reshape): If lightweight, erase old bounds and repaint new bounds. 2004-02-13�� Kim Ho�� <kho@redhat.com> * Makefile.am: Updated for new file. * Makefile.in: Regenerated. * javax/swing/JSlider.java: Reimplement. * javax/swing/SwingUtilities.java (layoutCompoundLabel): Use icon height instead of width. (paintComponent): Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add JSlider defaults. * javax/swing/plaf/basic/BasicSliderUI.java: Implement. New file. From-SVN: r79607
714 lines
18 KiB
Java
714 lines
18 KiB
Java
/* BorderLayout.java -- A layout manager class
|
|
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
|
|
|
|
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. */
|
|
|
|
|
|
package java.awt;
|
|
|
|
/**
|
|
* This class implements a layout manager that positions components
|
|
* in certain sectors of the parent container.
|
|
*
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
|
|
*/
|
|
public class BorderLayout implements LayoutManager2, java.io.Serializable
|
|
{
|
|
|
|
/*
|
|
* Static Variables
|
|
*/
|
|
|
|
/**
|
|
* Constant indicating the top of the container
|
|
*/
|
|
public static final String NORTH = "North";
|
|
|
|
/**
|
|
* Constant indicating the bottom of the container
|
|
*/
|
|
public static final String SOUTH = "South";
|
|
|
|
/**
|
|
* Constant indicating the right side of the container
|
|
*/
|
|
public static final String EAST = "East";
|
|
|
|
/**
|
|
* Constant indicating the left side of the container
|
|
*/
|
|
public static final String WEST = "West";
|
|
|
|
/**
|
|
* Constant indicating the center of the container
|
|
*/
|
|
public static final String CENTER = "Center";
|
|
|
|
|
|
/**
|
|
* The constant indicating the position before the first line of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* top-to-bottom orientation, it is the same as {@link #NORTH}, for
|
|
* a bottom-to-top orientation, it is the same as {@link #SOUTH}.
|
|
*
|
|
* <p>This constant is an older name for {@link #PAGE_START} which
|
|
* has exactly the same value.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public static final String BEFORE_FIRST_LINE = "First";
|
|
|
|
|
|
/**
|
|
* The constant indicating the position after the last line of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* top-to-bottom orientation, it is the same as {@link #SOUTH}, for
|
|
* a bottom-to-top orientation, it is the same as {@link #NORTH}.
|
|
*
|
|
* <p>This constant is an older name for {@link #PAGE_END} which
|
|
* has exactly the same value.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public static final String AFTER_LAST_LINE = "Last";
|
|
|
|
|
|
/**
|
|
* The constant indicating the position before the first item of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* left-to-right orientation, it is the same as {@link #WEST}, for
|
|
* a right-to-left orientation, it is the same as {@link #EAST}.
|
|
*
|
|
* <p>This constant is an older name for {@link #LINE_START} which
|
|
* has exactly the same value.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public static final String BEFORE_LINE_BEGINS = "Before";
|
|
|
|
|
|
/**
|
|
* The constant indicating the position after the last item of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* left-to-right orientation, it is the same as {@link #EAST}, for
|
|
* a right-to-left orientation, it is the same as {@link #WEST}.
|
|
*
|
|
* <p>This constant is an older name for {@link #LINE_END} which
|
|
* has exactly the same value.
|
|
*
|
|
* @since 1.2
|
|
*/
|
|
public static final String AFTER_LINE_ENDS = "After";
|
|
|
|
|
|
/**
|
|
* The constant indicating the position before the first line of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* top-to-bottom orientation, it is the same as {@link #NORTH}, for
|
|
* a bottom-to-top orientation, it is the same as {@link #SOUTH}.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final String PAGE_START = BEFORE_FIRST_LINE;
|
|
|
|
|
|
/**
|
|
* The constant indicating the position after the last line of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* top-to-bottom orientation, it is the same as {@link #SOUTH}, for
|
|
* a bottom-to-top orientation, it is the same as {@link #NORTH}.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final String PAGE_END = AFTER_LAST_LINE;
|
|
|
|
|
|
/**
|
|
* The constant indicating the position before the first item of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* left-to-right orientation, it is the same as {@link #WEST}, for
|
|
* a right-to-left orientation, it is the same as {@link #EAST}.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final String LINE_START = BEFORE_LINE_BEGINS;
|
|
|
|
|
|
/**
|
|
* The constant indicating the position after the last item of the
|
|
* layout. The exact position depends on the writing system: For a
|
|
* left-to-right orientation, it is the same as {@link #EAST}, for
|
|
* a right-to-left orientation, it is the same as {@link #WEST}.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public static final String LINE_END = AFTER_LINE_ENDS;
|
|
|
|
|
|
|
|
// Serialization constant
|
|
private static final long serialVersionUID = -8658291919501921765L;
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Variables
|
|
*/
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component north;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component south;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component east;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component west;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component center;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component firstLine;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component lastLine;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component firstItem;
|
|
|
|
/**
|
|
* @serial
|
|
*/
|
|
private Component lastItem;
|
|
|
|
/**
|
|
* @serial The horizontal gap between components
|
|
*/
|
|
private int hgap;
|
|
|
|
/**
|
|
* @serial The vertical gap between components
|
|
*/
|
|
private int vgap;
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Constructors
|
|
*/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>BorderLayout</code> with no
|
|
* horiztonal or vertical gaps between components.
|
|
*/
|
|
public
|
|
BorderLayout()
|
|
{
|
|
this(0,0);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Initializes a new instance of <code>BorderLayout</code> with the
|
|
* specified horiztonal and vertical gaps between components.
|
|
*
|
|
* @param hgap The horizontal gap between components.
|
|
* @param vgap The vertical gap between components.
|
|
*/
|
|
public
|
|
BorderLayout(int hgap, int vgap)
|
|
{
|
|
this.hgap = hgap;
|
|
this.vgap = vgap;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/*
|
|
* Instance Variables
|
|
*/
|
|
|
|
/**
|
|
* Returns the horitzontal gap value.
|
|
*
|
|
* @return The horitzontal gap value.
|
|
*/
|
|
public int
|
|
getHgap()
|
|
{
|
|
return(hgap);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Sets the horizontal gap to the specified value.
|
|
*
|
|
* @param hgap The new horizontal gap.
|
|
*/
|
|
public void
|
|
setHgap(int hgap)
|
|
{
|
|
this.hgap = hgap;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the vertical gap value.
|
|
*
|
|
* @return The vertical gap value.
|
|
*/
|
|
public int
|
|
getVgap()
|
|
{
|
|
return(vgap);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Sets the vertical gap to the specified value.
|
|
*
|
|
* @param vgap The new vertical gap value.
|
|
*/
|
|
public void
|
|
setVgap(int vgap)
|
|
{
|
|
this.vgap = vgap;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Adds a component to the layout in the specified constraint position,
|
|
* which must be one of the string constants defined in this class.
|
|
*
|
|
* @param component The component to add.
|
|
* @param constraints The constraint string.
|
|
*
|
|
* @exception IllegalArgumentException If the constraint object is not
|
|
* a string, or is not one of the specified constants in this class.
|
|
*/
|
|
public void
|
|
addLayoutComponent(Component component, Object constraints)
|
|
{
|
|
if (constraints != null && ! (constraints instanceof String))
|
|
throw new IllegalArgumentException("Constraint must be a string");
|
|
|
|
addLayoutComponent((String) constraints, component);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Adds a component to the layout in the specified constraint position,
|
|
* which must be one of the string constants defined in this class.
|
|
*
|
|
* @param constraints The constraint string.
|
|
* @param component The component to add.
|
|
*
|
|
* @exception IllegalArgumentException If the constraint object is not
|
|
* one of the specified constants in this class.
|
|
*
|
|
* @deprecated This method is deprecated in favor of
|
|
* <code>addLayoutComponent(Component, Object)</code>.
|
|
*/
|
|
public void
|
|
addLayoutComponent(String constraints, Component component)
|
|
{
|
|
String str = constraints;
|
|
|
|
if (str == null || str.equals(CENTER))
|
|
center = component;
|
|
else if (str.equals(NORTH))
|
|
north = component;
|
|
else if (str.equals(SOUTH))
|
|
south = component;
|
|
else if (str.equals(EAST))
|
|
east = component;
|
|
else if (str.equals(WEST))
|
|
west = component;
|
|
else if (str.equals(BEFORE_FIRST_LINE))
|
|
firstLine = component;
|
|
else if (str.equals(AFTER_LAST_LINE))
|
|
lastLine = component;
|
|
else if (str.equals(BEFORE_LINE_BEGINS))
|
|
firstItem = component;
|
|
else if (str.equals(AFTER_LINE_ENDS))
|
|
lastItem = component;
|
|
else
|
|
throw new IllegalArgumentException("Constraint value not valid: " + str);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Removes the specified component from the layout.
|
|
*
|
|
* @param component The component to remove from the layout.
|
|
*/
|
|
public void
|
|
removeLayoutComponent(Component component)
|
|
{
|
|
if (north == component)
|
|
north = null;
|
|
if (south == component)
|
|
south = null;
|
|
if (east == component)
|
|
east = null;
|
|
if (west == component)
|
|
west = null;
|
|
if (center == component)
|
|
center = null;
|
|
if (firstItem == component)
|
|
firstItem = null;
|
|
if (lastItem == component)
|
|
lastItem = null;
|
|
if (firstLine == component)
|
|
firstLine = null;
|
|
if (lastLine == component)
|
|
lastLine = null;
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the minimum size of the specified container using this layout.
|
|
*
|
|
* @param target The container to calculate the minimum size for.
|
|
*
|
|
* @return The minimum size of the container
|
|
*/
|
|
public Dimension
|
|
minimumLayoutSize(Container target)
|
|
{
|
|
return calcSize(target, MIN);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the preferred size of the specified container using this layout.
|
|
*
|
|
* @param target The container to calculate the preferred size for.
|
|
*
|
|
* @return The preferred size of the container
|
|
*/
|
|
public Dimension
|
|
preferredLayoutSize(Container target)
|
|
{
|
|
return calcSize(target, PREF);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the maximum size of the specified container using this layout.
|
|
*
|
|
* @param target The container to calculate the maximum size for.
|
|
*
|
|
* @return The maximum size of the container
|
|
*/
|
|
public Dimension
|
|
maximumLayoutSize(Container target)
|
|
{
|
|
return calcSize(target, MAX);
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the X axis alignment, which is a <code>float</code> indicating
|
|
* where along the X axis this container wishs to position its layout.
|
|
* 0 indicates align to the left, 1 indicates align to the right, and 0.5
|
|
* indicates align to the center.
|
|
*
|
|
* @param parent The parent container.
|
|
*
|
|
* @return The X alignment value.
|
|
*/
|
|
public float
|
|
getLayoutAlignmentX(Container parent)
|
|
{
|
|
return(parent.getAlignmentX());
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns the Y axis alignment, which is a <code>float</code> indicating
|
|
* where along the Y axis this container wishs to position its layout.
|
|
* 0 indicates align to the top, 1 indicates align to the bottom, and 0.5
|
|
* indicates align to the center.
|
|
*
|
|
* @param parent The parent container.
|
|
*
|
|
* @return The Y alignment value.
|
|
*/
|
|
public float
|
|
getLayoutAlignmentY(Container parent)
|
|
{
|
|
return(parent.getAlignmentY());
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Instructs this object to discard any layout information it might
|
|
* have cached.
|
|
*
|
|
* @param parent The parent container.
|
|
*/
|
|
public void
|
|
invalidateLayout(Container parent)
|
|
{
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Lays out the specified container according to the constraints
|
|
* in this object.
|
|
*
|
|
* @param target The container to lay out.
|
|
*/
|
|
public void
|
|
layoutContainer(Container target)
|
|
{
|
|
synchronized (target.getTreeLock ())
|
|
{
|
|
Insets i = target.getInsets();
|
|
|
|
ComponentOrientation orient = target.getComponentOrientation ();
|
|
boolean left_to_right = orient.isLeftToRight ();
|
|
|
|
Component my_north = north;
|
|
Component my_east = east;
|
|
Component my_south = south;
|
|
Component my_west = west;
|
|
|
|
// Note that we currently don't handle vertical layouts. Neither
|
|
// does JDK 1.3.
|
|
if (firstLine != null)
|
|
my_north = firstLine;
|
|
if (lastLine != null)
|
|
my_south = lastLine;
|
|
if (firstItem != null)
|
|
{
|
|
if (left_to_right)
|
|
my_west = firstItem;
|
|
else
|
|
my_east = firstItem;
|
|
}
|
|
if (lastItem != null)
|
|
{
|
|
if (left_to_right)
|
|
my_east = lastItem;
|
|
else
|
|
my_west = lastItem;
|
|
}
|
|
|
|
Dimension c = calcCompSize(center, PREF);
|
|
Dimension n = calcCompSize(my_north, PREF);
|
|
Dimension s = calcCompSize(my_south, PREF);
|
|
Dimension e = calcCompSize(my_east, PREF);
|
|
Dimension w = calcCompSize(my_west, PREF);
|
|
Dimension t = target.getSize();
|
|
|
|
/*
|
|
<-> hgap <-> hgap
|
|
+----------------------------+ }
|
|
|t | } i.top
|
|
| +----------------------+ | --- y1 }
|
|
| |n | |
|
|
| +----------------------+ | } vgap
|
|
| +---+ +----------+ +---+ | --- y2 } }
|
|
| |w | |c | |e | | } hh
|
|
| +---+ +----------+ +---+ | } vgap }
|
|
| +----------------------+ | --- y3 }
|
|
| |s | |
|
|
| +----------------------+ | }
|
|
| | } i.bottom
|
|
+----------------------------+ }
|
|
|x1 |x2 |x3
|
|
<---------------------->
|
|
<--> ww <-->
|
|
i.left i.right
|
|
*/
|
|
|
|
int x1 = i.left;
|
|
int x2 = x1 + w.width + hgap;
|
|
int x3 = Math.max(x2 + w.width + hgap, t.width - i.right - e.width);
|
|
int ww = t.width - i.right - i.left;
|
|
|
|
int y1 = i.top;
|
|
int y2 = y1 + n.height + vgap;
|
|
int midh = Math.max(e.height, Math.max(w.height, c.height));
|
|
int y3 = Math.max(y2 + midh + vgap, t.height - i.bottom - s.height);
|
|
int hh = y3-y2-vgap;
|
|
|
|
setBounds(center, x2, y2, x3-x2-hgap, hh);
|
|
setBounds(my_north, x1, y1, ww, n.height);
|
|
setBounds(my_south, x1, y3, ww, s.height);
|
|
setBounds(my_west, x1, y2, w.width, hh);
|
|
setBounds(my_east, x3, y2, e.width, hh);
|
|
}
|
|
}
|
|
|
|
/*************************************************************************/
|
|
|
|
/**
|
|
* Returns a string representation of this layout manager.
|
|
*
|
|
* @return A string representation of this object.
|
|
*/
|
|
public String
|
|
toString()
|
|
{
|
|
return getClass().getName() + "[hgap=" + hgap + ",vgap=" + vgap + "]";
|
|
}
|
|
|
|
private void
|
|
setBounds(Component comp, int x, int y, int w, int h)
|
|
{
|
|
if (comp == null)
|
|
return;
|
|
comp.setBounds(x, y, w, h);
|
|
}
|
|
|
|
// Some constants for use with calcSize().
|
|
private static final int MIN = 0;
|
|
private static final int MAX = 1;
|
|
private static final int PREF = 2;
|
|
|
|
private Dimension
|
|
calcCompSize(Component comp, int what)
|
|
{
|
|
if (comp == null || !comp.isVisible())
|
|
return new Dimension(0, 0);
|
|
if (what == MIN)
|
|
return comp.getMinimumSize();
|
|
else if (what == MAX)
|
|
return comp.getMaximumSize();
|
|
return comp.getPreferredSize();
|
|
}
|
|
|
|
// This is a helper function used to compute the various sizes for
|
|
// this layout.
|
|
private Dimension
|
|
calcSize(Container target, int what)
|
|
{
|
|
synchronized (target.getTreeLock ())
|
|
{
|
|
Insets ins = target.getInsets();
|
|
|
|
ComponentOrientation orient = target.getComponentOrientation ();
|
|
boolean left_to_right = orient.isLeftToRight ();
|
|
|
|
Component my_north = north;
|
|
Component my_east = east;
|
|
Component my_south = south;
|
|
Component my_west = west;
|
|
|
|
// Note that we currently don't handle vertical layouts. Neither
|
|
// does JDK 1.3.
|
|
if (firstLine != null)
|
|
my_north = firstLine;
|
|
if (lastLine != null)
|
|
my_south = lastLine;
|
|
if (firstItem != null)
|
|
{
|
|
if (left_to_right)
|
|
my_west = firstItem;
|
|
else
|
|
my_east = firstItem;
|
|
}
|
|
if (lastItem != null)
|
|
{
|
|
if (left_to_right)
|
|
my_east = lastItem;
|
|
else
|
|
my_west = lastItem;
|
|
}
|
|
|
|
Dimension ndim = calcCompSize(my_north, what);
|
|
Dimension sdim = calcCompSize(my_south, what);
|
|
Dimension edim = calcCompSize(my_east, what);
|
|
Dimension wdim = calcCompSize(my_west, what);
|
|
Dimension cdim = calcCompSize(center, what);
|
|
|
|
int width = edim.width + cdim.width + wdim.width + (hgap * 2);
|
|
if (ndim.width > width)
|
|
width = ndim.width;
|
|
if (sdim.width > width)
|
|
width = sdim.width;
|
|
|
|
width += (ins.left + ins.right);
|
|
|
|
int height = edim.height;
|
|
if (cdim.height > height)
|
|
height = cdim.height;
|
|
if (wdim.height > height)
|
|
height = wdim.height;
|
|
|
|
height += (ndim.height + sdim.height + (vgap * 2) + ins.top + ins.bottom);
|
|
|
|
return(new Dimension(width, height));
|
|
}
|
|
}
|
|
} // class BorderLayout
|