[multiple changes]
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
This commit is contained in:
Graydon Hoare
parent
e314a036a8
commit
c5d2de6b4c
97 changed files with 17329 additions and 5544 deletions
|
|
@ -39,34 +39,66 @@ exception statement from your version. */
|
|||
package java.awt;
|
||||
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.awt.event.FocusEvent;
|
||||
import java.beans.PropertyChangeListener;
|
||||
import java.beans.PropertyChangeSupport;
|
||||
import java.beans.PropertyVetoException;
|
||||
import java.beans.VetoableChangeListener;
|
||||
import java.beans.VetoableChangeSupport;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
// FIXME: finish documentation
|
||||
|
||||
/**
|
||||
*
|
||||
* FIXME: discuss applet contexts and thread groups and codebases
|
||||
* being insulated.
|
||||
*
|
||||
* FIXME: discuss where default focus traversal key sets apply
|
||||
* (inherited by child Components etc.)
|
||||
*
|
||||
* @author Eric Blake <ebb9@email.byu.edu>
|
||||
* @author Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||
* @since 1.4
|
||||
* @status partially updated to 1.4, needs documentation.
|
||||
*/
|
||||
public abstract class KeyboardFocusManager
|
||||
implements KeyEventDispatcher, KeyEventPostProcessor
|
||||
{
|
||||
/** Identifies {@link AWTKeyStroke}s that move the focus forward in
|
||||
the focus cycle. */
|
||||
public static final int FORWARD_TRAVERSAL_KEYS = 0;
|
||||
|
||||
/** Identifies {@link AWTKeyStroke}s that move the focus backward in
|
||||
the focus cycle. */
|
||||
public static final int BACKWARD_TRAVERSAL_KEYS = 1;
|
||||
|
||||
/** Identifies {@link AWTKeyStroke}s that move the focus up to the
|
||||
parent focus cycle root. */
|
||||
public static final int UP_CYCLE_TRAVERSAL_KEYS = 2;
|
||||
|
||||
/** Identifies {@link AWTKeyStroke}s that move the focus down to the
|
||||
child focus cycle root. */
|
||||
public static final int DOWN_CYCLE_TRAVERSAL_KEYS = 3;
|
||||
|
||||
/** The set of {@link AWTKeyStroke}s that cause focus to be moved to
|
||||
the next focusable Component in the focus cycle. */
|
||||
private static final Set DEFAULT_FORWARD_KEYS;
|
||||
|
||||
/** The set of {@link AWTKeyStroke}s that cause focus to be moved to
|
||||
the previous focusable Component in the focus cycle. */
|
||||
private static final Set DEFAULT_BACKWARD_KEYS;
|
||||
|
||||
/** Populate the DEFAULT_FORWARD_KEYS and DEFAULT_BACKWARD_KEYS
|
||||
{@link java.util.Set}s. */
|
||||
static
|
||||
{
|
||||
Set s = new HashSet();
|
||||
|
|
@ -83,232 +115,402 @@ public abstract class KeyboardFocusManager
|
|||
DEFAULT_BACKWARD_KEYS = Collections.unmodifiableSet(s);
|
||||
}
|
||||
|
||||
private static KeyboardFocusManager current
|
||||
= new DefaultKeyboardFocusManager();
|
||||
/** The global object {@link java.util.Map}s. */
|
||||
|
||||
// XXX Not implemented correctly. I think a good implementation here may
|
||||
// be to have permanentFocusOwner be null, and fall back to focusOwner,
|
||||
// unless a temporary focus change is in effect.
|
||||
private static Component focusOwner;
|
||||
private static Component permanentFocusOwner;
|
||||
/** For security reasons, {@link java.applet.Applet}s in different
|
||||
codebases must be insulated from one another. Since {@link
|
||||
KeyboardFocusManager}s have the ability to return {@link
|
||||
Component}s from a given {@link java.applet.Applet}, each
|
||||
codebase must have an independent {@link KeyboardFocusManager}.
|
||||
Since each codebase has its own {@link ThreadGroup} in which its
|
||||
{@link Applet}s run, it makes sense to partition {@link
|
||||
KeyboardFocusManager}s according to {@link
|
||||
java.lang.ThreadGroup}. Thus, currentKeyboardFocusManagers is a
|
||||
{@link java.util.Map} keyed on {@link java.lang.ThreadGroup}. */
|
||||
private static Map currentKeyboardFocusManagers = new HashMap ();
|
||||
|
||||
private static Window focusedWindow;
|
||||
private static Window activeWindow;
|
||||
private static Container focusCycleRoot;
|
||||
/** {@link java.applet.Applet}s in one codebase must not be allowed
|
||||
to access {@link Component}s in {@link java.applet.Applet}s in
|
||||
other codebases. To enforce this restriction, we key the
|
||||
following {@link java.util.Map}s on {@link java.lang.ThreadGroup}s (which
|
||||
are per-codebase). For example, if {@link
|
||||
java.lang.ThreadGroup} A calls {@link #setGlobalFocusOwner},
|
||||
passing {@link Component} C, currentFocusOwners[A] is assigned
|
||||
C, and all other currentFocusOwners values are nullified. Then
|
||||
if {@link java.lang.ThreadGroup} A subsequently calls {@link
|
||||
#getGlobalFocusOwner}, it will return currentFocusOwners[A],
|
||||
that is, {@link Component} C. If another {@link
|
||||
java.lang.ThreadGroup} K calls {@link #getGlobalFocusOwner}, it
|
||||
will return currentFocusOwners[K], that is, null.
|
||||
|
||||
Since this is a static field, we ensure that there is only one
|
||||
focused {@link Component} per class loader. */
|
||||
private static Map currentFocusOwners = new HashMap ();
|
||||
|
||||
/** A {@link java.util.Map} keyed on {@link java.lang.ThreadGroup}s
|
||||
that stores the {@link Component} that owns the permanent
|
||||
keyboard focus. @see currentFocusOwners */
|
||||
private static Map currentPermanentFocusOwners = new HashMap ();
|
||||
|
||||
/** A {@link java.util.Map} keyed on {@link java.lang.ThreadGroup}s
|
||||
that stores the focused {@link Window}. @see
|
||||
currentFocusOwners */
|
||||
private static Map currentFocusedWindows = new HashMap ();
|
||||
|
||||
/** A {@link java.util.Map} keyed on {@link java.lang.ThreadGroup}s
|
||||
that stores the active {@link Window}. @see
|
||||
currentFocusOwners */
|
||||
private static Map currentActiveWindows = new HashMap ();
|
||||
|
||||
/** A {@link java.util.Map} keyed on {@link java.lang.ThreadGroup}s
|
||||
that stores the focus cycle root {@link Container}. @see
|
||||
currentFocusOwners */
|
||||
private static Map currentFocusCycleRoots = new HashMap ();
|
||||
|
||||
/** The default {@link FocusTraveralPolicy} that focus-managing
|
||||
{@link Container}s will use to define their initial focus
|
||||
traversal policy. */
|
||||
private FocusTraversalPolicy defaultPolicy;
|
||||
private Set[] defaultFocusKeys = new Set[] {
|
||||
|
||||
/** An array that stores the {@link #FORWARD_TRAVERSAL_KEYS}, {@link
|
||||
#BACKWARD_TRAVERSAL_KEYS}, {@link #UP_CYCLE_TRAVERSAL_KEYS} and
|
||||
{@link #DOWN_CYCLE_TRAVERSAL_KEYS} {@link AWTKeyStroke}s {@link
|
||||
java.util.Set}s. */
|
||||
private Set[] defaultFocusKeys = new Set[]
|
||||
{
|
||||
DEFAULT_FORWARD_KEYS, DEFAULT_BACKWARD_KEYS,
|
||||
Collections.EMPTY_SET, Collections.EMPTY_SET
|
||||
};
|
||||
|
||||
private final PropertyChangeSupport propertyChangeSupport
|
||||
= new PropertyChangeSupport(this);
|
||||
private final VetoableChangeSupport vetoableChangeSupport
|
||||
= new VetoableChangeSupport(this);
|
||||
private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport (this);
|
||||
private final VetoableChangeSupport vetoableChangeSupport = new VetoableChangeSupport (this);
|
||||
|
||||
/** A list of {@link KeyEventDispatcher}s that process {@link
|
||||
KeyEvent}s before they are processed the default keyboard focus
|
||||
manager. */
|
||||
private final ArrayList keyEventDispatchers = new ArrayList();
|
||||
|
||||
/** A list of {@link KeyEventPostProcessor}s that process unconsumed
|
||||
{@link KeyEvent}s. */
|
||||
private final ArrayList keyEventPostProcessors = new ArrayList();
|
||||
|
||||
|
||||
public KeyboardFocusManager()
|
||||
/**
|
||||
* Construct a KeyboardFocusManager.
|
||||
*/
|
||||
public KeyboardFocusManager ()
|
||||
{
|
||||
}
|
||||
|
||||
public static KeyboardFocusManager getCurrentKeyboardFocusManager()
|
||||
/**
|
||||
* Retrieve the keyboard focus manager associated with the {@link
|
||||
* java.lang.ThreadGroup} to which the calling thread belongs.
|
||||
*
|
||||
* @return the keyboard focus manager associated with the current
|
||||
* thread group
|
||||
*/
|
||||
public static KeyboardFocusManager getCurrentKeyboardFocusManager ()
|
||||
{
|
||||
// XXX Need a way to divide this into contexts.
|
||||
return current;
|
||||
ThreadGroup currentGroup = Thread.currentThread ().getThreadGroup ();
|
||||
return (KeyboardFocusManager) currentKeyboardFocusManagers.get (currentGroup);
|
||||
}
|
||||
|
||||
public static void setCurrentKeyboardFocusManager(KeyboardFocusManager m)
|
||||
/**
|
||||
* Set the keyboard focus manager associated with the {@link
|
||||
* java.lang.ThreadGroup} to which the calling thread belongs.
|
||||
*
|
||||
* @param m the keyboard focus manager for the current thread group
|
||||
*/
|
||||
public static void setCurrentKeyboardFocusManager (KeyboardFocusManager m)
|
||||
{
|
||||
SecurityManager sm = System.getSecurityManager();
|
||||
SecurityManager sm = System.getSecurityManager ();
|
||||
if (sm != null)
|
||||
sm.checkPermission(new AWTPermission("replaceKeyboardFocusManager"));
|
||||
// XXX Need a way to divide this into contexts.
|
||||
current = m == null ? new DefaultKeyboardFocusManager() : m;
|
||||
sm.checkPermission (new AWTPermission ("replaceKeyboardFocusManager"));
|
||||
|
||||
ThreadGroup currentGroup = Thread.currentThread ().getThreadGroup ();
|
||||
KeyboardFocusManager manager;
|
||||
|
||||
if (m == null)
|
||||
manager = new DefaultKeyboardFocusManager ();
|
||||
else
|
||||
manager = m;
|
||||
|
||||
currentKeyboardFocusManagers.put (currentGroup, manager);
|
||||
}
|
||||
|
||||
public Component getFocusOwner()
|
||||
/**
|
||||
* Retrieve the {@link Component} that has the keyboard focus, or
|
||||
* null if the focus owner was not set by a thread in the current
|
||||
* {@link java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the keyboard focus owner or null
|
||||
*/
|
||||
public Component getFocusOwner ()
|
||||
{
|
||||
// XXX Need an easy way to test if this thread is in the context of the
|
||||
// global focus owner, to avoid creating the exception in the first place.
|
||||
try
|
||||
{
|
||||
return getGlobalFocusOwner();
|
||||
}
|
||||
catch (SecurityException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return (Component) getObject (currentFocusOwners);
|
||||
}
|
||||
|
||||
protected Component getGlobalFocusOwner()
|
||||
/**
|
||||
* Retrieve the {@link Component} that has the keyboard focus,
|
||||
* regardless of whether or not it was set by a thread in the
|
||||
* current {@link java.lang.ThreadGroup}. If there is no temporary
|
||||
* focus owner in effect then this method will return the same value
|
||||
* as {@link #getGlobalPermanentFocusOwner}.
|
||||
*
|
||||
* @return the keyboard focus owner
|
||||
* @throws SecurityException if this is not the keyboard focus
|
||||
* manager associated with the current {@link java.lang.ThreadGroup}
|
||||
*/
|
||||
protected Component getGlobalFocusOwner ()
|
||||
{
|
||||
// XXX Need a way to test if this thread is in the context of the focus
|
||||
// owner, and throw a SecurityException if that is the case.
|
||||
// XXX Implement.
|
||||
return focusOwner;
|
||||
// Check if there is a temporary focus owner.
|
||||
Component focusOwner = (Component) getGlobalObject (currentFocusOwners);
|
||||
|
||||
return (focusOwner == null) ? getGlobalPermanentFocusOwner () : focusOwner;
|
||||
}
|
||||
|
||||
protected void setGlobalFocusOwner(Component owner)
|
||||
/**
|
||||
* Set the {@link Component} that will be returned by {@link
|
||||
* #getFocusOwner} (when it is called from the current {@link
|
||||
* java.lang.ThreadGroup}) and {@link #getGlobalFocusOwner}. This
|
||||
* method does not actually transfer the keyboard focus.
|
||||
*
|
||||
* @param owner the Component to return from getFocusOwner and
|
||||
* getGlobalFocusOwner
|
||||
*
|
||||
* @see Component.requestFocus ()
|
||||
* @see Component.requestFocusInWindow ()
|
||||
*/
|
||||
protected void setGlobalFocusOwner (Component owner)
|
||||
{
|
||||
// XXX Should this send focus events to the components involved?
|
||||
if (owner == null || owner.focusable)
|
||||
setGlobalObject (currentFocusOwners, owner, "focusOwner");
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear the global focus owner and deliver a FOCUS_LOST event to
|
||||
* the previously-focused {@link Component}. Until another {@link
|
||||
* Component} becomes the keyboard focus owner, key events will be
|
||||
* discarded by top-level windows.
|
||||
*/
|
||||
public void clearGlobalFocusOwner ()
|
||||
{
|
||||
synchronized (currentFocusOwners)
|
||||
{
|
||||
firePropertyChange("focusOwner", focusOwner, owner);
|
||||
try
|
||||
Component focusOwner = getGlobalFocusOwner ();
|
||||
Component permanentFocusOwner = getGlobalPermanentFocusOwner ();
|
||||
|
||||
setGlobalFocusOwner (null);
|
||||
setGlobalPermanentFocusOwner (null);
|
||||
|
||||
// Inform the old focus owner that it has lost permanent
|
||||
// focus.
|
||||
if (focusOwner != null)
|
||||
{
|
||||
fireVetoableChange("focusOwner", focusOwner, owner);
|
||||
focusOwner = owner;
|
||||
// We can't cache the event queue, because of
|
||||
// bootstrapping issues. We need to set the default
|
||||
// KeyboardFocusManager in EventQueue before the event
|
||||
// queue is started.
|
||||
EventQueue q = Toolkit.getDefaultToolkit ().getSystemEventQueue ();
|
||||
if (focusOwner != permanentFocusOwner)
|
||||
q.postEvent (new FocusEvent (focusOwner, FocusEvent.FOCUS_LOST, true));
|
||||
else
|
||||
q.postEvent (new FocusEvent (focusOwner, FocusEvent.FOCUS_LOST, false));
|
||||
}
|
||||
catch (PropertyVetoException e)
|
||||
|
||||
if (focusOwner != permanentFocusOwner)
|
||||
{
|
||||
EventQueue q = Toolkit.getDefaultToolkit ().getSystemEventQueue ();
|
||||
q.postEvent (new FocusEvent (permanentFocusOwner, FocusEvent.FOCUS_LOST, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void clearGlobalFocusOwner()
|
||||
/**
|
||||
* Retrieve the {@link Component} that has the permanent keyboard
|
||||
* focus, or null if the focus owner was not set by a thread in the
|
||||
* current {@link java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the keyboard focus owner or null
|
||||
*/
|
||||
public Component getPermanentFocusOwner ()
|
||||
{
|
||||
// XXX Is this enough?
|
||||
setGlobalFocusOwner(null);
|
||||
return (Component) getObject (currentPermanentFocusOwners);
|
||||
}
|
||||
|
||||
public Component getPermanentFocusOwner()
|
||||
/**
|
||||
* Retrieve the {@link Component} that has the permanent keyboard
|
||||
* focus, regardless of whether or not it was set by a thread in the
|
||||
* current {@link java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the keyboard focus owner
|
||||
* @throws SecurityException if this is not the keyboard focus
|
||||
* manager associated with the current {@link java.lang.ThreadGroup}
|
||||
*/
|
||||
protected Component getGlobalPermanentFocusOwner ()
|
||||
{
|
||||
// XXX Need an easy way to test if this thread is in the context of the
|
||||
// global focus owner, to avoid creating the exception in the first place.
|
||||
try
|
||||
{
|
||||
return getGlobalPermanentFocusOwner();
|
||||
}
|
||||
catch (SecurityException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return (Component) getGlobalObject (currentPermanentFocusOwners);
|
||||
}
|
||||
|
||||
protected Component getGlobalPermanentFocusOwner()
|
||||
/**
|
||||
* Set the {@link Component} that will be returned by {@link
|
||||
* #getPermanentFocusOwner} (when it is called from the current
|
||||
* {@link java.lang.ThreadGroup}) and {@link
|
||||
* #getGlobalPermanentFocusOwner}. This method does not actually
|
||||
* transfer the keyboard focus.
|
||||
*
|
||||
* @param focusOwner the Component to return from
|
||||
* getPermanentFocusOwner and getGlobalPermanentFocusOwner
|
||||
*
|
||||
* @see Component.requestFocus ()
|
||||
* @see Component.requestFocusInWindow ()
|
||||
*/
|
||||
protected void setGlobalPermanentFocusOwner (Component focusOwner)
|
||||
{
|
||||
// XXX Need a way to test if this thread is in the context of the focus
|
||||
// owner, and throw a SecurityException if that is the case.
|
||||
// XXX Implement.
|
||||
return permanentFocusOwner == null ? focusOwner : permanentFocusOwner;
|
||||
}
|
||||
|
||||
protected void setGlobalPermanentFocusOwner(Component focusOwner)
|
||||
{
|
||||
// XXX Should this send focus events to the components involved?
|
||||
if (focusOwner == null || focusOwner.focusable)
|
||||
{
|
||||
firePropertyChange("permanentFocusOwner", permanentFocusOwner,
|
||||
focusOwner);
|
||||
try
|
||||
{
|
||||
fireVetoableChange("permanentFocusOwner", permanentFocusOwner,
|
||||
focusOwner);
|
||||
permanentFocusOwner = focusOwner;
|
||||
}
|
||||
catch (PropertyVetoException e)
|
||||
{
|
||||
}
|
||||
}
|
||||
setGlobalObject (currentPermanentFocusOwners, focusOwner,
|
||||
"permanentFocusOwner");
|
||||
}
|
||||
|
||||
public Window getFocusedWindow()
|
||||
/**
|
||||
* Retrieve the {@link Window} that is or contains the keyboard
|
||||
* focus owner, or null if the focused window was not set by a
|
||||
* thread in the current {@link java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the focused window or null
|
||||
*/
|
||||
public Window getFocusedWindow ()
|
||||
{
|
||||
// XXX Need an easy way to test if this thread is in the context of the
|
||||
// global focus owner, to avoid creating the exception in the first place.
|
||||
try
|
||||
{
|
||||
return getGlobalFocusedWindow();
|
||||
}
|
||||
catch (SecurityException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return (Window) getObject (currentFocusedWindows);
|
||||
}
|
||||
|
||||
protected Window getGlobalFocusedWindow()
|
||||
/**
|
||||
* Retrieve the {@link Window} that is or contains the focus owner,
|
||||
* regardless of whether or not the {@link Window} was set focused
|
||||
* by a thread in the current {@link java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the focused window
|
||||
* @throws SecurityException if this is not the keyboard focus
|
||||
* manager associated with the current {@link java.lang.ThreadGroup}
|
||||
*/
|
||||
protected Window getGlobalFocusedWindow ()
|
||||
{
|
||||
// XXX Need a way to test if this thread is in the context of the focus
|
||||
// owner, and throw a SecurityException if that is the case.
|
||||
// XXX Implement.
|
||||
return focusedWindow;
|
||||
return (Window) getGlobalObject (currentFocusedWindows);
|
||||
}
|
||||
|
||||
protected void setGlobalFocusedWindow(Window window)
|
||||
/**
|
||||
* Set the {@link Window} that will be returned by {@link
|
||||
* #getFocusedWindow} (when it is called from the current {@link
|
||||
* java.lang.ThreadGroup}) and {@link #getGlobalFocusedWindow}.
|
||||
* This method does not actually cause <code>window</code> to become
|
||||
* the focused {@link Window}.
|
||||
*
|
||||
* @param window the Window to return from getFocusedWindow and
|
||||
* getGlobalFocusedWindow
|
||||
*/
|
||||
protected void setGlobalFocusedWindow (Window window)
|
||||
{
|
||||
// XXX Should this send focus events to the windows involved?
|
||||
if (window == null || window.focusable)
|
||||
{
|
||||
firePropertyChange("focusedWindow", focusedWindow, window);
|
||||
try
|
||||
{
|
||||
fireVetoableChange("focusedWindow", focusedWindow, window);
|
||||
focusedWindow = window;
|
||||
}
|
||||
catch (PropertyVetoException e)
|
||||
{
|
||||
}
|
||||
}
|
||||
setGlobalObject (currentFocusedWindows, window, "focusedWindow");
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the active {@link Window}, or null if the active window
|
||||
* was not set by a thread in the current {@link
|
||||
* java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the active window or null
|
||||
*/
|
||||
public Window getActiveWindow()
|
||||
{
|
||||
// XXX Need an easy way to test if this thread is in the context of the
|
||||
// global focus owner, to avoid creating the exception in the first place.
|
||||
try
|
||||
{
|
||||
return getGlobalActiveWindow();
|
||||
}
|
||||
catch (SecurityException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return (Window) getObject (currentActiveWindows);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the active {@link Window}, regardless of whether or not
|
||||
* the {@link Window} was made active by a thread in the current
|
||||
* {@link java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the active window
|
||||
* @throws SecurityException if this is not the keyboard focus
|
||||
* manager associated with the current {@link java.lang.ThreadGroup}
|
||||
*/
|
||||
protected Window getGlobalActiveWindow()
|
||||
{
|
||||
// XXX Need a way to test if this thread is in the context of the focus
|
||||
// owner, and throw a SecurityException if that is the case.
|
||||
// XXX Implement.
|
||||
return activeWindow;
|
||||
return (Window) getGlobalObject (currentActiveWindows);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the {@link Window} that will be returned by {@link
|
||||
* #getActiveWindow} (when it is called from the current {@link
|
||||
* java.lang.ThreadGroup}) and {@link #getGlobalActiveWindow}. This
|
||||
* method does not actually cause <code>window</code> to be made
|
||||
* active.
|
||||
*
|
||||
* @param window the Window to return from getActiveWindow and
|
||||
* getGlobalActiveWindow
|
||||
*/
|
||||
protected void setGlobalActiveWindow(Window window)
|
||||
{
|
||||
// XXX Should this send focus events to the windows involved?
|
||||
firePropertyChange("activeWindow", activeWindow, window);
|
||||
try
|
||||
{
|
||||
fireVetoableChange("activeWindow", activeWindow, window);
|
||||
activeWindow = window;
|
||||
}
|
||||
catch (PropertyVetoException e)
|
||||
{
|
||||
}
|
||||
setGlobalObject (currentActiveWindows, window, "activeWindow");
|
||||
}
|
||||
|
||||
public FocusTraversalPolicy getDefaultFocusTraversalPolicy()
|
||||
/**
|
||||
* Retrieve the default {@link FocusTraversalPolicy}.
|
||||
* Focus-managing {@link Container}s use the returned object to
|
||||
* define their initial focus traversal policy.
|
||||
*
|
||||
* @return a non-null default FocusTraversalPolicy object
|
||||
*/
|
||||
public FocusTraversalPolicy getDefaultFocusTraversalPolicy ()
|
||||
{
|
||||
if (defaultPolicy == null)
|
||||
defaultPolicy = new DefaultFocusTraversalPolicy();
|
||||
defaultPolicy = new DefaultFocusTraversalPolicy ();
|
||||
return defaultPolicy;
|
||||
}
|
||||
|
||||
public void setDefaultFocusTraversalPolicy(FocusTraversalPolicy policy)
|
||||
/**
|
||||
* Set the {@link FocusTraversalPolicy} returned by {@link
|
||||
* #getDefaultFocusTraversalPolicy}. Focus-managing {@link
|
||||
* Container}s created after this call will use policy as their
|
||||
* initial focus traversal policy. Existing {@link Container}s'
|
||||
* focus traversal policies will not be affected by calls to this
|
||||
* method.
|
||||
*
|
||||
* @param policy the FocusTraversalPolicy that will be returned by
|
||||
* subsequent calls to getDefaultFocusTraversalPolicy
|
||||
* @throws IllegalArgumentException if policy is null
|
||||
*/
|
||||
public void setDefaultFocusTraversalPolicy (FocusTraversalPolicy policy)
|
||||
{
|
||||
if (policy == null)
|
||||
throw new IllegalArgumentException();
|
||||
firePropertyChange("defaultFocusTraversalPolicy", defaultPolicy, policy);
|
||||
throw new IllegalArgumentException ();
|
||||
firePropertyChange ("defaultFocusTraversalPolicy", defaultPolicy, policy);
|
||||
defaultPolicy = policy;
|
||||
}
|
||||
|
||||
public void setDefaultFocusTraversalKeys(int id, Set keystrokes)
|
||||
/**
|
||||
* Set the default {@link java.util.Set} of focus traversal keys for
|
||||
* one of the focus traversal directions.
|
||||
*
|
||||
* @param id focus traversal direction identifier
|
||||
* @param keystrokes set of AWTKeyStrokes
|
||||
*
|
||||
* @see #FORWARD_TRAVERSAL_KEYS
|
||||
* @see #BACKWARD_TRAVERSAL_KEYS
|
||||
* @see #UP_CYCLE_TRAVERSAL_KEYS
|
||||
* @see #DOWN_CYCLE_TRAVERSAL_KEYS
|
||||
*/
|
||||
public void setDefaultFocusTraversalKeys (int id, Set keystrokes)
|
||||
{
|
||||
if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS &&
|
||||
id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS &&
|
||||
id != KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS &&
|
||||
id != KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS)
|
||||
throw new IllegalArgumentException ();
|
||||
|
||||
if (keystrokes == null)
|
||||
throw new IllegalArgumentException();
|
||||
throw new IllegalArgumentException ();
|
||||
|
||||
Set sa;
|
||||
Set sb;
|
||||
Set sc;
|
||||
|
|
@ -340,56 +542,82 @@ public abstract class KeyboardFocusManager
|
|||
type = "downCycleDefaultFocusTraversalKeys";
|
||||
break;
|
||||
default:
|
||||
throw new IllegalArgumentException();
|
||||
throw new IllegalArgumentException ();
|
||||
}
|
||||
int i = keystrokes.size();
|
||||
Iterator iter = keystrokes.iterator();
|
||||
int i = keystrokes.size ();
|
||||
Iterator iter = keystrokes.iterator ();
|
||||
while (--i >= 0)
|
||||
{
|
||||
Object o = iter.next();
|
||||
if (! (o instanceof AWTKeyStroke)
|
||||
|| sa.contains(o) || sb.contains(o) || sc.contains(o)
|
||||
Object o = iter.next ();
|
||||
if (!(o instanceof AWTKeyStroke)
|
||||
|| sa.contains (o) || sb.contains (o) || sc.contains (o)
|
||||
|| ((AWTKeyStroke) o).keyCode == KeyEvent.VK_UNDEFINED)
|
||||
throw new IllegalArgumentException();
|
||||
throw new IllegalArgumentException ();
|
||||
}
|
||||
keystrokes = Collections.unmodifiableSet(new HashSet(keystrokes));
|
||||
firePropertyChange(type, defaultFocusKeys[id], keystrokes);
|
||||
keystrokes = Collections.unmodifiableSet (new HashSet (keystrokes));
|
||||
firePropertyChange (type, defaultFocusKeys[id], keystrokes);
|
||||
defaultFocusKeys[id] = keystrokes;
|
||||
}
|
||||
|
||||
public Set getDefaultFocusTraversalKeys(int id)
|
||||
/**
|
||||
* Retrieve the default {@link java.util.Set} of focus traversal
|
||||
* keys for one of the focus traversal directions.
|
||||
*
|
||||
* @param id focus traversal direction identifier
|
||||
*
|
||||
* @return the default set of AWTKeyStrokes
|
||||
*
|
||||
* @see #FORWARD_TRAVERSAL_KEYS
|
||||
* @see #BACKWARD_TRAVERSAL_KEYS
|
||||
* @see #UP_CYCLE_TRAVERSAL_KEYS
|
||||
* @see #DOWN_CYCLE_TRAVERSAL_KEYS
|
||||
*/
|
||||
public Set getDefaultFocusTraversalKeys (int id)
|
||||
{
|
||||
if (id < FORWARD_TRAVERSAL_KEYS || id > DOWN_CYCLE_TRAVERSAL_KEYS)
|
||||
throw new IllegalArgumentException();
|
||||
throw new IllegalArgumentException ();
|
||||
return defaultFocusKeys[id];
|
||||
}
|
||||
|
||||
public Container getCurrentFocusCycleRoot()
|
||||
/**
|
||||
* Retrieve the current focus cycle root, or null if the focus owner
|
||||
* was not set by a thread in the current {@link
|
||||
* java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the current focus cycle root or null
|
||||
*/
|
||||
public Container getCurrentFocusCycleRoot ()
|
||||
{
|
||||
// XXX Need an easy way to test if this thread is in the context of the
|
||||
// global focus owner, to avoid creating the exception in the first place.
|
||||
try
|
||||
{
|
||||
return getGlobalCurrentFocusCycleRoot();
|
||||
}
|
||||
catch (SecurityException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return (Container) getObject (currentFocusCycleRoots);
|
||||
}
|
||||
|
||||
protected Container getGlobalCurrentFocusCycleRoot()
|
||||
/**
|
||||
* Retrieve the current focus cycle root, regardless of whether or
|
||||
* not it was made set by a thread in the current {@link
|
||||
* java.lang.ThreadGroup}.
|
||||
*
|
||||
* @return the current focus cycle root
|
||||
* @throws SecurityException if this is not the keyboard focus
|
||||
* manager associated with the current {@link java.lang.ThreadGroup}
|
||||
*/
|
||||
protected Container getGlobalCurrentFocusCycleRoot ()
|
||||
{
|
||||
// XXX Need a way to test if this thread is in the context of the focus
|
||||
// owner, and throw a SecurityException if that is the case.
|
||||
// XXX Implement.
|
||||
return focusCycleRoot;
|
||||
return (Container) getGlobalObject (currentFocusCycleRoots);
|
||||
}
|
||||
|
||||
public void setGlobalCurrentFocusCycleRoot(Container cycleRoot)
|
||||
/**
|
||||
* Set the {@link Container} that will be returned by {@link
|
||||
* #getCurrentFocusCycleRoot} (when it is called from the current
|
||||
* {@link java.lang.ThreadGroup}) and {@link
|
||||
* #getGlobalCurrentFocusCycleRoot}. This method does not actually
|
||||
* make <code>cycleRoot</code> the current focus cycle root.
|
||||
*
|
||||
* @param cycleRoot the focus cycle root to return from
|
||||
* getCurrentFocusCycleRoot and getGlobalCurrentFocusCycleRoot
|
||||
*/
|
||||
public void setGlobalCurrentFocusCycleRoot (Container cycleRoot)
|
||||
{
|
||||
firePropertyChange("currentFocusCycleRoot", focusCycleRoot, cycleRoot);
|
||||
focusCycleRoot = cycleRoot;
|
||||
setGlobalObject (currentFocusCycleRoots, cycleRoot, "currentFocusCycleRoot");
|
||||
}
|
||||
|
||||
public void addPropertyChangeListener(PropertyChangeListener l)
|
||||
|
|
@ -484,73 +712,196 @@ public abstract class KeyboardFocusManager
|
|||
keyEventDispatchers.remove(dispatcher);
|
||||
}
|
||||
|
||||
protected List getKeyEventDispatchers()
|
||||
protected List getKeyEventDispatchers ()
|
||||
{
|
||||
return (List) keyEventDispatchers.clone();
|
||||
return (List) keyEventDispatchers.clone ();
|
||||
}
|
||||
|
||||
public void addKeyEventPostProcessor(KeyEventPostProcessor postProcessor)
|
||||
public void addKeyEventPostProcessor (KeyEventPostProcessor postProcessor)
|
||||
{
|
||||
if (postProcessor != null)
|
||||
keyEventPostProcessors.add(postProcessor);
|
||||
keyEventPostProcessors.add (postProcessor);
|
||||
}
|
||||
|
||||
public void removeKeyEventPostProcessor(KeyEventPostProcessor postProcessor)
|
||||
public void removeKeyEventPostProcessor (KeyEventPostProcessor postProcessor)
|
||||
{
|
||||
keyEventPostProcessors.remove(postProcessor);
|
||||
keyEventPostProcessors.remove (postProcessor);
|
||||
}
|
||||
|
||||
protected List getKeyEventPostProcessors()
|
||||
protected List getKeyEventPostProcessors ()
|
||||
{
|
||||
return (List) keyEventPostProcessors.clone();
|
||||
return (List) keyEventPostProcessors.clone ();
|
||||
}
|
||||
|
||||
public abstract boolean dispatchEvent(AWTEvent e);
|
||||
public abstract boolean dispatchEvent (AWTEvent e);
|
||||
|
||||
public final void redispatchEvent(Component target, AWTEvent e)
|
||||
public final void redispatchEvent (Component target, AWTEvent e)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
e.setSource (target);
|
||||
dispatchEvent (e);
|
||||
}
|
||||
|
||||
public abstract boolean dispatchKeyEvent(KeyEvent e);
|
||||
public abstract boolean dispatchKeyEvent (KeyEvent e);
|
||||
|
||||
public abstract boolean postProcessKeyEvent(KeyEvent e);
|
||||
public abstract boolean postProcessKeyEvent (KeyEvent e);
|
||||
|
||||
public abstract void processKeyEvent(Component focused, KeyEvent e);
|
||||
public abstract void processKeyEvent (Component focused, KeyEvent e);
|
||||
|
||||
protected abstract void enqueueKeyEvents(long after, Component untilFocused);
|
||||
protected abstract void enqueueKeyEvents (long after, Component untilFocused);
|
||||
|
||||
protected abstract void dequeueKeyEvents(long after, Component untilFocused);
|
||||
protected abstract void dequeueKeyEvents (long after, Component untilFocused);
|
||||
|
||||
protected abstract void discardKeyEvents(Component comp);
|
||||
protected abstract void discardKeyEvents (Component comp);
|
||||
|
||||
public abstract void focusNextComponent(Component comp);
|
||||
public abstract void focusNextComponent (Component comp);
|
||||
|
||||
public abstract void focusPreviousComponent(Component comp);
|
||||
public abstract void focusPreviousComponent (Component comp);
|
||||
|
||||
public abstract void upFocusCycle(Component comp);
|
||||
public abstract void upFocusCycle (Component comp);
|
||||
|
||||
public abstract void downFocusCycle(Container cont);
|
||||
public abstract void downFocusCycle (Container cont);
|
||||
|
||||
public final void focusNextComponent()
|
||||
public final void focusNextComponent ()
|
||||
{
|
||||
focusNextComponent(focusOwner);
|
||||
focusNextComponent (null);
|
||||
}
|
||||
|
||||
public final void focusPreviousComponent()
|
||||
public final void focusPreviousComponent ()
|
||||
{
|
||||
focusPreviousComponent(focusOwner);
|
||||
focusPreviousComponent (null);
|
||||
}
|
||||
|
||||
public final void upFocusCycle()
|
||||
public final void upFocusCycle ()
|
||||
{
|
||||
upFocusCycle(focusOwner);
|
||||
upFocusCycle (null);
|
||||
}
|
||||
|
||||
public final void downFocusCycle()
|
||||
public final void downFocusCycle ()
|
||||
{
|
||||
Component focusOwner = getGlobalFocusOwner ();
|
||||
if (focusOwner instanceof Container
|
||||
&& ((Container) focusOwner).isFocusCycleRoot())
|
||||
downFocusCycle((Container) focusOwner);
|
||||
&& ((Container) focusOwner).isFocusCycleRoot ())
|
||||
downFocusCycle ((Container) focusOwner);
|
||||
}
|
||||
} // class KeyboardFocusManager
|
||||
|
||||
/**
|
||||
* Retrieve an object from one of the global object {@link
|
||||
* java.util.Map}s, if the object was set by the a thread in the
|
||||
* current {@link java.lang.ThreadGroup}. Otherwise, return null.
|
||||
*
|
||||
* @param globalMap one of the global object Maps
|
||||
*
|
||||
* @return a global object set by the current ThreadGroup, or null
|
||||
*
|
||||
* @see getFocusOwner
|
||||
* @see getPermanentFocusOwner
|
||||
* @see getFocusedWindow
|
||||
* @see getActiveWindow
|
||||
* @see getCurrentFocusCycleRoot
|
||||
*/
|
||||
private Object getObject (Map globalMap)
|
||||
{
|
||||
ThreadGroup currentGroup = Thread.currentThread ().getThreadGroup ();
|
||||
return globalMap.get (currentGroup);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve an object from one of the global object {@link
|
||||
* java.util.Map}s, regardless of whether or not the object was set
|
||||
* by a thread in the current {@link java.lang.ThreadGroup}.
|
||||
*
|
||||
* @param globalMap one of the global object Maps
|
||||
*
|
||||
* @return a global object set by the current ThreadGroup, or null
|
||||
*
|
||||
* @throws SecurityException if this is not the keyboard focus
|
||||
* manager associated with the current {@link java.lang.ThreadGroup}
|
||||
*
|
||||
* @see getGlobalFocusOwner
|
||||
* @see getGlobalPermanentFocusOwner
|
||||
* @see getGlobalFocusedWindow
|
||||
* @see getGlobalActiveWindow
|
||||
* @see getGlobalCurrentFocusCycleRoot
|
||||
*/
|
||||
private Object getGlobalObject (Map globalMap)
|
||||
{
|
||||
ThreadGroup currentGroup = Thread.currentThread ().getThreadGroup ();
|
||||
KeyboardFocusManager managerForCallingThread
|
||||
= (KeyboardFocusManager) currentKeyboardFocusManagers.get (currentGroup);
|
||||
|
||||
if (this != managerForCallingThread)
|
||||
throw new SecurityException ("Attempted to retrieve an object from a "
|
||||
+ "keyboard focus manager that isn't "
|
||||
+ "associated with the current thread group.");
|
||||
|
||||
synchronized (globalMap)
|
||||
{
|
||||
Collection globalObjects = globalMap.values ();
|
||||
Iterator i = globalObjects.iterator ();
|
||||
Component globalObject;
|
||||
|
||||
while (i.hasNext ())
|
||||
{
|
||||
globalObject = (Component) i.next ();
|
||||
if (globalObject != null)
|
||||
return globalObject;
|
||||
}
|
||||
}
|
||||
|
||||
// No Object was found.
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set an object in one of the global object {@link java.util.Map}s,
|
||||
* that will be returned by subsequent calls to getGlobalObject on
|
||||
* the same {@link java.util.Map}.
|
||||
*
|
||||
* @param globalMap one of the global object Maps
|
||||
* @param newObject the object to set
|
||||
* @param property the property that will change
|
||||
*
|
||||
* @see setGlobalFocusOwner
|
||||
* @see setGlobalPermanentFocusOwner
|
||||
* @see setGlobalFocusedWindow
|
||||
* @see setGlobalActiveWindow
|
||||
* @see setGlobalCurrentFocusCycleRoot
|
||||
*/
|
||||
private void setGlobalObject (Map globalMap,
|
||||
Object newObject,
|
||||
String property)
|
||||
{
|
||||
synchronized (globalMap)
|
||||
{
|
||||
// Save old object.
|
||||
Object oldObject = getGlobalObject (globalMap);
|
||||
|
||||
// Nullify old object.
|
||||
Collection threadGroups = globalMap.keySet ();
|
||||
Iterator i = threadGroups.iterator ();
|
||||
while (i.hasNext ())
|
||||
{
|
||||
ThreadGroup oldThreadGroup = (ThreadGroup) i.next ();
|
||||
if (globalMap.get (oldThreadGroup) != null)
|
||||
{
|
||||
globalMap.put (oldThreadGroup, null);
|
||||
// There should only be one object set at a time, so
|
||||
// we can short circuit.
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ThreadGroup currentGroup = Thread.currentThread ().getThreadGroup ();
|
||||
firePropertyChange (property, oldObject, newObject);
|
||||
try
|
||||
{
|
||||
fireVetoableChange (property, oldObject, newObject);
|
||||
// Set new object.
|
||||
globalMap.put (currentGroup, newObject);
|
||||
}
|
||||
catch (PropertyVetoException e)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue