c5d2de6b4c
2004-05-25 David Jee <djee@redhat.com> * java/awt/Container.java (remove): Set component's parent to null only after we removed the component from its parent's layout manager. 2004-05-25 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): Set bounds regardless of whether awtComponent is valid. * gnu/java/awt/peer/gtk/GtkListPeer.java (getSize): Change native method declaration. (minimumSize): Pass visible row count into getSize(). (preferredSize): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize): Use scroll window's natural size. Use visible row count to determine the final height value to return. 2004-05-21 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (setClip): Minor correction to order of operations. * javax/swing/JScrollPane.java: Extend sketchy implementation. * javax/swing/ScrollPaneLayout.java: Likewise. * javax/swing/JViewPort.java: Likewise. * javax/swing/ViewportLayout.java: Likewise. * javax/swing/JComponent.java: Rewrite. * javax/swing/RepaintManager.java: Likewise. * javax/swing/JLayeredPane.java: Change validate() to revalidate(). * javax/swing/JList.java (setSelectedIndices): (getSelectedIndices): (getSelectedValues): New functions. (getPreferredScrollableViewportSize): Return preferred size. (getScrollableUnitIncrement): (getScrollableBlockIncrement): Initial implementations. * javax/swing/JRootPane.java: Clean up slightly. (getUI): (setUI): (updateUI): (getUIClassID): (isValidateRoot): Add overrides from JComponent. * javax/swing/JScrollBar.java: Set default orientation to VERTICAL. * javax/swing/UIManager.java (getDimension): Return the dimension. * javax/swing/plaf/basic/BasicButtonUI.java: Set component opaque. * javax/swing/plaf/basic/BasicLabelUI.java: Likewise. * javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise. * javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise. * javax/swing/plaf/basic/BasicSliderUI.java: Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: Likewise. * javax/swing/plaf/basic/BasicRootPaneUI.java: Likewise, and set background. * javax/swing/plaf/basic/BasicListUI.java: Likewise, and improve a bit. * javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise, and adjust calculations. * javax/swing/plaf/basic/BasicViewportUI.java: Likewise, and improve a bit. * javax/swing/plaf/basic/BasicLookAndFeel.java (Button.margin): Shrink. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c: Hack to set horizontal always, workaround pango. * jni/gtk-peer/gtkcairopeer.h: Change to match pattern API. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Synchronize more often, check cairo status after ops, handle changes to cairo pattern API, check for disposal. 2004-05-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicMenuItemUI.java: (BasicMenuItemUI): Create propertyChangeListener. (getPath):Implemented. (installListeners): Add propertyChangeListener to menuItem. (uninstallListeners): Remove propertyChangeListener from menuItem. (update): Implemented. * javax/swing/plaf/basic/BasicMenuUI.MouseInputHandler: (mouseEntered): Take insets of popup menu into account when calculating position of popup menu. 2004-05-18 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JMenuBar.java: Started implementation. * javax/swing/JPopupMenu.java: (setVisible): Fixed location of lightweight/mediumweight popup menu. (show): Fixed location of PopupMenu. * javax/swing/plaf/basic/BasicMenuBarUI.java: New file. UI Delegate for JMenuBar. * javax/swing/plaf/basic/BasicMenuUI.MouseInputHandler: (mouseEntered): Corrected position of the submenu. 2004-05-18 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Remove calls to _gtk_accel_group_attach. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c: Likewise. * gnu/java/awt/peer/gtk/GtkButtonPeer.java: Give gtkSetFont package access. Don't override setFont. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Give gtkWidgetRequestFocus package access. * gnu/java/awt/peer/gtk/GtkLabelPeer.java: Don't override setFont. * gnu/java/awt/peer/gtk/GtkListPeer.java: Override gtkSetFont. Give gtkWidgetRequestFocus package access. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Give gtkWidgetRequestFocus package access. Don't override setFont. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Don't override setFont. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (gtkSetLabel): Move call to gtk_bin_get_child into GDK critical region. (gtkSetFont): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (gtkSetFont): Implement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkSetFont): Whitespace fix. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetSetUsize): Remove method. 2004-05-18 David Jee <djee@redhat.com> * java/awt/image/MemoryImageSource.java (newPixels(int,int,int,int,boolean)): Set only the specified rectangle of pixels. (newPixels(byte[],ColorModel,int,int)): Implement. (newPixels(int[],ColorModel,int,int)): Implement. 2004-05-18 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JMenu.java: Started implementation. * javax/swing/JPopupMenu.java: (insert): If specified index is -1, then add component at the end. (isPopupTrigger): Reimplemented. (JPopupMenu.LightWeightPopup): setBounds of the lightWeightPopup before adding it to the layeredPane. (javax/swing/plaf/basic/BasicIconFactory.java): (getMenuArrowIcon): Implemented. * javax/swing/plaf/basic/BasicMenuItemUI.java: (getPreferredSize): Add size of the arrow icon if this menu item is instance of JMenu. (paintMenuItem): Paint arrow icon if this menu item is a submenu. * javax/swing/plaf/basic/BasicMenuUI.java: New File. UI Delegate for JMenu. 2004-05-17 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (postKeyEvent): Post KEY_TYPED events. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (generates_key_typed_event): Remove function. 2004-05-17 Olga Rodimina <rodimina@redhat.com> * javax/swing/JRootPane.java (JRootPane.RootLayout): Reimplemented to set bounds of contentPane and menuBar. (setJMenuBar): Add menu bar to the layered pane. (createLayeredPane): Set layout of layeredPane to null. * javax/swing/JLayeredPane.java: (addImpl): Calculate index of the component in the layeredPane according to the specified position within the layer. 2004-05-17 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkImagePainter.java (setPixels): Change color model to the default model after converting pixels. * java/awt/image/MemoryImageSource.java (newPixels): Set only the specified rectangle of pixels. 2004-05-13 Thomas Fitzsimmons <fitzsim@redhat.com> * libgcj.spec.in (lib): Add -l-java-awt -l-java-applet -l-java-beans -l-javax-accessibility -l-javax-swing. * java/awt/AWTEvent.java (toString): Print source's name rather than the source itself. 2004-05-12 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkToolkit.java (loadSystemColors): Make native. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (gdk_color_to_java_color): New function. * jni/gtk-peer/gtkpeer.h: Add SystemColor defines. 2004-05-12 David Jee <djee@redhat.com> * java/awt/image/RGBImageFilter.java: Initialize origmodel as null. (makeColor): Fix pixel component order. (filterRGBPixels): Fix pixel iteration. (setPixels): Add extra checks for index color model. Convert pixels to default color model if necessary. (convertColorModelToDefault): New override method for byte pixels. (convertColorModelToDefault): For int pixels, fix pixel iteration. (makeColorbyDefaultCM): New override method for byte pixels. (makeColorbyDefaultCM): For int pixel, add color model as argument. (makeColor): Fix pixel component order. 2004-05-11 Kim Ho <kho@redhat.com> * javax/swing/Box.java: Comment out more parts of Box.Filler. 2004-05-11 Kim Ho <kho@redhat.com> * javax/swing/Box.java: Remove reference to AccessibleAWTComponent so it compiles again. 2004-05-10 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkListPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Update implementation of list peer to use GtkTreeView instead of deprecated GtkCList. 2004-05-07 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkWidgetDispatchKeyEvent): Remove keyChar parameter. (handleEvent): Remove keyChar argument to gtkWidgetDispatchKeyEvent calls. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Fix compiler warnings. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c: Likewise. 2004-05-06 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkWidgetRequestFocus): Mark protected. (GtkComponentPeer): Only set the peer's bounds if its component is valid. * java/awt/Component.java (static): Set the default keyboard focus manager. (requestFocus(), requestFocus(boolean), requestFocusInWindow(), requestFocusInWindow(temporary)): Don't request focus if the component is not showing. Get tree lock before traversing component hierarchy. * java/awt/DefaultKeyboardFocusManager.java (dispatchEvent): Only set the global focus owner if it is not a Window. (processKeyEvent): Consume keystrokes associated with the focus traversal keystroke. (focusPreviousComponent, focusNextComponent, upFocusCycle, downFocusCycle): Call requestFocusInWindow instead of requestFocus. * java/awt/EventDispatchThread.java (run): Move setting of default keyboard focus manager to Component.java. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (awt_keycode_to_keysym): New function. (gtkWidgetDispatchKeyEvent): Finish implementation. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Add FIXME comment. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkWidgetRequestFocus): New method. * java/awt/TextArea.java (TextArea): Set focus traversal keys to disable Tab and Shift-Tab keystrokes. (addNotify, appendText, insertText, replaceText): Simplify peer retrieval code. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c (connectSignals): Remove connections to "commit" signals. Remove C++-style comments. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (handleEvent): Activate GTK button when the space bar key is pressed. (gtkActivate): New method. 2004-05-06 David Jee <djee@redhat.com> * java/awt/image/CropImageFilter.java (setPixels): Implement for byte array pixels. * java/awt/image/ReplicateScaleFilter.java (setPixels): Implement for byte array pixels. (replicatePixels): Overload for byte array pixels. 2004-05-06 Kim Ho <kho@redhat.com> * javax/swing/Box.java: (getAccessibleContext): Return an instance of the correct class. 2004-05-05 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage): When component is null, use SystemColor.window as the default bgcolor. * gnu/java/awt/peer/gtk/GtkImage.java (setPixels): We can avoid iterating through the pixel rows only when height is 1. * java/awt/Image.java (getScaledInstance): Partially implement. * java/awt/image/CropImageFilter.java (setProperties): Fix "filter" property. (setPixels): Implement. * java/awt/image/ReplicateScaleFilter.java (setDimensions): Use scaled dimensions. (setPixels): Implement. (replicatePixels): New method. 2004-05-05 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkImagePainter.java (convertPixels): If either pixels or model is null, return null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c (Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels): If jpixels is null, do nothing and return. 2004-05-03 Kim Ho <kho@redhat.com> * gnu/java/awt/peer/gtk/GtkDialogPeer.java: (getGraphics): Like GtkFramePeer, the Graphics object needs to be translate to account for window decorations. (postMouseEvent): New method. Account for translation. (postExposeEvent): ditto. * javax/swing/Box.java: Stubbed. * javax/swing/JDialog.java: Ran through jalopy to fix indentation. (JDialog): Call SwingUtilities' getOwnerFrame for null owners. (setLayout): Check isRootPaneCheckingEnabled * javax/swing/JOptionPane.java: Re-implemented. * javax/swing/SwingUtilities.java: (getOwnerFrame): Static method to grab a default owner frame for Dialogs that don't specify owners. * javax/swing/event/SwingPropertyChangeSupport.java: (firePropertyChange): Fix early exit condition. * javax/swing/plaf/basic/BasicLabelUI.java: (paint): Avoid painting text if it is null or empty. * javax/swing/plaf/basic/BasicOptionPaneUI.java: Implement. 2004-05-03 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JPopupMenu.java: Started implementation. * javax/swing/JWindow.java (JWindow): call super() if parent for window is not specified. * javax/swing/plaf/basic/BasicPopupMenuUI.java: New File. UI Delegate for JPopupMenu. 2004-04-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/JApplet.java: Indicated that JApplet implements RootPaneContainer and made method of this interface public. * javax/swing/JFrame.java: Ditto. * javax/swing/JWindow.java: Ditto. 2004-04-29 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetBounds): Call gdk_window_move in addition to gtk_window_move. * java/applet/Applet.java (preferredSize): Call parent's preferredSize if the applet stub is null. (minimumSize): Likewise for parent's minimumSize. 2004-04-27 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenuItem.java (createActionPropertyChangeListener): Implemented. (processMouseEvent): Ditto. (fireMenuDragMouseEntered): Ditto. (fireMenuDragMouseExited): Ditto. (fireMenuDragMouseDragged): Ditto. (fireMenuDragMouseReleased): Ditto. (menuSelectionChanged): Ditto. (getSubElements): Ditto. (getComponent): Ditto. (addMenuDragMouseListener): Ditto. (removeMenuDragMouseListener):Ditto. (addMenuKeyListener): Ditto. (removeMenuKeyListener): Ditto. * javax/swing/plaf/basic/BasicMenuItemUI.java (doClick): Imlemented. * javax/swing/plaf/basic/BasicMenuItemUI.MouseInputHandler: Don't handle mouse events here. Pass them to MenuSelectionManager. 2004-04-26 Olga Rodimina <rodimina@redhat.com> Used correct version of jalopy configuration file to fix style in the files below. 2004-04-26 Olga Rodimina <rodimina@redhat.com> * javax/swing/JCheckBoxMenuItem.java: Fixed style and removed unnecessary comments. * javax/swing/JMenuItem.java: Ditto. * javax/swing/JRadioButtonMenuItem.java: Ditto. * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java: Ditto. * javax/swing/plaf/basic/BasicMenuItemUI.java: Ditto. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Ditto. 2004-04-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu_java_awt_peer_gtk_GtkWindowPeer.c: Change FIXME comment to C-style. * gnu_java_awt_peer_gtk_GtkWindowPeer.c: Add FIXME comment. * java/awt/ContainerOrderFocusTraversalPolicy.java (getComponentAfter): Start from current component and work up the component hierarchy until an acceptable component is found. Synchronize on tree lock. (getComponentBefore): Likewise. 2004-04-22 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Remove focus-related debugging messages. * java/awt/DefaultKeyboardFocusManager.java: Likewise. * java/awt/EventDispatchThread.java: Likewise. * java/awt/KeyboardFocusManager.java: Likewise. * java/awt/Window.java: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Change new C++-style comments to C-style comments. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (handleEvent): Dispatch key press and key release events to backing widget. (requestFocus): Post a FOCUS_GAINED event to the event queue. (gtkWidgetRequestFocus): New method. (gtkWidgetDispatchKeyEvent): Likewise. * java/awt/Component.java (requestFocus, requestFocus(boolean), requestFocusInWindow, requestFocusInWindow(boolean), getFocusCycleRootAncestor, nextFocus, transferFocus, transferFocusBackward, transferFocusUpCycle, hasFocus, isFocusOwner): Implement and document focus-handling methods. (setFocusTraversalKeys): Inherit focus traversal keys when keystrokes argument is null. Fix focus-handling documentation throughout class. * java/awt/Container.java (setFocusTraversalKeys, getFocusTraversalKeys, areFocusTraversalKeysSet, isFocusCycleRoot, setFocusTraversalPolicy, getFocusTraversalPolicy, isFocusTraversalPolicySet, setFocusCycleRoot, isFocusCycleRoot, transferFocusDownCycle): Implement and document focus-handling methods. (transferFocusBackward): Remove method. (readObject, writeObject): Implement and document serialization methods. * java/awt/ContainerOrderFocusTraversalPolicy.java: Implement and document. * java/awt/DefaultFocusTraversalPolicy.java: Implement and document. * java/awt/DefaultKeyboardFocusManager.java: Implement and partially document. * java/awt/EventDispatchThread.java (run): Set default keyboard focus manager. Attempt to dispatch each event to the keyboard focus manager before normal dispatch. * java/awt/KeyboardFocusManager.java: Implement and partially document. * java/awt/Window.java (Window): Set focusCycleRoot to true. (show): Focus initial component when window is shown for the first time. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Replace complex key press and key release logic with simple callbacks into GtkComponentPeer. * jni/gtk-peer/gtkpeer.h: Fix FOCUS_GAINED/FOCUS_LOST reversal. 2004-04-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/MenuSelectionManager.java (componentForPoint): Added new method. (defaultManager): New Method. Implemented. (getSelectedPath): Ditto. (isComponentPartOfCurrentMenu): Ditto. (processKeyEvent): Added new method. (processMouseEvent): New Method. Implemented. (setSelectedPath): Ditto. (getPath): Ditto. 2004-04-19 Kim Ho <kho@redhat.com> * java/awt/Container.java: (remove): Set the component's parent to null. (getComponentAt): Implement. * javax/swing/JComponent.java: (JComponent): Initialize defaultLocale (getDefaultLocale): Implement. (setDefaultLocale): ditto. * javax/swing/JSlider.java: (JSlider): Fix calculation of value. * javax/swing/JSplitPane.java: Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change SplitPane's default divider size. * javax/swing/plaf/basic/BasicScrollBarUI.java: (paint): Remove unused code. * javax/swing/plaf/basic/BasicSplitPaneDivider.java: Added comments and ran through jalopy. (setBasicSplitPaneUI): Get reference to hidden divider and set up one touch buttons if necessary. (setBorder): Fire propertyChangeEvent only if borders are different. (getPreferredSize): Defer to layout manager. (propertyChange): Implement. (oneTouchExpandableChanged): ditto. (createLeftOneTouchButton): Use BasicArrowButton. (createRightOneTouchButton): ditto. (moveDividerTo): New method. Moves the divider to a set location based on the last divider location. (BasicSplitPaneDivider::MouseHandler): Implement. (BasicSplitPaneDivider::OneTouchButton): Removed. (BasicSplitPaneDivider::DragController): Implement. (BasicSplitPaneDivider::VerticalDragController): ditto. (BasicSplitPaneDivider::DividerLayout): ditto. * javax/swing/plaf/basic/BasicSplitPaneUI.java: Reimplement. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (calculateLayoutInfo): Don't show component if it's null. (paintTab): Fix title paint logic. From-SVN: r82314
575 lines
17 KiB
Java
575 lines
17 KiB
Java
/* JLayeredPane.java --
|
|
Copyright (C) 2002, 2004 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 javax.swing;
|
|
|
|
import java.awt.Component;
|
|
import java.util.Hashtable;
|
|
import java.util.Iterator;
|
|
import java.util.Map;
|
|
import java.util.TreeMap;
|
|
import javax.accessibility.Accessible;
|
|
|
|
/**
|
|
* <p>The "Layered Pane" is a container which divides its children into 6 (or
|
|
* more) disjoint sets. the pre-defined sets are:</p>
|
|
*
|
|
* <ul>
|
|
* <li>"Frame Content"</li>
|
|
* <li>"Default"</li>
|
|
* <li>"Palette"</li>
|
|
* <li>"Modal"</li>
|
|
* <li>"Popup"</li>
|
|
* <li>"Drag"</li>
|
|
* </ul>
|
|
*
|
|
* <p>A child is in exactly one of these layers at any time, though there may
|
|
* be other layers if someone creates them.</p>
|
|
*
|
|
* <p>The purpose of this class is to translate this view of "layers" into a
|
|
* contiguous array of components: the one held in our ancestor,
|
|
* {@link java.awt.Container}.</p>
|
|
*
|
|
* <p>There is a precise set of words we will use to refer to numbers within
|
|
* this class:</p>
|
|
*
|
|
* <dl>
|
|
* <dt>Component Index:</dt>
|
|
* <dd>An offset into the <code>component</code> array held in our ancestor,
|
|
* {@link java.awt.Container}, from <code>[0 .. component.length)</code>. The drawing
|
|
* rule with indices is that 0 is drawn last.</dd>
|
|
*
|
|
* <dt>Layer Number:</dt>
|
|
* <dd>A general <code>int</code> specifying a layer within this component. Negative
|
|
* numbers are drawn first, then layer 0, then positive numbered layers, in
|
|
* ascending order.</dd>
|
|
*
|
|
* <dt>Position:</dt>
|
|
* <dd>An offset into a layer's "logical drawing order". Layer position 0
|
|
* is drawn last. Layer position -1 is a synonym for the first layer
|
|
* position (the logical "bottom").</dd>
|
|
* </dl>
|
|
*
|
|
* <p><b>Note:</b> the layer numbering order is the <em>reverse</em> of the
|
|
* component indexing and position order</p>
|
|
*
|
|
* @author Graydon Hoare <graydon@redhat.com>
|
|
*/
|
|
public class JLayeredPane extends JComponent implements Accessible
|
|
{
|
|
public static String LAYER_PROPERTY = "LAYER_PROPERTY";
|
|
|
|
public static Integer FRAME_CONTENT_LAYER = new Integer (-30000);
|
|
|
|
public static Integer DEFAULT_LAYER = new Integer (0);
|
|
public static Integer PALETTE_LAYER = new Integer (100);
|
|
public static Integer MODAL_LAYER = new Integer (200);
|
|
public static Integer POPUP_LAYER = new Integer (300);
|
|
public static Integer DRAG_LAYER = new Integer (400);
|
|
|
|
TreeMap layers; // Layer Number (Integer) -> Layer Size (Integer)
|
|
Hashtable componentToLayer; // Component -> Layer Number (Integer)
|
|
|
|
JLayeredPane()
|
|
{
|
|
layers = new TreeMap ();
|
|
componentToLayer = new Hashtable ();
|
|
}
|
|
|
|
|
|
/**
|
|
* Looks up the layer a child component is currently assigned to.
|
|
*
|
|
* @param c the component to look up.
|
|
* @return the layer the component is currently assigned to, in this container.
|
|
* @throws IllegalArgumentException if the component is not a child of this container.
|
|
*/
|
|
|
|
protected Integer getLayer (Component c)
|
|
{
|
|
if (! componentToLayer.containsKey (c))
|
|
throw new IllegalArgumentException ();
|
|
return (Integer) componentToLayer.get (c);
|
|
}
|
|
|
|
/**
|
|
* <p>Returns a pair of ints representing a half-open interval
|
|
* <code>[top, bottom)</code>, which is the range of component indices
|
|
* the provided layer number corresponds to.</p>
|
|
*
|
|
* <p>Note that "bottom" is <em>not</em> included in the interval of
|
|
* component indices in this layer: a layer with 0 elements in it has
|
|
* <code>ret[0] == ret[1]</code>.</p>
|
|
*
|
|
* @param layer the layer to look up.
|
|
* @return the half-open range of indices this layer spans.
|
|
* @throws IllegalArgumentException if layer does not refer to an active layer
|
|
* in this container.
|
|
*/
|
|
|
|
protected int[] layerToRange (Integer layer)
|
|
{
|
|
int[] ret = new int[2];
|
|
ret[1] = getComponents ().length;
|
|
Iterator i = layers.entrySet ().iterator ();
|
|
while (i.hasNext())
|
|
{
|
|
Map.Entry pair = (Map.Entry) i.next();
|
|
Integer layerNum = (Integer) pair.getKey ();
|
|
Integer layerSz = (Integer) pair.getValue ();
|
|
if (layerNum == layer)
|
|
{
|
|
ret[0] = ret[1] - layerSz.intValue ();
|
|
return ret;
|
|
}
|
|
else
|
|
{
|
|
ret[1] -= layerSz.intValue ();
|
|
}
|
|
}
|
|
// should have found the layer during iteration
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
|
|
/**
|
|
* Increments the recorded size of a given layer.
|
|
*
|
|
* @param layer the layer number to increment.
|
|
* @see #incrLayer()
|
|
*/
|
|
|
|
protected void incrLayer(Integer layer)
|
|
{
|
|
int sz = 1;
|
|
if (layers.containsKey (layer))
|
|
sz += ((Integer)(layers.get (layer))).intValue ();
|
|
layers.put (layer, new Integer(sz));
|
|
}
|
|
|
|
/**
|
|
* Decrements the recorded size of a given layer.
|
|
*
|
|
* @param layer the layer number to decrement.
|
|
* @see #decrLayer()
|
|
*/
|
|
|
|
protected void decrLayer(Integer layer)
|
|
{
|
|
int sz = 0;
|
|
if (layers.containsKey (layer))
|
|
sz = ((Integer)(layers.get (layer))).intValue () - 1;
|
|
layers.put (layer, new Integer(sz));
|
|
}
|
|
|
|
/**
|
|
* Return the greatest layer number currently in use, in this container.
|
|
* This number may legally be positive <em>or</em> negative.
|
|
*
|
|
* @return the least layer number.
|
|
* @see #lowestLayer()
|
|
*/
|
|
|
|
public int highestLayer()
|
|
{
|
|
if (layers.size() == 0)
|
|
return 0;
|
|
return ((Integer)(layers.lastKey ())).intValue ();
|
|
}
|
|
|
|
/**
|
|
* Return the least layer number currently in use, in this container.
|
|
* This number may legally be positive <em>or</em> negative.
|
|
*
|
|
* @return the least layer number.
|
|
* @see #highestLayer()
|
|
*/
|
|
|
|
public int lowestLayer()
|
|
{
|
|
if (layers.size() == 0)
|
|
return 0;
|
|
return ((Integer)(layers.firstKey ())).intValue ();
|
|
}
|
|
|
|
/**
|
|
* Moves a component to the "front" of its layer. The "front" is a
|
|
* synonym for position 0, which is also the last position drawn in each
|
|
* layer, so is usually the component which occludes the most other
|
|
* components in its layer.
|
|
*
|
|
* @param c the component to move to the front of its layer.
|
|
* @throws IllegalArgumentException if the component is not a child of
|
|
* this container.
|
|
* @see #moveToBack()
|
|
*/
|
|
|
|
public void moveToFront(Component c)
|
|
{
|
|
setPosition (c, 0);
|
|
}
|
|
|
|
/**
|
|
* <p>Moves a component to the "back" of its layer. The "back" is a
|
|
* synonym for position N-1 (also known as position -1), where N is the
|
|
* size of the layer.</p>
|
|
*
|
|
* <p>The "back" of a layer is the first position drawn, so the component at
|
|
* the "back" is usually the component which is occluded by the most
|
|
* other components in its layer.</p>
|
|
*
|
|
* @param c the component to move to the back of its layer.
|
|
* @throws IllegalArgumentException if the component is not a child of
|
|
* this container.
|
|
* @see #moveToFront()
|
|
*/
|
|
|
|
public void moveToBack(Component c)
|
|
{
|
|
setPosition (c, -1);
|
|
}
|
|
|
|
/**
|
|
* Return the position of a component within its layer. Positions are assigned
|
|
* from the "front" (position 0) to the "back" (position N-1), and drawn from
|
|
* the back towards the front.
|
|
*
|
|
* @param c the component to get the position of.
|
|
* @throws IllegalArgumentException if the component is not a child of
|
|
* this container.
|
|
* @see #setPosition()
|
|
*/
|
|
|
|
public int getPosition(Component c)
|
|
{
|
|
Integer layer = getLayer (c);
|
|
int[] range = layerToRange (layer);
|
|
int top = range[0];
|
|
int bot = range[1];
|
|
Component[] comps = getComponents ();
|
|
for (int i = top; i < bot; ++i)
|
|
{
|
|
if (comps[i] == c)
|
|
return i - top;
|
|
}
|
|
// should have found it
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
|
|
/**
|
|
* Change the position of a component within its layer. Positions are assigned
|
|
* from the "front" (position 0) to the "back" (position N-1), and drawn from
|
|
* the back towards the front.
|
|
*
|
|
* @param c the component to change the position of.
|
|
* @param position the position to assign the component to.
|
|
* @throws IllegalArgumentException if the component is not a child of
|
|
* this container.
|
|
* @see #getPosition()
|
|
*/
|
|
|
|
public void setPosition(Component c, int position)
|
|
{
|
|
Integer layer = getLayer (c);
|
|
int[] range = layerToRange (layer);
|
|
if (range[0] == range[1])
|
|
throw new IllegalArgumentException ();
|
|
|
|
int top = range[0];
|
|
int bot = range[1];
|
|
if (position == -1)
|
|
position = (bot - top) - 1;
|
|
int targ = top + position;
|
|
int curr = -1;
|
|
|
|
Component[] comps = getComponents();
|
|
for (int i = top; i < bot; ++i)
|
|
{
|
|
if (comps[i] == c)
|
|
{
|
|
curr = i;
|
|
break;
|
|
}
|
|
}
|
|
if (curr == -1)
|
|
// should have found it
|
|
throw new IllegalArgumentException ();
|
|
|
|
super.swapComponents (curr, targ);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return an array of all components within a layer of this
|
|
* container. Components are ordered front-to-back, with the "front"
|
|
* element (which draws last) at position 0 of the returned array.
|
|
*
|
|
* @param layer the layer to return components from.
|
|
* @return the components in the layer.
|
|
*/
|
|
|
|
public Component[] getComponentsInLayer(int layer)
|
|
{
|
|
int[] range = layerToRange (getObjectForLayer (layer));
|
|
if (range[0] == range[1])
|
|
return new Component[0];
|
|
else
|
|
{
|
|
Component[] comps = getComponents ();
|
|
int sz = range[1] - range[0];
|
|
Component[] nc = new Component[sz];
|
|
for (int i = 0; i < sz; ++i)
|
|
nc[i] = comps[range[0] + i];
|
|
return nc;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return the number of components within a layer of this
|
|
* container.
|
|
*
|
|
* @param layer the layer count components in.
|
|
* @return the number of components in the layer.
|
|
*/
|
|
|
|
public int getComponentCountInLayer(int layer)
|
|
{
|
|
int[] range = layerToRange (getObjectForLayer (layer));
|
|
if (range[0] == range[1])
|
|
return 0;
|
|
else
|
|
return (range[1] - range[0]);
|
|
}
|
|
|
|
/**
|
|
* Return a hashtable mapping child components of this container to
|
|
* Integer objects representing the component's layer assignments.
|
|
*/
|
|
|
|
protected Hashtable getComponentToLayer()
|
|
{
|
|
return componentToLayer;
|
|
}
|
|
|
|
/**
|
|
* Return the index of a component within the underlying (contiguous)
|
|
* array of children. This is a "raw" number which does not represent the
|
|
* child's position in a layer, but rather its position in the logical
|
|
* drawing order of all children of the container.
|
|
*
|
|
* @param c the component to look up.
|
|
* @return the external index of the component.
|
|
* @throws IllegalArgumentException if the component is not a child of
|
|
* this container.
|
|
*/
|
|
|
|
public int getIndexOf(Component c)
|
|
{
|
|
Integer layer = getLayer (c);
|
|
int[] range = layerToRange (layer);
|
|
Component[] comps = getComponents();
|
|
for (int i = range[0]; i < range[1]; ++i)
|
|
{
|
|
if (comps[i] == c)
|
|
return i;
|
|
}
|
|
// should have found the component during iteration
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
|
|
/**
|
|
* Return an Integer object which holds the same int value as the
|
|
* parameter. This is strictly an optimization to minimize the number of
|
|
* identical Integer objects which we allocate.
|
|
*
|
|
* @param layer the layer number as an int.
|
|
* @return the layer number as an Integer, possibly shared.
|
|
*/
|
|
|
|
protected Integer getObjectForLayer(int layer)
|
|
{
|
|
switch (layer)
|
|
{
|
|
case -30000:
|
|
return FRAME_CONTENT_LAYER;
|
|
|
|
case 0:
|
|
return DEFAULT_LAYER;
|
|
|
|
case 100:
|
|
return PALETTE_LAYER;
|
|
|
|
case 200:
|
|
return MODAL_LAYER;
|
|
|
|
case 300:
|
|
return POPUP_LAYER;
|
|
|
|
case 400:
|
|
return DRAG_LAYER;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return new Integer(layer);
|
|
}
|
|
|
|
/**
|
|
* Computes an index at which to request the superclass {@link
|
|
* java.awt.Container} inserts a component, given an abstract layer and
|
|
* position number.
|
|
*
|
|
* @param layer the layer in which to insert a component.
|
|
* @param position the position in the layer at which to insert a component.
|
|
* @return the index at which to insert the component.
|
|
*/
|
|
|
|
protected int insertIndexForLayer(int layer, int position)
|
|
{
|
|
|
|
Integer lobj = getObjectForLayer (layer);
|
|
if (! layers.containsKey(lobj))
|
|
layers.put (lobj, new Integer (0));
|
|
int[] range = layerToRange (lobj);
|
|
if (range[0] == range[1])
|
|
return range[0];
|
|
|
|
int top = range[0];
|
|
int bot = range[1];
|
|
|
|
if (position == -1 || position > (bot - top))
|
|
return bot;
|
|
else
|
|
return top + position;
|
|
}
|
|
|
|
/**
|
|
* Removes a child from this container. The child is specified by
|
|
* index. After removal, the child no longer occupies a layer.
|
|
*
|
|
* @param index the index of the child component to remove.
|
|
*/
|
|
|
|
public void remove (int index)
|
|
{
|
|
Component c = getComponent (index);
|
|
Integer layer = getLayer (c);
|
|
decrLayer (layer);
|
|
componentToLayer.remove (c);
|
|
super.remove (index);
|
|
}
|
|
|
|
/**
|
|
* Removes a child from this container. The child is specified directly.
|
|
* After removal, the child no longer occupies a layer.
|
|
*
|
|
* @param comp the child to remove.
|
|
*/
|
|
|
|
public void remove (Component comp)
|
|
{
|
|
remove (getIndexOf (comp));
|
|
}
|
|
|
|
/**
|
|
* <p>Set the layer property for a component, within this container. The
|
|
* component will be implicitly mapped to the bottom-most position in the
|
|
* layer, but only if added <em>after</em> calling this method.</p>
|
|
*
|
|
* <p>Read that carefully: this method should be called <em>before</em> the
|
|
* component is added to the container.</p>
|
|
*
|
|
* @param c the component to set the layer property for.
|
|
* @param layer the layer number to assign to the component.
|
|
*/
|
|
|
|
public void setLayer(Component c, int layer)
|
|
{
|
|
componentToLayer.put (c, getObjectForLayer (layer));
|
|
}
|
|
|
|
/**
|
|
* Set the layer and position of a component, within this container.
|
|
*
|
|
* @param c the child component to set the layer property for.
|
|
* @param layer the layer number to assign to the component.
|
|
* @param position the position number to assign to the component.
|
|
*/
|
|
|
|
public void setLayer(Component c,
|
|
int layer,
|
|
int position)
|
|
{
|
|
componentToLayer.put (c, getObjectForLayer (layer));
|
|
setPosition(c, position);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Overrides the default implementation from {@link java.awt.Container}
|
|
* such that <code>layerConstraint</code> is interpreted as an {@link
|
|
* Integer}, specifying the layer to which the component will be added
|
|
* (at the bottom position).
|
|
*
|
|
* @param comp the component to add.
|
|
* @param layerConstraint an integer specifying the layer to add the component to.
|
|
* @param index an ignored parameter, for compatibility.
|
|
*/
|
|
|
|
protected void addImpl(Component comp, Object layerConstraint, int index)
|
|
{
|
|
Integer layer;
|
|
if (layerConstraint != null && layerConstraint instanceof Integer)
|
|
layer = (Integer) layerConstraint;
|
|
else if (componentToLayer.containsKey (comp))
|
|
layer = (Integer) componentToLayer.remove (comp);
|
|
else
|
|
layer = DEFAULT_LAYER;
|
|
|
|
int newIdx = insertIndexForLayer(layer.intValue (), index);
|
|
|
|
componentToLayer.put (comp, layer);
|
|
incrLayer (layer);
|
|
|
|
super.addImpl(comp, null, newIdx);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|