2005-02-15 Mark Wielaard <mark@klomp.org> * java/awt/BasicStroke.java (hashCode): Check for null dash. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkArg.java, gnu/java/awt/peer/gtk/GtkArgList.java: Removed. 2005-02-15 Craig Black <craig.black@aonix.com> * gnu/java/awt/peer/gtk/GtkCheckboxMenuItem.java (postMenuActionEvent): Implement to notify ItemListeners. * java/awt/CheckboxMenuItem.java (dispatchEventImpl): Update state on ItemEvent. * java/awt/MenuItem.java (processActionEvent): Retarget event source. 2005-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/awt/color/ClutProfileConverter.java, gnu/java/awt/peer/ClasspathTextLayoutPeer.java, gnu/java/awt/peer/gtk/GdkFontPeer.java, gnu/java/awt/peer/gtk/GdkGlyphVector.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, gnu/java/awt/peer/gtk/GdkRobotPeer.java, gnu/java/awt/peer/gtk/GdkTextLayout.java, gnu/java/awt/peer/gtk/GtkButtonPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, gnu/java/awt/peer/gtk/GtkChoicePeer.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, gnu/java/awt/peer/gtk/GtkContainerPeer.java, gnu/java/awt/peer/gtk/GtkDialogPeer.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, gnu/java/awt/peer/gtk/GtkFontPeer.java, gnu/java/awt/peer/gtk/GtkFramePeer.java, gnu/java/awt/peer/gtk/GtkLabelPeer.java, gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkScrollPanePeer.java, gnu/java/awt/peer/gtk/GtkTextComponentPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java, javax/swing/JPopupMenu.java, javax/swing/JSpinner.java, javax/swing/SortingFocusTraversalPolicy.java, javax/swing/SwingUtilities.java, javax/swing/plaf/basic/BasicComboBoxEditor.java, javax/swing/plaf/basic/BasicComboBoxRenderer.java, javax/swing/tree/DefaultMutableTreeNode.java: Removed unused imports and expanded starred imports. 2005-02-15 Mark Wielaard <mark@klomp.org> * java/awt/AWTKeyStroke.java (getAWTKeyStroke(String)): Throw IllegalArgumentException when the given String is null. * javax/swing/KeyStroke.java (getKeyStroke(String)): Return null when given keystoke sequence cannot be parsed. * javax/swing/JRootPane.java (setJMenuBar): Remove current menubar if one is installed. Only install the given menubar is not null. * javax/swing/JViewport.java (getViewSize): Return an empty Dimension when the view isn't set or preferred component size when no viewSize is set. * javax/swing/ViewportLayout.java (preferredLayoutSize): Return an empty Dimension when there is no view set. (minimumLayoutSize): Likewise. (layoutContainer): Don't try to layout when there is no view. 2005-02-15 Anthony Green <green@redhat.com> * jni/gtk-peer/gtk_jawt.c (classpath_jawt_get_drawable, classpath_jawt_lock, classpath_jawt_unlock): New functions. * jawt.c (_Jv_JAWT_Lock, _Jv_JAWT_Unlock): New functions. (_Jv_GetDrawingSurface): Set visualID. (_Jv_FreeDrawingSurfaceInfo): Clear visualID. (JAWT_GetAWT): Set Lock and Unlock. * include/jawt_md.h (struct _JAWT_X11DrawingSurfaceInfo): Add visualID. * include/jawt.h (JAWT_VERSION_1_4, JAWT_LOCK_ERROR, JAWT_LOCK_CLIP_CHANGED, JAWT_LOCK_BOUNDS_CHANGED, JAWT_LOCK_SURFACE_CHANGED): New macros. (struct _JAWT): Add Lock and Unlock. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * jawt.c: New file. * include/jawt.h: Likewise. * include/jawt_md.h: Likewise. * include/Makefile.am (tool_include__HEADERS): Add jawt.h and jawt_md.h files. * jni/classpath/classpath_jawt.h: Likewise. * jni/gtk-peer/gtk_jawt.c: Likewise. * Makefile.am: Build libjawt.so. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Merged file header with classpath CVS head. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Merged code formatting with classpath CVS head. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: Removed debug code. (Java_gnu_java_awt_peer_gtk_GdkFontPeer_getGlyphVector): Handle special JNI strings with 2 '\0' at the end. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Merged file header with classpath CVS head. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c: Merged code formatting with classpath CVS head. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (create): Use GTK's built-in file system backend. Use GTK_RESPONSE_ACCEPT. (handle_response): Use GTK_RESPONSE_ACCEPT. 2005-02-15 Graydon Hoare <graydon@redhat.com> * Makefile.am: Fix library build breakage. * Makefile.in: Regenerate. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTabbedPane.java (Page.setDisplayedMnemonicIndex): Handle empty menmonic. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultMutableTreeNode.java: Reworked Javadocs all over. (getPathToRoot): Fixed direction of result array initialization. 2005-02-15 Michael Koch <konqueror@gmx.de> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Fix includes for cairo 0.3.0 snappshot. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Merged file header from classpath CVS HEAD. 2005-02-15 Craig Black <craig.black@aonix.com> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (copyState): Pass a JNI global reference to signal handler. (realize_cb): Use and free JNI global reference. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (create): Pass a JNI global reference to signal handler. (selection_changed): Match declaration. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c (dispose): Do not remove entries from state tables until after widget is destroyed. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/Container.javai (paramString): If layoutMgr is null just return result of super.paramString(). * java/awt/Scrollbar.java: Reformatted. * java/awt/im/InputContext.java (static): Removed redundant initializations. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/ImageIcon.java, javax/swing/UIManager.java, javax/swing/text/EditorKit.java, javax/swing/text/Segment.java: More whitespace cleanups. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/EmbeddedWindow.java, gnu/java/awt/image/ImageDecoder.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, java/awt/DefaultKeyboardFocusManager.java, java/awt/Frame.java, java/awt/image/RGBImageFilter.java, javax/swing/AbstractButton.java, javax/swing/ActionMap.java, javax/swing/ComponentInputMap.java, javax/swing/DefaultDesktopManager.java, javax/swing/ImageIcon.java, javax/swing/InputMap.java, javax/swing/JButton.java, javax/swing/JCheckBox.java, javax/swing/JCheckBoxMenuItem.java, javax/swing/JEditorPane.java, javax/swing/JMenu.java, javax/swing/JMenuItem.java, javax/swing/JOptionPane.java, javax/swing/JRootPane.java, javax/swing/JTable.java, javax/swing/MenuSelectionManager.java, javax/swing/RepaintManager.java, javax/swing/ScrollPaneLayout.java, javax/swing/SortingFocusTraversalPolicy.java, javax/swing/UIManager.java, javax/swing/ViewportLayout.java, javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java, javax/swing/plaf/basic/BasicInternalFrameUI.java, javax/swing/plaf/basic/BasicLabelUI.java, javax/swing/plaf/basic/BasicListUI.java, javax/swing/plaf/basic/BasicMenuItemUI.java, javax/swing/plaf/basic/BasicMenuUI.java, javax/swing/plaf/basic/BasicOptionPaneUI.java, javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java, javax/swing/plaf/basic/BasicRootPaneUI.java, javax/swing/plaf/basic/BasicScrollPaneUI.java, javax/swing/plaf/basic/BasicSplitPaneDivider.java, javax/swing/plaf/basic/BasicTextUI.java, javax/swing/table/TableColumnModel.java, javax/swing/text/AbstractDocument.java, javax/swing/text/EditorKit.java, javax/swing/text/Position.java, javax/swing/text/Segment.java, javax/swing/text/StyledEditorKit.java, javax/swing/text/ViewFactory.java: Cleanup whitespace differences to classpath CVS HEAD. 2005-02-15 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: (finalize): Call finish from here. (produce): Not from here. * Makefile.am (gtk_c_source_files): Remove jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c. * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (cairoSetFont): (cairoDrawGdkTextLayout): (cairoDrawString): (getPeerTextMetrics): (getPeerFontMetrics): Remove. (setFont): Don't call cairoSetFont. (cairoDrawGlyphVector): Accept font peer argument. (drawGlyphVector): Pass font peer to cairoDrawGlyphVector. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (ensure_metrics_cairo): (gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFont): (gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawString): (gnu_java_awt_peer_gtk_GdkGraphics2D_getPeerFontMetrics): (gnu_java_awt_peer_gtk_GdkGraphics2D_getPeerTextMetrics): (metrics_cairo): (metrics_surface): Remove. (gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGlyphVector): Pass and install font peer. 2005-02-15 Graydon Hoare <graydon@redhat.com> * Makefile.am: Create "split library" structure. * Makefile.in: Regenerate. 2005-02-15 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Release GDK lock during upcalls. 2005-02-15 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Remove. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (Java_gnu_java_awt_peer_gtk_GdkFontPeer_getGlyphVector): (Java_gnu_java_awt_peer_gtk_GdkFontPeer_getFontMetrics): (Java_gnu_java_awt_peer_gtk_GdkFontPeer_getTextMetrics): New methods. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c: Remove. * gnu/java/awt/peer/gtk/GdkFontPeer.java (getGlyphVector): (getFontMetrics): (getTextMetrics): New native methods. * gnu/java/awt/peer/gtk/GdkFontMetrics.java: Remove native parts. * gnu/java/awt/peer/gtk/GdkGlyphVector.java: Likewise. * Makefile.am: Remove native entries for GdkFontMetrics, GdkGlyphVector. * Makefile.in: Regenerate. 2005-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/swing/SwingUtilities.java: (getAccessibleAt(java.awt.Component, java.awt.Point)): Implemented and documented. (getAccessibleChild(java.awt.Component, int)): Likewise. (getAccessibleChildrenCount(java.awt.Component)): Likewise. (getAccessibleIndexInParent(java.awt.Component)): Likewise. (getAccessibleStateSet(java.awt.Component)): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/SwingUtilities.java (getFontMetrics): Removed. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/Container.java (paramString): Implemented. * javax/swing/AbstractButton.java (paramString): Implemented. * javax/swing/JComponent.java (paramString): Implemented. * javax/swing/JMenu.java (paramString): Implemented. * javax/swing/JMenuBar.java (paramString): Implemented. * javax/swing/JMenuItem.java (paramString): Implemented. * javax/swing/JPopupMenu.java (paramString): Implemented. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JMenu.java (uiClassID): Removed. (JMenu): Set invoker on popup menu. (getUIClassID): Return id directly. (getItemCount): Simply return getMenuComponentCount(). Fixed javadoc. (isTopLevelMenu): Simplified. * javax/swing/JMenuItem.java (uiClassID): Removed. (getUIClassID): Return id directly. * javax/swing/JPopupMenu.java (uiClassID): Removed. (JPopupMenu): Always initialize correctly. (getSubElements): Only return components implementing MenuElement interface. (HeavyWeightPopup.hide): Removed. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/image/ReplicateScaleFilter.java (replicatePixels): Made private. * javax/swing/colorchooser/DefaultRGBChooserPanel.java (DefaultRGBChooserPanel): Made package private. * javax/swing/colorchooser/DefaultSwatchChooserPanel.java (RecentSwatchPanel): Likewise. * javax/swing/event/MouseInputAdapter.java: Reformatted. (MouseInputAdapter): Made abstract. * javax/swing/tree/DefaultMutableTreeNode.java (random): Removed. (growTree): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/dnd/DropTarget.java (addDropTargetListener): Clarified comments. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (getComponentGraphics): Removed accidently commited code. 2005-02-15 Graydon Hoare <graydon@redhat.com> * java/awt/dnd/DropTarget.java (addDropTargetListener): Despite documentation, do not throw. * javax/swing/JComponent.java: Set a default DropTarget. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractAction.java (ENABLED_PROPERTY): Removed. (setEnabled): Replaced constant with real string. * javax/swing/AbstractButton.java (createActionPropertyChangeListener.propertyChange): Likewise. * javax/swing/JComboBox.java (DEFAULT_MAXIMUM_ROW_COUNT): Made private. (EDITABLE_CHANGED_PROPERTY): Removed. (MAXIMUM_ROW_COUNT_CHANGED_PROPERTY):Likewise. (ENABLED_CHANGED_PROPERTY):Likewise. (RENDERER_CHANGED_PROPERTY):Likewise. (EDITOR_CHANGED_PROPERTY):Likewise. (MODEL_CHANGED_PROPERTY):Likewise. (uiClassID):Likewise. (getUIClassID): Replaced constant with real string. (setModel):Likewise. (setEditable):Likewise. (setMaximumRowCount):Likewise. (setRenderer):Likewise. (setEditor):Likewise. (setEnabled):Likewise. * javax/swing/JLabel.java (DISABLED_ICON_CHANGED_PROPERTY): Removed. (DISPLAYED_MNEMONIC_CHANGED_PROPERTY): Likewise. (DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY): Likewise. (HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY): Likewise. (HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY): Likewise. (ICON_CHANGED_PROPERTY): Likewise. (ICON_TEXT_GAP_CHANGED_PROPERTY): Likewise. (LABEL_FOR_CHANGED_PROPERTY): Likewise. (TEXT_CHANGED_PROPERTY): Likewise. (VERTICAL_ALIGNMENT_CHANGED_PROPERTY): Likewise. (VERTICAL_TEXT_POSITION_CHANGED_PROPERTY): Likewise. (setText): Replaced constant with real string. (setIcon): Likewise. (setDisabledIcon): Likewise. (setDisplayedMnemonic): Likewise. (setIconTextGap): Likewise. (setVerticalAlignment): Likewise. (setHorizontalAlignment): Likewise. (setVerticalTextPosition): Likewise. (setHorizontalTextPosition): Likewise. (setLabelFor): Replaced constant with real string. Fire property change event after property got changed. * javax/swing/JList.java (CELL_RENDERER_PROPERTY_CHANGED): Likewise. (FIXED_CELL_HEIGHT_PROPERTY_CHANGED): Likewise. (FIXED_CELL_WIDTH_PROPERTY_CHANGED): Likewise. (LAYOUT_ORIENTATION_PROPERTY_CHANGED): Likewise. (MODEL_PROPERTY_CHANGED): Likewise. (PROTOTYPE_CELL_VALUE_PROPERTY_CHANGED): Likewise. (SELECTION_BACKGROUND_PROPERTY_CHANGED): Likewise. (SELECTION_FOREGROUND_PROPERTY_CHANGED): Likewise. (SELECTION_MODEL_PROPERTY_CHANGED): Likewise. (setFixedCellWidth): Reimplemented. (setFixedCellHeight): Exit if new value is identical. Replaced constant with real string. (setSelectionBackground): Likewise. (setSelectionForeground): Likewise. (setPrototypeCellValue): Likewise. (setCellRenderer): Replaced constant with real string. (setModel): Likewise. (setSelectionModel): Likewise. * javax/swing/JMenuBar.java (BORDER_PAINTED_CHANGED_PROPERTY): Removed. (MODEL_CHANGED_PROPERTY): Likewise. (MARGIN_CHANGED_PROPERTY): Likewise. (setBorderPainted): Reimplemented. (setMargin): Likewise. (setSelectionModel): Replaced constant with real string. * javax/swing/JPopupMenu.java (LABEL_CHANGED_PROPERTY): Removed. (VISIBLE_CHANGED_PROPERTY): Likewise. (borderPainted): Likewise. (setLabel): Replaced constant with real string. (setVisible): Exit if new value is identical. Replaced constant with real string. * javax/swing/JProgressBar.java (BORDER_PAINTED_CHANGED_PROPERTY): Removed. (ORIENTATION_CHANGED_PROPERTY): Likewise. (STRING_CHANGED_PROPERTY): Likewise. (STRING_PAINTED_CHANGED_PROPERTY): Likewise. (INDETERMINATE_CHANGED_PROPERTY): Likewise. (setOrientation): Replaced constant with real string. (setStringPainted): Likewise. (setString): Likewise. (setBorderPainted): Likewise. (setIndeterminate): Likewise. * javax/swing/JScrollBar.java (BLOCK_INCREMENT_CHANGED_PROPERTY): Removed. (MODEL_CHANGED_PROPERTY): Likewise. (ORIENTATION_CHANGED_PROPERTY): Likewise. (setOrientation): Replaced constant with real string. (setModel): Likewise. (setUnitIncrement): Likewise. (setBlockIncrement): Likewise. * javax/swing/JScrollPane.java (COLUMN_HEADER_CHANGED_PROPERTY): Removed. (COMPONENT_ORIENTATION_CHANGED_PROPERTY): Likewise. (HORIZONTAL_SCROLLBAR_CHANGED_PROPERTY): Likewise. (HORIZONTAL_SCROLLBAR_POLICY_CHANGED_PROPERTY): Likewise. (LAYOUT_CHANGED_PROPERTY): Likewise. (ROW_HEADER_CHANGED_PROPERTY): Likewise. (VERTICAL_SCROLLBAR_CHANGED_PROPERTY): Likewise. (VERTICAL_SCROLLBAR_POLICY_CHANGED_PROPERTY): Likewise. (VIEWPORT_CHANGED_PROPERTY): Likewise. (VIEWPORT_BORDER_CHANGED_PROPERTY): Likewise. (WHEEL_SCROLLING_ENABLED_CHANGED_PROPERTY): Likewise. (setComponentOrientation): Replaced constant with real string. (setColumnHeader): Likewise. (setHorizontalScrollBar): Likewise. (setHorizontalScrollBarPolicy): Likewise. (setRowHeader): Likewise. (setVerticalScrollBar): Likewise. (setVerticalScrollBarPolicy): Likewise. (setWheelScrollingEnabled): Likewise. (setViewport): Likewise. (setViewportBorder): Likewise. * javax/swing/JSlider.java (INVERTED_CHANGED_PROPERTY): Removed. (LABEL_TABLE_CHANGED_PROPERTY): Likewise. (MAJOR_TICK_SPACING_CHANGED_PROPERTY): Likewise. (MINOR_TICK_SPACING_CHANGED_PROPERTY): Likewise. (MODEL_CHANGED_PROPERTY): Likewise. (ORIENTATION_CHANGED_PROPERTY): Likewise. (PAINT_LABELS_CHANGED_PROPERTY): Likewise. (PAINT_TICKS_CHANGED_PROPERTY): Likewise. (setModel): Replaced constant with real string. (setOrientation): Likewise. (setLabelTable): Likewise. (setInverted): Likewise. (setMajorTickSpacing): Likewise. (setMinorTickSpacing): Likewise. (setPaintTicks): Likewise. (setPaintLabels): Likewise. * javax/swing/JTabbedPane.java (MODEL_CHANGED_PROPERTY): Removed. (TAB_PLACEMENT_CHANGED_PROPERTY): Likewise. (TAB_LAYOUT_POLICY_CHANGED_PROPERTY): Likewise. (setModel): Replaced constant with real string. (setTabPlacement): Likewise. (setTabLayoutPolicy): Likewise. * javax/swing/JToolBar.java (ORIENTATION_CHANGED_PROPERTY): Removed. (FLOATABLE_CHANGED_PROPERTY): Likewise. (BORDER_PAINTED_CHANGED_PROPERTY): Likewise. (MARGIN_CHANGED_PROPERTY): Likewise. (ROLLOVER_CHANGED_PROPERTY): Likewise. (setRollover): Replaced constant with real string. (setMargin): Likewise. (setBorderPainted): Likewise. (setFloatable): Likewise. (setOrientation): Likewise. * javax/swing/plaf/basic/BasicComboBoxUI.java (PropertyChangeHandler.propertyChange): Likewise. * javax/swing/plaf/basic/BasicComboPopup.java (PropertyChangeHandler.propertyChange): Likewise. * javax/swing/plaf/basic/BasicMenuBarUI.java (PropertyChangeHandler.propertyChange): Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java (PropertyChangeHandler.propertyChange): Likewise. * javax/swing/plaf/basic/BasicScrollBarUI.java (PropertyChangeHandler.propertyChange): Likewise. * javax/swing/plaf/basic/BasicSliderUI.java (PropertyChangeHandler.propertyChange): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (PropertyChangeHandler.propertyChange): Likewise. * javax/swing/plaf/basic/BasicToolBarUI.java (PropertyChangeHandler.propertyChange): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultButtonModel.java (changeState): Made private. * javax/swing/DefaultDesktopManager.java (setWasIcon): Fixed second argument to be java.lang.Boolean. * javax/swing/JLayeredPane.java (layerToRange): Made private. (incrLayer): Likewise. (decrLayer): Likewise. * javax/swing/JTable.java (dragEnabled): Likewise. (preferredViewportSize): Renamed from preferredScrollableViewportSize. * javax/swing/KeyStroke.java (Keystroke): Made private. * javax/swing/TransferHandler.java (COMMAND_COPY): Likewise. (COMMAND_CUT): Likewise. (COMMAND_PASTE): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTextField.java (postActionEvent): Use text in field when actionCommand is null. (getActionCommand): Removed. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractSet.java: Removed. * Makefile.am: Removed javax/swing/AbstractSet.java. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/Window.java (AccessibleWindow.getAccessibleStateSet): Fixed method name. * java/awt/dnd/DnDConstants.java (DnDConstants): New private constructor. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultCellRenderer.java: Removed. * Makefile.am: Removed javax/swing/DefaultCellRenderer.java. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (fireItemStateChanged): Made protected. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. * javax/swing/DefaultButtonModel.java (fireItemStateChanged): Likewise. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. * javax/swing/JApplet.java (JApplet): Removed. (frameInit): Likewise. (setRootPane): Made protected. (createRootPane): Likewise. * javax/swing/JComponent.java (getClientProperty): Likewise. (putClientProperty): Likewise. * javax/swing/JEditorPane.java (getContentType): Likewise. (setContentType): Likewise. * javax/swing/JFrame.java (setRootPane): Likewise. (createRootPane): Likewise. * javax/swing/JInternalFrame.java (getFocusCycleRootAncestor): Made final. Added @since tag. (isFocusCycleRoot): Likewise. (getWarningString): Made final. * javax/swing/JScrollBar.java (changeListener): Removed. (changeEvent): Likewise. (createChangeListener): Likewise. (fireStateChanged): Likewise. (addChangeListener): Likewise. (removeChangeListener): Likewise. (getChangeListeners): Likewise. * javax/swing/JScrollPane.java (createViewport): Made protected. * javax/swing/JViewport.java (addImpl): Likewise. (setBorder): New method. * javax/swing/JWindow.java (setRootPane): Made protected. (createRootPane): Likewise. * javax/swing/plaf/basic/BasicButtonUI.java (installListeners): Likewise. (uninstallListeners): Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java (incrementAnimationIndex): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (createLayoutManager): Likewise. * javax/swing/table/DefaultTableCellRenderer.java (firePropertyChange): Likewise. * javax/swing/table/JTableHeader.java (AccessibleJTableHeaderEntry.AccessibleJTableHeaderEntry): New constructor. * javax/swing/text/PlainDocument.java (reindex): Made private. * javax/swing/text/PlainView.java (drawLine): Made protected. (getTabSize): Likewise. * javax/swing/text/View.java (setSize): Removed. (preferenceChanged): New method. (getBreakWeight): Likewise. (breakView): Likewise. (getViewIndex): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JScrollPane.java (ScrollBar): Made class protected. * javax/swing/JSpinner.java (JSpinner): Added @since tag. (listenerList): Removed. * javax/swing/JTable.java (setValueAt): New method. (getColumn): Likewise. * javax/swing/JWindow.java (rootPaneCheckingEnabled): Renamed from checking. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RootView.modelToView): Made it public and return a java.awt.Shape. Handle null subview. (uninstall): Set textComponent to null when its not possible used anymore. * javax/swing/text/View.java (setParent): Use better argument name. (getContainer): Get parent via getParent(). (getViewFactory): Likewise. (getAttributes): Get element via getElement(). (getStartOffset): Likewise. (getEndOffset): Likewise. (getResizeWeight): New method. (getMaximumSpan): Likewise. (getMinimumSpan): Likewise. (setSize): Likewise. (getGraphics): Likewise. 2005-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/Checkbox.java: (AccessibleAWTCheckbox()): Added public constructor to call superclass. * java/awt/Choice.java: (AccessibleAWTChoice): Added class documentation. (AccessibleAWTChoice()): Added public constructor to call superclass. (AccessibleAWTChoice.getAccessibleAction()): Documented. (AccessibleAWTChoice.getAccessibleRole()): Documented, and changed role to COMBO_BOX. (AccessibleAWTChoice.getAccessibleActionCount()): Documented. (AccessibleAWTChoice.getAccessibleActionDescription(int)): Documented. (AccessibleAWTChoice.doAccessibleAction(int)): Documented. 2005-02-15 Graydon Hoare <graydon@redhat.com> Michael Koch <konqueror@gmx.de> * javax/swing/LayoutFocusTraversalPolicy.java, javax/swing/SortingFocusTraversalPolicy.java: New classes. * Makefile.am: Added new classes. * Makefike.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DebugGraphics.java: Mostly implemented. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/SwingUtilities.java (findFocusOwner): New method. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/DefaultEditorKit.java (read): Added '\n' after each line. * javax/swing/text/PlainView.java (modelToView): Update metrics. (drawLine): Use offsets from element. (paint): Update metrics. Draw all lines. 2005-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/Checkbox.java: (AccessibleAWTCheckbox): Added class documentation * java/awt/Scrollbar.java: (AccessibleAWTScrollBar): typo corrected and docs added (AccessibleAWTScrollBar.getAccessibleRole()): documented (AccessibleAWTScrollBar.getAccessibleStateSet()): likewise (AccessibleAWTScrollBar.getAccessibleValue()): likewise (AccessibleAWTScrollBar.getCurrentAccessibleValue()): likewise (AccessibleAWTScrollBar.setCurrentAccessibleValue(int)): likewise (AccessibleAWTScrollBar.getMinimumAccessibleValue()): likewise (AccessibleAWTScrollBar.getMaximumAccessibleValue()): likewise (getAccessibleContext()): name of accessible class corrected 2005-02-15 Mark Wielaard <mark@klomp.org> * java/awt/BasicStroke.java (hashCode): Implement. (equals): Document. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/print/PrinterJob.java (pageDialog): Throws java.awt.HeadlessException. (printDialog): Likewise. 2005-02-15 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gtkpeer.h (gdk_env): Fix prototype. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java (getValueAt): New method. * javax/swing/table/JTableHeader.java (columnAtPoint): New method. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTextField.java (actions): New field. (static): Initalize actions field. (getActions): New method. 2005-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/Checkbox.java: (AccessibleAWTCheckbox): name capitalization corrected and serialization UID added. (AccessibleAWTCheckbox.itemStateChanged(java.awt.event.ItemEvent)): documented. (AccessibleAWTCheckbox.getAccessibleAction()): likewise (AccessibleAWTCheckbox.getAccessibleValue()): likewise (AccessibleAWTCheckbox.getAccessibleActionCount()): likewise (AccessibleAWTCheckbox.getAccessibleActionDescription(int)): likewise (AccessibleAWTCheckbox.doAccessibleAction(int)): likewise (AccessibleAWTCheckbox.getCurrentAccessibleValue()): likewise (AccessibleAWTCheckbox.setCurrentAccessibleValue(int)): likewise (AccessibleAWTCheckbox.getMinimumAccessibleValue()): likewise (AccessibleAWTCheckbox.getMaximumAccessibleValue()): likewise (AccessibleAWTCheckbox.getAccessibleRole()): likewise (AccessibleAWTCheckbox.getAccessibleStateSet()): implemented and documented (getAccessibleContext()): name of accessible class corrected 2005-02-15 Sven de Marothy <sven@physto.se> * java/awt/geom/doc-files/Area-1.png, java/awt/geom/doc-files/Ellipse-1.png, java/awt/geom/doc-files/GeneralPath-1.png: New files. 2005-02-15 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (env_union): Use union to avoid type-punning warning. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultListSelectionModel.java (clone): New method. 2005-02-15 Mark Wielaard <mark@klomp.org> Reported by Martin Platter <motse@complang.tuwien.ac.at> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFile): Correct method signature of gtkSetFilename. 2005-02-15 Arnaud Vandyck <avdyk@gnu.org> * javax/swing/text/StringContent.java: New file. 2005-02-15 Michael Koch <konqueror@gmx.de> * Makefile.am: Added javax/swing/text/StringContent.java. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/ClasspathToolkit.java: Import statements reworked. (imageCache): Made it of type java.util.HashMap. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/imageio/stream/MemoryCacheImageInputStream.java: Reworked import statements. 2005-02-15 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Rewrite uses of extern variable to be function calls. * jni/gtk-peer/gtkpeer.h (gdk_env): Change declaration to function, from extern variable. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (gdk_env): Remove variable, add new function. (java_vm): Add new variable. (Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit): Initialize java_vm rather than old gdk_env variable. 2005-02-15 David Gilbert <david.gilbert@object-refinery.com> * javax/swing/DefaultListModel.java (add): fire correct event, (addElement): corrected interval indices in event, (clear): corrected upper bound for interval, only fire event if list is not empty, (setSize): fire appropriate event. 2005-02-15 Graydon Hoare <graydon@redhat.com> * gnu/awt/xlib/XEventLoop.java: Add non-blocking event mode. * gnu/awt/xlib/XToolkit.java: Likewise. * gnu/gcj/xlib/XAnyEvent.java: Likewise. * gnu/gcj/xlib/natXAnyEvent.cc: Likewise. * gnu/java/awt/ClasspathToolkit.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java: Likewise. * java/awt/EventQueue.java (getNextEvent): Adjust event loop to switch to native mode after 100ms. * javax/swing/Timer.java (drainEvents): Reuse Runnable. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c (Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose): Wake up event thread. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (Java_gnu_java_awt_peer_gtk_GtkToolkit_iterateNativeQueue): Adjust event loop to switch to java mode after 100ms. 2005-02-15 Graydon Hoare <graydon@redhat.com> * jni.cc (_Jv_JNI_RegisterNatives): Re-add sync, which was accidentally removed in last change. 2005-02-15 Michael Koch <konqueror@gmx.de> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, gnu/java/awt/peer/gtk/GtkMainThread.java: Removed. 2005-02-15 Graydon Hoare <graydon@redhat.com> * include/jni.h (_Jv_JNIEnv::bottom_locals): New field. * include/jvm.h (_Jv_FreeJNIEnv): Declare. * java/lang/natThread.cc (finalize_native): Call _Jv_FreeJNIEnv. * jni.cc: Reuse bottom frame between calls, avoid clearing frame when no local references are made. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/UIDefaults.java (UIDefaults): Fixed typo in javadoc (Thanks to Thomas Zander for reporting) Fixed HTML entity and removed a redundant comma. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/DefaultEditorKit.java (deinstall): Removed. (install): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/UIDefaults.java (put): Handle value of null. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/Robot.java, java/awt/Scrollbar.java, java/awt/print/PrinterJob.java, javax/swing/JTable.java, javax/swing/text/AbstractDocument.java: Reworked import statements. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java (read): Implemented. (write): Likewise. * javax/swing/text/DefaultEditorKit.java (page): Renamed from page_url. Made private. (editorKit): Renamed from kit. Made private. (ctype): Removed. (JEditorPane): All constructors reimplemented. (getContentType): Use content type from editor kit. (getEditorKit): Return editorKit. (getEditorKitForContentType):Likewise. (getPage): Return page. (setContentType): Reimplemented. (setEditorKit): Likewise. (setEditorKitForContentType): Removed wrong implementation. (setPage): Implemented. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (nativeSetIconImageFromData): Re-add native implementation. 2005-02-15 David Gilbert <david.gilbert@object-refinery.com> * javax/swing/table/DefaultTableModel.java (DefaultTableModel()): Added Javadocs. (DefaultTableModel(int, int)): Fixed implementation. (DefaultTableModel(Vector, int)): Throw IllegalArgumentException for negative rowCount. (DefaultTableModel(Object[], int)): Added Javadocs. (DefaultTableModel(Vector, Vector)): Likewise. (DefaultTableModel(Object[][], Object[])): Likewise. (getDataVector): Likewise. (setDataVector(Vector, Vector)): Likewise. (setDataVector(Object[][], Object[])): Likewise. (newDataAvailable): Likewise. (newRowsAdded): Likewise. (rowsRemoved): Likewise. (setColumnIdentifiers(Vector)): Allow for null argument. (setColumnIdentifiers(Object[])): Added Javadocs. (setNumRows): Likewise. (setRowCount): Adds new rows if necessary, and sends more specific TableModelEvent. (setColumnCount): Allow for null columnIdentifiers. (addColumn(Object)): Added Javadocs. (addColumn(Object, Vector)): Handle null columnData. (addColumn(Object, Object[])): Handle columnData with more or less entries than rows in the table. (addRow(Vector)): Fire appropriate event. (addRow(Object[])): Added Javadocs. (insertRow(int, Vector)): Fire appropriate event. (insertRow(int, Object[])): Added Javadocs. (moveRow): Reimplemented. (removeRow(int)): Fire appropriate event. (getColumnCount): Allow for null columnIdentifiers. (getColumnName): Now returns empty string when column index is too large. (isCellEditable): Added Javadocs. (getValueAt): Likewise. (setValueAt): Fire more specific event. (convertToVector): Added Javadocs. * javax/swing/table/TableModel.java Added Javadocs. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * libgcj.spec.in (lib): Add -l-javax-imageio. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Replace direct references to event queue q with method call q(). * gnu/java/awt/peer/gtk/GtkDialogPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkFramePeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkTextComponentPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkGenericPeer.java: Likewise. (q): New method. 2005-02-15 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/ClasspathToolkit.java (registerImageIOSpis): New method. * gnu/java/awt/image/ImageDecoder.java (imageDecoder): New constructor using InputStream (startProduction): Handle existing InputStream. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (findSimpleIntegerArray): Make public and static. (updateBufferedImage): Set each pixel, in a loop. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Implement ImageIO SPI classes. (createBufferedImage): Rewrite in terms of SPI classes. * gnu/java/awt/peer/gtk/GtkToolkit.java (registerImageIOSpis): New method. * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Borrow a patch from aph, applied to trunk, which lets JNI call interface methods properly. * javax/imageio/ImageIO.java (WriterFormatFilter.filter): Fix copy-and-paste typos. (WriterMIMETypeFilter.filter): Likewise. (ImageReaderIterator): Pass extension argument through to SPI. (getReadersByFilter): Likewise. (getWritersByFilter): Likewise. (getImageReadersByFormatName): Likewise. (getImageReadersByMIMEType): Likewise. (getImageReadersBySuffix): Likewise. (getImageWritersByFormatName): Likewise. (getImageWritersByMIMEType): Likewise. (getImageWritersBySuffix): Likewise. (read): Implement. (write): Implement. * javax/imageio/ImageReader.java (progressListeners): Initialize. (setInput): Implement. * javax/imageio/ImageWriter.java (progressListeners): Initialize. (warningListeners): Likewise. (warningLocales): Likewise. (setOutput): Test "isInstance" rather than class equality. * javax/imageio/spi/IIORegistry.java (static): Add reader and writer SPIs. (IIORegistry): Call ClasspathToolkit.registerImageIOSpis. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (query_formats): New function. (save_to_stream): Likewise. (Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_streamImage): Likewise. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c (mouseWheel): Call XFlush. (keyPress): Likewise. (keyRelease): Likewise. 2005-02-15 Olga Rodimina <rodimina@redhat.com> * javax/swing/JTable.java (columnAtPoint): New Method. Implemented. (rowAtPoint): Likewise. (countSelections): Fixed few small count errors. (getSelections): Likewise. (setSelectionMode): Set selection mode for column selection model in addition to row selection model. * javax/swing/plaf/basic/BasicTableUI.java: (getRowForPoint): Removed. Replaced by JTable.rowAtPoint(). (getColForPoint): Removed. Replaced by JTable.columnAtPoint(). (updateSelection): Updated to call JTable.columnAtPoint and JTable.rowAtPoint. * javax/swing/table/DefaultTableColumnModel.java: (getSelectedColumns): Implemented. (getSelectedColumnCount): Implemented. 2005-02-15 Graydon Hoare <graydon@redhat.com> * Makefile.am (jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c) (gnu/java/awt/peer/gtk/GtkMainThread.java) : Remove. * Makefile.in: Regenerate. * gnu/awt/xlib/XEventLoop.java: Fix to match thread model. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XToolkit.java: Likewise. * gnu/gcj/xlib/XAnyEvent.java: Likewise. * gnu/gcj/xlib/natXAnyEvent.cc: Likewise. * gnu/java/awt/ClasspathToolkit.java (nativeQueueEmpty) (wakeNativeQueue) (iterateNativeQueue): New methods. * gnu/java/awt/peer/gtk/GtkMainThread.java: Remove. * gnu/java/awt/peer/gtk/GtkToolkit.java (gtkInit): Absorb from defunct GtkMainThread class. (static): Run gtkInit in static startup block. (GtkToolkit): Remove construction of GtkMainThread and queue. (getSystemEventQueueImpl): Construct queue when requested. (nativeQueueEmpty) (wakeNativeQueue) (iterateNativeQueue): New methods. * java/awt/Component.java (removeNotify): Remove race. * java/awt/EventDispatchThread.java (EventDispatchThread): Don't start on construction. (run): Remove isInterrupted check. * java/awt/EventQueue.java (shutdown): New flag. (isShutdown): New method checking J2SE shutdown condition. (setShutdown): New method. (getNextEvent): Restructure to use ClasspathToolkit. (postEvent): Activate new thread on posting, wake thread on post of possible shutdown condition event. * java/awt/Frame.java (Frame): Call noteFrame in all constructors. (fireDummyEvent): New helper method. (addNotify): Fire a dummy event to wake up queue. (removeNotify): Fire a dummy event to wake up queue. (noteFrame): New method. (weakFrames): New static field. (getFrames): Implement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c: Remove. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c: Move everything from GtkMainThread into this file (Java_gnu_java_awt_peer_gtk_GtkToolkit_iterateNativeQueue) (Java_gnu_java_awt_peer_gtk_GtkToolkit_wakeNativeQueue) (Java_gnu_java_awt_peer_gtk_GtkToolkit_nativeQueueEmpty): New functions to implement single-threaded queue semantics. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/metal/MetalLookAndFeel.java (getControlTextFont): New method. (getMenuTextFont): Likewise. (getSubTextFont): Likewise. (getSystemTextFont): Likewise. (getUserTextFont): Likewise. (getWindowTitleFont): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (documentFilter): New field. (getDocumentFilter): New method. (setDocumentFilter): Likewise. (dump): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java (DynamicUtilTreeNode.hasChildren): Clarify javadoc. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (AbstractElement.getLength): Fixed off-by-one error. (AbstractElement.children): Made abstract. (AbstractElement.getAllowsChildren): Likewise. (AbstractElement.getElement): Likewise. (AbstractElement.dumpElement): New private method. (AbstractElement.dump): New method. (BranchElememt.getName): Fixed implementation. (BranchElememt.toString): Likewise. (BranchElememt.getElement): Fixed arguments. (LeafElement.getName): Fixed implementation. (LeafElement.toString): Likewise. * javax/swing/text/GapContent.java (GapContent): Put default content into buffer. * javax/swing/text/PlainDocument.java (reindex): Use empty attribute sets instead of null. (createDefaultRoot): Reimplemented. (insertUpdate): Call super method. (removeUpdate): Likewise. (getParagraphElement): Implemented. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/ClasspathToolkit.java (createRobot): Throws java.awt.AWTException. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c: Added '__attribute__((unused))' to all unused method arguments. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultBoundedRangeModel.java (fireValueChanged): Fixed off-by-one error. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (gtk_c_source_files): Add GdkRobotPeer.c. (gtk_awt_peer_sources): Add GdkScreenGraphicsDevice.java and GdkRobotPeer.java. (lib_gnu_java_awt_peer_gtk_la_CFLAGS): Add X flags. (lib_gnu_java_awt_peer_gtk_la_LDFLAGS): Add XTest flags. * gnu/awt/xlib/XToolkit.java (createRobot): New method. * gnu/java/awt/ClasspathToolkit.java (createRobot): New method. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java (getDefaultScreenDevice): Implement. * gnu/java/awt/peer/gtk/GdkRobotPeer.java: New file. * gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java (createRobot): New method. * java/awt/Robot.java: Implement. * java/awt/peer/RobotPeer.java: Rename parameters. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c: New file. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (awt_keycode_to_keysym): Make non-static. * jni/gtk-peer/gtkpeer.h (AWT_BUTTON1_MASK, AWT_BUTTON2_MASK, AWT_BUTTON3_MASK): Declare constants. (awt_keycode_to_keysym): Declare. * Makefile.am (AM_MAKEFLAGS): Set KEYS variable. * testsuite/libjava.mauve/mauve.exp (test_mauve): If KEYS exists and is non-empty pass its value to "make check". (test_mauve_sim): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/imageio/IIOParam.java (setSourceBands): New method. (setSourceSubsampling): Likewise. * javax/imageio/ImageReadParam.java (setDestination): Likewise. (setDestinationBands): Likewise. (setSourceProgressivePasses): Likewise. * javax/imageio/metadata/IIOInvalidTreeException.java (serialVersionUID): New static field. * javax/imageio/metadata/IIOMetadataNode.java (IIOMetadataNode): Don't explicitely implement org.w3c.dom.Node. (parent): Dont initailize with default value explicitely. (Object): Likewise. (removeAttribute): Doesn't throws org.w3c.dom.DOMException. (removeAttributeNode): Likewise. (removeAttributeNS): Likewise. (setAttribute): Likewise. (setAttributeNode): Likewise. (setAttributeNodeNS): Likewise. (setAttributeNS): Likewise. (appendChild): Likewise. (getNodeValue): Likewise. (insertBefore): Likewise. (removeChild): Likewise. (replaceChild): Likewise. (setPrefix): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/LookAndFeel.java (getDesktopPropertyValue): New method. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java (hasChildren): New instance field. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (getToolTipText): New method. (getTitledBorderText): Likewise. (getAccessibleKeyBinding): Likewise. (getVerifyInputWhenFocusTarget): Likewise. (setVerifyInputWhenFocusTarget): Likewise. (verifyInputWhenFocusTarget): New instance field. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultListSelectionModel.java (fireValueChanged): New method. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultBoundedRangeModel.java: Fixed javadocs all over. (fireStateChanged): Simplified. * javax/swing/BoundedRangeModel.java: Reformatted. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JRootPane.java (setMenuBar): Added @deprecated tag. (getMenuBar): Likewise. * javax/swing/JTable.java (sizeColumnsToFit): Likewise. 2005-02-15 Paul Jenner <psj.home@ntlworld.com> * javax/swing/ImageIcon.java (setImage): Implemented. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java: Removed unused imports. 2005-02-15 Olga Rodimina <rodimina@redhat.com> (prepareRenderer): Get column's index in dataModel instead of column's view index. (getColumnCount): return count of the columns in ColumnModel, not in dataModel. (removeColumn): Implemented. (moveColumm): Likewise. (setRowHeight): throw IllegalArgumentException if height is less then 1. * javax/swing/table/DefaultTableColumnModel.java: Add javadocs. (DefaultTableColumnModel):Add call to createSelectionModel(). (addColumn): Fire columnAdded event to registered listeners. (removeColumn): Fire columnRemoved event to registered listeners. (moveColumn): Fire columnMoved event to registered listeners. (setColumnMargin): Fire ColumnMarginChanged event to registered listeners. (getColumnIndex): Changed parameter name. (setColumnSelectionAllowed): Likewise. (fireColumnAdded): Implemented. (fireColumnRemoved): Likewise. (fireColumnMoved): Likewise. (fireColumnMarginChanged): Likewise. (getListeners): Changed parameter name. (propertyChange): Implemented. (valueChanged): Changed parameter name. (createSelectionModel): Implemented. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkToolkit.java: Explicitely import used classes. (getLocalGraphicsEnvironment): Simplify. * java/awt/Window.java (Window): Enable code to get the default GraphicsConfiguration. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/metal/DefaultMetalTheme.java (CONTROL_TEXT_FONT): New static field. (MENU_TEXT_FONT): Likewise. (SUB_TEXT_FONT): Likewise. (SYSTEM_TEXT_FONT): Likewise. (USER_TEXT_FONT): Likewise. (WINDOW_TITLE_FONT): Likewise. (getControlTextFont): New method. (getMenuTextFont): Likewise. (getSubTextFont): Likewise. (getSystemTextFont): Likewise. (getUserTextFont): Likewise. (getWindowTitleFont): Likewise. * javax/swing/plaf/metal/MetalTheme.java (BLACK): Initialize with Color.BLACK. (WHITE): Initialize with Color.WHITE. (getInactiveControlTextColor): Return getControlDisabled(). (getMenuDisabledForeground): Return getSecondary3(). (getControlTextFont): New abstract method. (getMenuTextFont): Likewise. (getSubTextFont): Likewise. (getSystemTextFont): Likewise. (getUserTextFont): Likewise. (getWindowTitleFont): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java (getFocusLostBehavior): Fixed typo in method name. (setFocusLostBehavior): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/TransferHandler.java: Reworked import statements. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * java/awt/Button.java, java/awt/Canvas.java, java/awt/Checkbox.java, java/awt/CheckboxMenuItem.java, java/awt/Choice.java, java/awt/Dialog.java, java/awt/Frame.java, java/awt/Label.java, java/awt/List.java, java/awt/Menu.java, java/awt/MenuBar.java, java/awt/MenuItem.java, java/awt/PopupMenu.java, java/awt/ScrollPane.java, java/awt/Scrollbar.java, java/awt/TextArea.java, java/awt/Window.java (getAccessibleContext): Clean up comments. Reformat. * java/awt/Button.java, java/awt/Checkbox.java, java/awt/Choice.java, java/awt/Menu.java, java/awt/PopupMenu.java, java/awt/TextArea.java (getAccessibleContext): Only create new accessible once. * java/awt/TextComponent.java (getAccessibleContext): Implement. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/Button.java, javax/swing/JApplet.java, javax/swing/JFormattedTextField.java, javax/swing/JWindow.java, javax/swing/JTree.java, javax/swing/plaf/basic/BasicEditorPaneUI.java, javax/swing/plaf/basic/BasicTextPaneUI.java, javax/swing/plaf/basic/BasicTreeUI.java: Reworked import statements. 2005-02-15 Michael Koch <konqueror@gmx.de> * Makefile.am: Put javax.imageio into its own library and link it against lib-org-w3c-dom.la to fix bootstrapping. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/TextAction.java (getTextComponent): Simplified. Added Javadoc. (augmentList): Implemented. Added Javadoc. (getFocusedComponent): Added javadoc. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * java/awt/Scrollbar.java (AccessibleAWTScrollbar, getAccessibleContext): Implement. * java/awt/ScrollPane.java (AccessibleAWTScrollPane, getAccessibleContext): Implement. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * java/awt/Dialog.java (AccessibleAWTFrame, getAccessibleContext): Implement. * java/awt/Frame.java (AccessibleAWTFrame, getAccessibleContext): Implement. * java/awt/Window.java (getAccessibleContext): Fix comment. Remove extra import. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * java/awt/Window.java (AccessibleAWTWindow): Implement. (isActive, isFocused, getAccessibleContext): Implement. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * java/awt/MenuItem.java (getAccessibleContext): Implement. * java/awt/MenuComponent.java (accessibleContext): Make package visible. * java/awt/CheckboxMenuItem.java (getAccessibleContext, AccessibleAWTCheckboxMenuItem): Implement. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * java/awt/List.java: Implement AccessibleAWTList, AccessibleAWTListChild. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * java/awt/Choice.java: Add implements declaration for Accessible. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOInvalidTreeException.java: Use Node instead of Object. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Add Node to implemented interface list. 2005-02-15 Jerry Quinn <jlquinn@optonline.net> * javax/imageio/metadata/IIOMetadataNode.java: Implement. * javax/imageio/metadata/IIOAttr.java: New class. * javax/imageio/metadata/IIONamedNodeMap.java: New class. * javax/imageio/metadata/IIONodeList.java: New class. * Makefile.am: Added new files. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractAction.java, javax/swing/AbstractCellEditor.java, javax/swing/AbstractListModel.java, javax/swing/DefaultBoundedRangeModel.java, javax/swing/DefaultButtonModel.java, javax/swing/DefaultCellEditor.java, javax/swing/DefaultComboBoxModel.java, javax/swing/DefaultDesktopManager.java, javax/swing/JMenu.java, javax/swing/JSlider.java, javax/swing/KeyStroke.java, javax/swing/OverlayLayout.java, javax/swing/ScrollPaneLayout.java, javax/swing/SizeRequirements.java, javax/swing/ViewportLayout.java: Made serialVersionUID private. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Reformatted. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: More reformatting. 2005-02-15 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Reformatted. 2005-02-15 Jeroen Frijters <jeroen@frijters.net> * java/awt/EventDispatchThread.java, java/awt/Toolkit.java: Don't catch java.lang.ThreadDeath. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/PasswordView.java (drawEchoCharacter): Added javadoc. (drawSelectedText): Likewise. (drawUnselectedText): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JRootPane.java (windowDecorationStyle): New field. (setMenuBar): New method. (getMenuBar): Likewise. (getWindowDecorationStyle): Likewise. (setWindowDecorationStyle): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultListSelectionModel.java (leadAnchorNotificationEnabled): Made protected. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/InternalFrameFocusTraversalPolicy.java: New file. * Makefile.am: Added InternalFrameFocusTraversalPolicy.java. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java: Implemented. * javax/swing/JWindow.java (JWindow): New constructors. (initWindow): Renamed from initFrame. * javax/swing/UIDefaults.java (ActiveValue): Made interface static. (LazyValue): Likewise. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (TitlePaneLayout.TitlePaneLayout): New constructor. * javax/swing/plaf/basic/BasicSliderUI.java (ChangeHandler): Made public. (FocusHandler): Likewise. (PropertyChangeHandler): Likewise. (ScrollListener): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (FocusHandler): Likewise. (MouseHandler): Likewise. * javax/swing/plaf/basic/BasicTextPaneUI.java (BasicTextPaneUI): Extend BasicEditorPaneUI. * javax/swing/plaf/basic/BasicToolBarUI.java (BasicToolBarUI): Simplified. Reworked javadoc. (canDock): Simplified. Make public. (DockingListener): Made public. * javax/swing/text/JTextComponent.java (navigationFilter): New field. (getNavigationFilter): New method. (setNavigationFilter): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/metal/MetalTheme.java (getControlTextColor): Return getControlInfo(). (getHighlightedTextColor): Return getControlTextColor(). 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicButtonListener.java (BasicButtonListener): New constructor. * javax/swing/plaf/basic/BasicButtonUI.java (createButtonListener): Usw new BasicButtonListener constructor. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/imageio/event/package.html, javax/imageio/metadata/package.html: New files. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/image/MemoryImageSource.java: Reformatted. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/tree/TreeCellEditor.java: Refomatted. 2005-02-15 Jeroen Frijters <jeroen@frijters.net> * java/awt/color/ICC_Profile.java (finalize): Removed pointless field assignments. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicEditorPaneUI.java: New file. * Makefile.am: Added javax/swing/plaf/basic/BasicEditorPaneUI.java. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/DefaultStyledDocument.java: New file. * Makefile.am: Added javax/swing/text/DefaultStyledDocument.java. * Makefile.in: Regenerated. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JFileChooser.java (showDialog): Return CANCEL_OPTION for now. (showOpenDialog): Likewise. (showSaveDialog): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JApplet.java (HIDE_ON_CLOSE): Removed. (EXIT_ON_CLOSE): Likewise. (DISPOSE_ON_CLOSE): Likewise. (DO_NOTHING_ON_CLOSE): Likewise. (close_action): Likewise. (getDefaultCloseOperation): Likewise. (setDefaultCloseOperation): Likewise. (processWindowEvent): Likewise. (getPreferredSize): Simplified. * javax/swing/JInternalFrame.java (setDefaultCloseOperation): Fixed throwing exception on wrong argument value. * javax/swing/JWindow.java (HIDE_ON_CLOSE): Removed. (EXIT_ON_CLOSE): Likewise. (DISPOSE_ON_CLOSE): Likewise. (DO_NOTHING_ON_CLOSE): Likewise. (close_action): Likewise. (processKeyEvent): Likewise. (setDefaultCloseOperation): Likewise. (getPreferredSize): Simplified. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTextField.java (getPreferredSize): Re-implemented. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JLabel.java (setDisplayedMnemonic): Use only upper case characters. (setDisplayedMnemonicIndex): Handle index == -1 and fire PropertyChangeEvent after property got set to the new index. 2005-02-15 Robert Schuster <thebohemian@gmx.net> * javax/swing/JComboBox.java: (JComboBox): Removed selection of the first item in the model. 2005-02-15 Robert Schuster <thebohemian@gmx.net> * javax/swing/JComboBox.java added support for no item being selected (JComboBox): select first or nothing depending on element count (setModel): cleaned up unneeded "this." usage, added more docs, made exception behavior match that of the JDK (setLighWeightPopupEnabled): removed unneeded "this." usage (setEditable): dito (setMaximumRowCount): dito (setRenderer): dito (setPrototypeDisplayValue): dito (getSelectedItem): simplified, added more user doc (setSelectedIndex): corrected exception behavior, added more user doc (getSelectedIndex): fixed hardcoded dependency on DefaultComboBoxModel, added performance warning to user doc (addItem): fixed exception behavior, added user doc (insertItemAt): dito (removeItem): dito (removeItemAt): dito (removeAll): fixed exception behavior, added user doc, added support for model not being instance of DefaultComboBoxModel (getSelectedItemObjects): simplified (getItemCount): fixed dependency on DefaultComboBoxModel (getItemAt): fixed dependency on MutableComboBoxModel * javax/swing/DefaultComboBoxModel.java: (setSelectedItem): updates selected item only if new value is null or known (match JDK behavior) * javax/swing/plaf/basic/BasicComboBoxUI.java: (paintCurrentValue): renders "" if no item is selected 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/metal/MetalTheme.java, javax/swing/plaf/metal/DefaultMetalTheme.java: New files. * javax/swing/plaf/metal/MetalLookAndFeel.java * Makefile.am: Added the new files. * Makefile.in: Regenerated. 2005-02-15 Olga Rodimina <rodimina@redhat.com> * javax/swing/JTable.java (editorComp): New field. (JTable): Initialize local variables and call updateUI (selectionBackground): Make protected. (selectionForeground): Likewise. (initializeLocalVars): Create default editors and renderers, initialize editingColumn, editingRow variables. (createDefaultEditors): New Method. (createDefaultRenderers): Likewise. (createDefaultListSelectionModel): Removed (createDefaultSelectionModel): New Method. (createDefaultTableHeader): Likewise (removeColumn): Likewise. (getEditingColumn): Likewise. (setEditingColumn): Likewise. (getEditingRow): Likewise. (setEditingRow): Likewise. (getEditorComponent): Likewise. (isEditing): Likewise. (setDefaultEditor): Likewise. (addColumnSelectionInterval): Likewise. (addRowSelectionInterval): Likewise. (setColumnSelectionInterval): Likewise. (setRowSelectionInterval): Likewise. (removeColumnSelectionInterval): Likewise. (removeRowSelectionInterval): Likewise. (isColumnSelected): Likewise. (isRowSelected): Likewise. (isCellSelected): Likewise. (selectAll): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java (addColumn): New method. (getColumnClass): Likewise. (getColumnName): Likewise. 2005-02-15 Paul Jenner <psj.home@ntlworld.com> * javax/swing/TransferHandler.java (createTransferable): Made protected. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java, javax/swing/plaf/basic/BasicTableHeaderUI.java, javax/swing/plaf/basic/BasicTableUI.java: Use fixed get/setIntercellSpacing() methods. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java (getIntercellSpacing): Fixed typo in method name. (setIntercellSpacing): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/text/JTextComponent.java (focusAccelerator): New variable. (getFocusAccelerator): New method. (setFocusAccelerator): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (setTransferHandler): Made public. Fire property change event. * javax/swing/TransferHandler.java: Implemented. * javax/swing/text/JTextComponent.java (DefaultTransferHandler): New inner class. (defaultTransferHandler): New variable. (copy): New method. (cut): Likewise. (paste): Likewise. (doTransferAction): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java (collapsePath): New method. (collapseRow): Likewise. (expandPath): Likewise. (expandRow): Likewise. (checkExpandParents): Likewise. (doExpandParents): Likewise. (setExpandedState): Likewise. (makeVisible): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JPasswordField.java: Updated javadocs. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JLayeredPane.java (getLayer): Fixed return type, made public. (getPosition): Use new getLayer(). (SetPosition): Likewise. (getIndexOf): Likewise. (remove): Likewise. * javax/swing/JInternalFrame.java (getLayer): Use new JLayeredPane.getLayer(). 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/table/TableColumn.java: Added/fixed javadocs over all. (setHeaderValue): Simplified. Do nothing when old value == new value. 2005-02-15 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (setClip): Protect against null clip region. * gnu/java/awt/peer/gtk/GtkFramePeer.java (create): Call gtkWindowSetResizable. (postConfigureEvent): Only revalidate if frame size has changed. * gnu/java/awt/peer/gtk/GtkWindowPeer.java (postConfigureEvent): Only revalidate if frame size has changed. * java/awt/Component.java (reshape): Only repaint and post component events if component is showing. * java/awt/Container.java (addImpl): Only post container event if container is showing. (remove): Likewise. * java/awt/Window.java (setLocationRelativeTo): Implement. (setBoundsCallback): Only post component events if component is showing. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (clearRect): Protect against null graphics structure. Flush gdk event queue. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/imageio/ImageReader.java, javax/imageio/ImageTranscoder.java, javax/imageio/ImageWriter.java, javax/imageio/spi/ImageInputStreamSpi.java, javax/imageio/spi/ImageOutputStreamSpi.java, javax/imageio/spi/ServiceRegistry.java, javax/imageio/stream/ImageInputStream.java, javax/imageio/stream/ImageOutputStream.java: Updated. * javax/imageio/IIOException.java, javax/imageio/IIOImage.java, javax/imageio/IIOParam.java, javax/imageio/IIOParamController.java, javax/imageio/ImageIO.java, javax/imageio/ImageReadParam.java, javax/imageio/ImageTypeSpecifier.java, javax/imageio/ImageWriteParam.java, javax/imageio/spi/IIORegistry.java, javax/imageio/spi/ImageReaderSpi.java, javax/imageio/spi/ImageWriterSpi.java, javax/imageio/stream/FileCacheImageInputStream.java, javax/imageio/stream/FileCacheImageOutputStream.java, javax/imageio/stream/FileImageInputStream.java, javax/imageio/stream/FileImageOutputStream.java, javax/imageio/stream/ImageInputStreamImpl.java, javax/imageio/stream/ImageOutputStreamImpl.java, javax/imageio/stream/MemoryCacheImageInputStream.java, javax/imageio/stream/MemoryCacheImageOutputStream.java, javax/imageio/event/IIOReadProgressListener.java, javax/imageio/event/IIOReadUpdateListener.java, javax/imageio/event/IIOReadWarningListener.java, javax/imageio/event/IIOWriteProgressListener.java, javax/imageio/event/IIOWriteWarningListener.java, javax/imageio/metadata/IIOMetadata.java, javax/imageio/metadata/IIOMetadataController.java, javax/imageio/metadata/IIOMetadataFormat.java, javax/imageio/metadata/IIOInvalidTreeException.java, javax/imageio/metadata/IIOMetadataFormatImpl.java, javax/imageio/metadata/IIOMetadataNode.java: New files. * Makefile.am (javax_source_files): Added new files * Makefile.in: Regenerated. 2005-02-15 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Rework painting into BufferedImages * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Construct BufferedImage with alpha only when alpha is present in colormodel. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Rework painting into client-side jint arrays. * jni/gtk-peer/gtkcairopeer.h: Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultListCellRenderer.java (serialVersionUID): Made private. (getListCellRendererComponent): Set horizontal alignment. * javax/swing/JLabel.java (setVerticalAlignment): Re-implemented. (setHorizontalAlignment): Do nothing if old value = new value. * javax/swing/JList.java (setCellRenderer): Likewise. (setModel): Re-implemented. (setSelectionModel): Likewise. 2005-02-15 David Gilbert <david.gilbert@object-refinery.com> * java/awt/Component.java, java/awt/geom/Rectangle2D.java: Javadoc fixes. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractListModel.java (fireContentsChanged): Simplified. (fireIntervalAdded): Likewise. (fireIntervalRemoved): Likewise. * javax/swing/DefaultSingleSelectionModel.java: Reformatted. (fireStateChanged): Simplified. * javax/swing/JPopupMenu.java (setSelectionModel): Set property. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/print/Book.java: Reformatted. 2005-02-15 Michael Koch <konqueror@gmx.de> * java/awt/geom/Area.java (QuadSegment.curveArea): Remove unused variables. (CubicSegment.curveArea): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java (ANCHOR_SELECTION_PATH_PROPERTY): Added @since tag. (LEAD_SELECTION_PATH_PROPERTY): Likewise. (EXPANDS_SELECTED_PATHS_PROPERTY): Likewise. (EXPANDED): New constant. (COLLAPSED): Likewise. (nodeStates): New field. (cellEditor): New method. (cellRenderer): Likewise. (selectionModel): Likewise. (treeModel): Likewise. (scrollPathToVisible): Likewise. (scrollRowToVisible): Likewise. (isCollapsed): Likewise. (isExpanded): Likewise. (clearToggledPaths): Likewise. (getDescendantToggledPaths): Likewise. (hasBeenExpanded): Likewise. (isVisible): Likewise. (isPathEditable): Likewise. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JLayeredPane.java: Reformatted. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultMutableTreeNode.java: Completely Revised. * javax/swing/tree/MutableTreeNode.java: Reformatted. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java (setDocument): Call setDocument of super class. Don't fire property change event. 2005-02-15 Sven de Marothy <sven@physto.se> * java/awt/image/IndexColorModel.java: Add FIXME with respect to alpha handling. (getAlpha): Default to returning opaque pixels. * java/awt/image/MultiPixelPackedSampleModel.java (MultiPixelPackedSampleModel): Corrected parameters, order of bit shifts and masks, stride length off by one. 2005-02-15 Michael Koch <konqueror@gmx.de> * javax/swing/JList.java, javax/swing/JTree.java: Added much new methods and fixed much methods setting bound properties. From-SVN: r95115
2008 lines
58 KiB
Java
2008 lines
58 KiB
Java
/* Container.java -- parent container class in AWT
|
|
Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.awt;
|
|
|
|
import java.awt.event.ContainerEvent;
|
|
import java.awt.event.ContainerListener;
|
|
import java.awt.event.KeyEvent;
|
|
import java.awt.event.MouseEvent;
|
|
import java.awt.peer.ContainerPeer;
|
|
import java.awt.peer.LightweightPeer;
|
|
import java.beans.PropertyChangeListener;
|
|
import java.beans.PropertyChangeSupport;
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
import java.io.PrintStream;
|
|
import java.io.PrintWriter;
|
|
import java.io.Serializable;
|
|
import java.util.Collections;
|
|
import java.util.EventListener;
|
|
import java.util.HashSet;
|
|
import java.util.Iterator;
|
|
import java.util.Set;
|
|
|
|
import javax.accessibility.Accessible;
|
|
import javax.swing.SwingUtilities;
|
|
|
|
/**
|
|
* A generic window toolkit object that acts as a container for other objects.
|
|
* Components are tracked in a list, and new elements are at the end of the
|
|
* list or bottom of the stacking order.
|
|
*
|
|
* @author original author unknown
|
|
* @author Eric Blake <ebb9@email.byu.edu>
|
|
*
|
|
* @since 1.0
|
|
*
|
|
* @status still missing 1.4 support
|
|
*/
|
|
public class Container extends Component
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.0+.
|
|
*/
|
|
private static final long serialVersionUID = 4613797578919906343L;
|
|
|
|
/* Serialized fields from the serialization spec. */
|
|
int ncomponents;
|
|
Component[] component;
|
|
LayoutManager layoutMgr;
|
|
|
|
LightweightDispatcher dispatcher;
|
|
|
|
Dimension maxSize;
|
|
|
|
/**
|
|
* @since 1.4
|
|
*/
|
|
boolean focusCycleRoot;
|
|
|
|
int containerSerializedDataVersion;
|
|
|
|
/* Anything else is non-serializable, and should be declared "transient". */
|
|
transient ContainerListener containerListener;
|
|
transient PropertyChangeSupport changeSupport;
|
|
|
|
/** The focus traversal policy that determines how focus is
|
|
transferred between this Container and its children. */
|
|
private FocusTraversalPolicy focusTraversalPolicy;
|
|
|
|
/**
|
|
* The focus traversal keys, if not inherited from the parent or default
|
|
* keyboard manager. These sets will contain only AWTKeyStrokes that
|
|
* represent press and release events to use as focus control.
|
|
*
|
|
* @see #getFocusTraversalKeys(int)
|
|
* @see #setFocusTraversalKeys(int, Set)
|
|
* @since 1.4
|
|
*/
|
|
transient Set[] focusTraversalKeys;
|
|
|
|
/**
|
|
* Default constructor for subclasses.
|
|
*/
|
|
public Container()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Returns the number of components in this container.
|
|
*
|
|
* @return The number of components in this container.
|
|
*/
|
|
public int getComponentCount()
|
|
{
|
|
return countComponents ();
|
|
}
|
|
|
|
/**
|
|
* Returns the number of components in this container.
|
|
*
|
|
* @return The number of components in this container.
|
|
*
|
|
* @deprecated use {@link #getComponentCount()} instead
|
|
*/
|
|
public int countComponents()
|
|
{
|
|
return ncomponents;
|
|
}
|
|
|
|
/**
|
|
* Returns the component at the specified index.
|
|
*
|
|
* @param n The index of the component to retrieve.
|
|
*
|
|
* @return The requested component.
|
|
*
|
|
* @throws ArrayIndexOutOfBoundsException If the specified index is invalid
|
|
*/
|
|
public Component getComponent(int n)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
if (n < 0 || n >= ncomponents)
|
|
throw new ArrayIndexOutOfBoundsException("no such component");
|
|
|
|
return component[n];
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns an array of the components in this container.
|
|
*
|
|
* @return The components in this container.
|
|
*/
|
|
public Component[] getComponents()
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
Component[] result = new Component[ncomponents];
|
|
|
|
if (ncomponents > 0)
|
|
System.arraycopy(component, 0, result, 0, ncomponents);
|
|
|
|
return result;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Swaps the components at position i and j, in the container.
|
|
*/
|
|
|
|
protected void swapComponents (int i, int j)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
if (i < 0
|
|
|| i >= component.length
|
|
|| j < 0
|
|
|| j >= component.length)
|
|
throw new ArrayIndexOutOfBoundsException ();
|
|
Component tmp = component[i];
|
|
component[i] = component[j];
|
|
component[j] = tmp;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the insets for this container, which is the space used for
|
|
* borders, the margin, etc.
|
|
*
|
|
* @return The insets for this container.
|
|
*/
|
|
public Insets getInsets()
|
|
{
|
|
return insets ();
|
|
}
|
|
|
|
/**
|
|
* Returns the insets for this container, which is the space used for
|
|
* borders, the margin, etc.
|
|
*
|
|
* @return The insets for this container.
|
|
* @deprecated use {@link #getInsets()} instead
|
|
*/
|
|
public Insets insets()
|
|
{
|
|
if (peer == null)
|
|
return new Insets (0, 0, 0, 0);
|
|
|
|
return ((ContainerPeer) peer).getInsets ();
|
|
}
|
|
|
|
/**
|
|
* Adds the specified component to this container at the end of the
|
|
* component list.
|
|
*
|
|
* @param comp The component to add to the container.
|
|
*
|
|
* @return The same component that was added.
|
|
*/
|
|
public Component add(Component comp)
|
|
{
|
|
addImpl(comp, null, -1);
|
|
return comp;
|
|
}
|
|
|
|
/**
|
|
* Adds the specified component to the container at the end of the
|
|
* component list. This method should not be used. Instead, use
|
|
* <code>add(Component, Object)</code>.
|
|
*
|
|
* @param name The name of the component to be added.
|
|
* @param comp The component to be added.
|
|
*
|
|
* @return The same component that was added.
|
|
*
|
|
* @see #add(Component,Object)
|
|
*/
|
|
public Component add(String name, Component comp)
|
|
{
|
|
addImpl(comp, name, -1);
|
|
return comp;
|
|
}
|
|
|
|
/**
|
|
* Adds the specified component to this container at the specified index
|
|
* in the component list.
|
|
*
|
|
* @param comp The component to be added.
|
|
* @param index The index in the component list to insert this child
|
|
* at, or -1 to add at the end of the list.
|
|
*
|
|
* @return The same component that was added.
|
|
*
|
|
* @throws ArrayIndexOutOfBounds If the specified index is invalid.
|
|
*/
|
|
public Component add(Component comp, int index)
|
|
{
|
|
addImpl(comp, null, index);
|
|
return comp;
|
|
}
|
|
|
|
/**
|
|
* Adds the specified component to this container at the end of the
|
|
* component list. The layout manager will use the specified constraints
|
|
* when laying out this component.
|
|
*
|
|
* @param comp The component to be added to this container.
|
|
* @param constraints The layout constraints for this component.
|
|
*/
|
|
public void add(Component comp, Object constraints)
|
|
{
|
|
addImpl(comp, constraints, -1);
|
|
}
|
|
|
|
/**
|
|
* Adds the specified component to this container at the specified index
|
|
* in the component list. The layout manager will use the specified
|
|
* constraints when layout out this component.
|
|
*
|
|
* @param comp The component to be added.
|
|
* @param constraints The layout constraints for this component.
|
|
* @param index The index in the component list to insert this child
|
|
* at, or -1 to add at the end of the list.
|
|
*
|
|
* @throws ArrayIndexOutOfBounds If the specified index is invalid.
|
|
*/
|
|
public void add(Component comp, Object constraints, int index)
|
|
{
|
|
addImpl(comp, constraints, index);
|
|
}
|
|
|
|
/**
|
|
* This method is called by all the <code>add()</code> methods to perform
|
|
* the actual adding of the component. Subclasses who wish to perform
|
|
* their own processing when a component is added should override this
|
|
* method. Any subclass doing this must call the superclass version of
|
|
* this method in order to ensure proper functioning of the container.
|
|
*
|
|
* @param comp The component to be added.
|
|
* @param constraints The layout constraints for this component, or
|
|
* <code>null</code> if there are no constraints.
|
|
* @param index The index in the component list to insert this child
|
|
* at, or -1 to add at the end of the list.
|
|
*
|
|
* @throws ArrayIndexOutOfBounds If the specified index is invalid.
|
|
*/
|
|
protected void addImpl(Component comp, Object constraints, int index)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
if (index > ncomponents
|
|
|| (index < 0 && index != -1)
|
|
|| comp instanceof Window
|
|
|| (comp instanceof Container
|
|
&& ((Container) comp).isAncestorOf(this)))
|
|
throw new IllegalArgumentException();
|
|
|
|
// Reparent component, and make sure component is instantiated if
|
|
// we are.
|
|
if (comp.parent != null)
|
|
comp.parent.remove(comp);
|
|
comp.parent = this;
|
|
if (peer != null)
|
|
{
|
|
if (comp.isLightweight ())
|
|
{
|
|
enableEvents (comp.eventMask);
|
|
if (!isLightweight ())
|
|
enableEvents (AWTEvent.PAINT_EVENT_MASK);
|
|
}
|
|
}
|
|
|
|
invalidate();
|
|
|
|
if (component == null)
|
|
component = new Component[4]; // FIXME, better initial size?
|
|
|
|
// This isn't the most efficient implementation. We could do less
|
|
// copying when growing the array. It probably doesn't matter.
|
|
if (ncomponents >= component.length)
|
|
{
|
|
int nl = component.length * 2;
|
|
Component[] c = new Component[nl];
|
|
System.arraycopy(component, 0, c, 0, ncomponents);
|
|
component = c;
|
|
}
|
|
|
|
if (index == -1)
|
|
component[ncomponents++] = comp;
|
|
else
|
|
{
|
|
System.arraycopy(component, index, component, index + 1,
|
|
ncomponents - index);
|
|
component[index] = comp;
|
|
++ncomponents;
|
|
}
|
|
|
|
// Notify the layout manager.
|
|
if (layoutMgr != null)
|
|
{
|
|
if (layoutMgr instanceof LayoutManager2)
|
|
{
|
|
LayoutManager2 lm2 = (LayoutManager2) layoutMgr;
|
|
lm2.addLayoutComponent(comp, constraints);
|
|
}
|
|
else if (constraints instanceof String)
|
|
layoutMgr.addLayoutComponent((String) constraints, comp);
|
|
else
|
|
layoutMgr.addLayoutComponent(null, comp);
|
|
}
|
|
|
|
if (isShowing ())
|
|
{
|
|
// Post event to notify of adding the component.
|
|
ContainerEvent ce = new ContainerEvent(this,
|
|
ContainerEvent.COMPONENT_ADDED,
|
|
comp);
|
|
getToolkit().getSystemEventQueue().postEvent(ce);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Removes the component at the specified index from this container.
|
|
*
|
|
* @param index The index of the component to remove.
|
|
*/
|
|
public void remove(int index)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
Component r = component[index];
|
|
|
|
r.removeNotify();
|
|
|
|
System.arraycopy(component, index + 1, component, index,
|
|
ncomponents - index - 1);
|
|
component[--ncomponents] = null;
|
|
|
|
invalidate();
|
|
|
|
if (layoutMgr != null)
|
|
layoutMgr.removeLayoutComponent(r);
|
|
|
|
r.parent = null;
|
|
|
|
if (isShowing ())
|
|
{
|
|
// Post event to notify of removing the component.
|
|
ContainerEvent ce = new ContainerEvent(this,
|
|
ContainerEvent.COMPONENT_REMOVED,
|
|
r);
|
|
getToolkit().getSystemEventQueue().postEvent(ce);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Removes the specified component from this container.
|
|
*
|
|
* @return component The component to remove from this container.
|
|
*/
|
|
public void remove(Component comp)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
{
|
|
if (component[i] == comp)
|
|
{
|
|
remove(i);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Removes all components from this container.
|
|
*/
|
|
public void removeAll()
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
while (ncomponents > 0)
|
|
remove(0);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the current layout manager for this container.
|
|
*
|
|
* @return The layout manager for this container.
|
|
*/
|
|
public LayoutManager getLayout()
|
|
{
|
|
return layoutMgr;
|
|
}
|
|
|
|
/**
|
|
* Sets the layout manager for this container to the specified layout
|
|
* manager.
|
|
*
|
|
* @param mgr The new layout manager for this container.
|
|
*/
|
|
public void setLayout(LayoutManager mgr)
|
|
{
|
|
layoutMgr = mgr;
|
|
invalidate();
|
|
}
|
|
|
|
/**
|
|
* Layout the components in this container.
|
|
*/
|
|
public void doLayout()
|
|
{
|
|
layout ();
|
|
}
|
|
|
|
/**
|
|
* Layout the components in this container.
|
|
*
|
|
* @deprecated use {@link #doLayout()} instead
|
|
*/
|
|
public void layout()
|
|
{
|
|
if (layoutMgr != null)
|
|
layoutMgr.layoutContainer (this);
|
|
}
|
|
|
|
/**
|
|
* Invalidates this container to indicate that it (and all parent
|
|
* containers) need to be laid out.
|
|
*/
|
|
public void invalidate()
|
|
{
|
|
super.invalidate();
|
|
}
|
|
|
|
/**
|
|
* Re-lays out the components in this container.
|
|
*/
|
|
public void validate()
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
if (! isValid() && peer != null)
|
|
{
|
|
validateTree();
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Recursively invalidates the container tree.
|
|
*/
|
|
void invalidateTree()
|
|
{
|
|
for (int i = 0; i < ncomponents; i++)
|
|
{
|
|
Component comp = component[i];
|
|
comp.invalidate();
|
|
if (comp instanceof Container)
|
|
((Container) comp).invalidateTree();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Recursively validates the container tree, recomputing any invalid
|
|
* layouts.
|
|
*/
|
|
protected void validateTree()
|
|
{
|
|
if (valid)
|
|
return;
|
|
|
|
ContainerPeer cPeer = null;
|
|
if (peer != null && ! (peer instanceof LightweightPeer))
|
|
{
|
|
cPeer = (ContainerPeer) peer;
|
|
cPeer.beginValidate();
|
|
}
|
|
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
{
|
|
Component comp = component[i];
|
|
|
|
if (comp.getPeer () == null)
|
|
comp.addNotify();
|
|
}
|
|
|
|
doLayout ();
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
{
|
|
Component comp = component[i];
|
|
|
|
if (! comp.isValid())
|
|
{
|
|
if (comp instanceof Container)
|
|
{
|
|
((Container) comp).validateTree();
|
|
}
|
|
else
|
|
{
|
|
component[i].validate();
|
|
}
|
|
}
|
|
}
|
|
|
|
/* children will call invalidate() when they are layed out. It
|
|
is therefore important that valid is not set to true
|
|
until after the children have been layed out. */
|
|
valid = true;
|
|
|
|
if (cPeer != null)
|
|
cPeer.endValidate();
|
|
}
|
|
|
|
public void setFont(Font f)
|
|
{
|
|
super.setFont(f);
|
|
// FIXME: Although it might make more sense to invalidate only
|
|
// those children whose font == null, Sun invalidates all children.
|
|
// So we'll do the same.
|
|
invalidateTree();
|
|
}
|
|
|
|
/**
|
|
* Returns the preferred size of this container.
|
|
*
|
|
* @return The preferred size of this container.
|
|
*/
|
|
public Dimension getPreferredSize()
|
|
{
|
|
return preferredSize ();
|
|
}
|
|
|
|
/**
|
|
* Returns the preferred size of this container.
|
|
*
|
|
* @return The preferred size of this container.
|
|
*
|
|
* @deprecated use {@link #getPreferredSize()} instead
|
|
*/
|
|
public Dimension preferredSize()
|
|
{
|
|
if (layoutMgr != null)
|
|
return layoutMgr.preferredLayoutSize (this);
|
|
else
|
|
return super.preferredSize ();
|
|
}
|
|
|
|
/**
|
|
* Returns the minimum size of this container.
|
|
*
|
|
* @return The minimum size of this container.
|
|
*/
|
|
public Dimension getMinimumSize()
|
|
{
|
|
return minimumSize ();
|
|
}
|
|
|
|
/**
|
|
* Returns the minimum size of this container.
|
|
*
|
|
* @return The minimum size of this container.
|
|
*
|
|
* @deprecated use {@link #getMinimumSize()} instead
|
|
*/
|
|
public Dimension minimumSize()
|
|
{
|
|
if (layoutMgr != null)
|
|
return layoutMgr.minimumLayoutSize (this);
|
|
else
|
|
return super.minimumSize ();
|
|
}
|
|
|
|
/**
|
|
* Returns the maximum size of this container.
|
|
*
|
|
* @return The maximum size of this container.
|
|
*/
|
|
public Dimension getMaximumSize()
|
|
{
|
|
if (layoutMgr != null && layoutMgr instanceof LayoutManager2)
|
|
{
|
|
LayoutManager2 lm2 = (LayoutManager2) layoutMgr;
|
|
return lm2.maximumLayoutSize(this);
|
|
}
|
|
else
|
|
return super.getMaximumSize();
|
|
}
|
|
|
|
/**
|
|
* Returns the preferred alignment along the X axis. This is a value
|
|
* between 0 and 1 where 0 represents alignment flush left and
|
|
* 1 means alignment flush right, and 0.5 means centered.
|
|
*
|
|
* @return The preferred alignment along the X axis.
|
|
*/
|
|
public float getAlignmentX()
|
|
{
|
|
if (layoutMgr instanceof LayoutManager2)
|
|
{
|
|
LayoutManager2 lm2 = (LayoutManager2) layoutMgr;
|
|
return lm2.getLayoutAlignmentX(this);
|
|
}
|
|
else
|
|
return super.getAlignmentX();
|
|
}
|
|
|
|
/**
|
|
* Returns the preferred alignment along the Y axis. This is a value
|
|
* between 0 and 1 where 0 represents alignment flush top and
|
|
* 1 means alignment flush bottom, and 0.5 means centered.
|
|
*
|
|
* @return The preferred alignment along the Y axis.
|
|
*/
|
|
public float getAlignmentY()
|
|
{
|
|
if (layoutMgr instanceof LayoutManager2)
|
|
{
|
|
LayoutManager2 lm2 = (LayoutManager2) layoutMgr;
|
|
return lm2.getLayoutAlignmentY(this);
|
|
}
|
|
else
|
|
return super.getAlignmentY();
|
|
}
|
|
|
|
/**
|
|
* Paints this container. The implementation of this method in this
|
|
* class forwards to any lightweight components in this container. If
|
|
* this method is subclassed, this method should still be invoked as
|
|
* a superclass method so that lightweight components are properly
|
|
* drawn.
|
|
*
|
|
* @param g The graphics context for this paint job.
|
|
*/
|
|
public void paint(Graphics g)
|
|
{
|
|
if (!isShowing())
|
|
return;
|
|
// Paint self first.
|
|
super.paint(g);
|
|
// Visit heavyweights as well, in case they were
|
|
// erased when we cleared the background for this container.
|
|
visitChildren(g, GfxPaintVisitor.INSTANCE, false);
|
|
}
|
|
|
|
/**
|
|
* Updates this container. The implementation of this method in this
|
|
* class forwards to any lightweight components in this container. If
|
|
* this method is subclassed, this method should still be invoked as
|
|
* a superclass method so that lightweight components are properly
|
|
* drawn.
|
|
*
|
|
* @param g The graphics context for this update.
|
|
*/
|
|
public void update(Graphics g)
|
|
{
|
|
super.update(g);
|
|
}
|
|
|
|
/**
|
|
* Prints this container. The implementation of this method in this
|
|
* class forwards to any lightweight components in this container. If
|
|
* this method is subclassed, this method should still be invoked as
|
|
* a superclass method so that lightweight components are properly
|
|
* drawn.
|
|
*
|
|
* @param g The graphics context for this print job.
|
|
*/
|
|
public void print(Graphics g)
|
|
{
|
|
super.print(g);
|
|
visitChildren(g, GfxPrintVisitor.INSTANCE, true);
|
|
}
|
|
|
|
/**
|
|
* Paints all of the components in this container.
|
|
*
|
|
* @param g The graphics context for this paint job.
|
|
*/
|
|
public void paintComponents(Graphics g)
|
|
{
|
|
super.paint(g);
|
|
visitChildren(g, GfxPaintAllVisitor.INSTANCE, true);
|
|
}
|
|
|
|
/**
|
|
* Prints all of the components in this container.
|
|
*
|
|
* @param g The graphics context for this print job.
|
|
*/
|
|
public void printComponents(Graphics g)
|
|
{
|
|
super.paint(g);
|
|
visitChildren(g, GfxPrintAllVisitor.INSTANCE, true);
|
|
}
|
|
|
|
/**
|
|
* Adds the specified container listener to this object's list of
|
|
* container listeners.
|
|
*
|
|
* @param listener The listener to add.
|
|
*/
|
|
public synchronized void addContainerListener(ContainerListener listener)
|
|
{
|
|
containerListener = AWTEventMulticaster.add(containerListener, listener);
|
|
}
|
|
|
|
/**
|
|
* Removes the specified container listener from this object's list of
|
|
* container listeners.
|
|
*
|
|
* @param listener The listener to remove.
|
|
*/
|
|
public synchronized void removeContainerListener(ContainerListener listener)
|
|
{
|
|
containerListener = AWTEventMulticaster.remove(containerListener, listener);
|
|
}
|
|
|
|
/**
|
|
* @since 1.4
|
|
*/
|
|
public synchronized ContainerListener[] getContainerListeners()
|
|
{
|
|
return (ContainerListener[])
|
|
AWTEventMulticaster.getListeners(containerListener,
|
|
ContainerListener.class);
|
|
}
|
|
|
|
/**
|
|
* Returns an array of all the objects currently registered as FooListeners
|
|
* upon this Container. FooListeners are registered using the addFooListener
|
|
* method.
|
|
*
|
|
* @exception ClassCastException If listenerType doesn't specify a class or
|
|
* interface that implements @see java.util.EventListener.
|
|
*
|
|
* @since 1.3
|
|
*/
|
|
public EventListener[] getListeners(Class listenerType)
|
|
{
|
|
if (listenerType == ContainerListener.class)
|
|
return getContainerListeners();
|
|
return super.getListeners(listenerType);
|
|
}
|
|
|
|
/**
|
|
* Processes the specified event. This method calls
|
|
* <code>processContainerEvent()</code> if this method is a
|
|
* <code>ContainerEvent</code>, otherwise it calls the superclass
|
|
* method.
|
|
*
|
|
* @param e The event to be processed.
|
|
*/
|
|
protected void processEvent(AWTEvent e)
|
|
{
|
|
if (e instanceof ContainerEvent)
|
|
processContainerEvent((ContainerEvent) e);
|
|
else
|
|
super.processEvent(e);
|
|
}
|
|
|
|
/**
|
|
* Called when a container event occurs if container events are enabled.
|
|
* This method calls any registered listeners.
|
|
*
|
|
* @param e The event that occurred.
|
|
*/
|
|
protected void processContainerEvent(ContainerEvent e)
|
|
{
|
|
if (containerListener == null)
|
|
return;
|
|
switch (e.id)
|
|
{
|
|
case ContainerEvent.COMPONENT_ADDED:
|
|
containerListener.componentAdded(e);
|
|
break;
|
|
|
|
case ContainerEvent.COMPONENT_REMOVED:
|
|
containerListener.componentRemoved(e);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* AWT 1.0 event processor.
|
|
*
|
|
* @param e The event that occurred.
|
|
*
|
|
* @deprecated use {@link #dispatchEvent(AWTEvent)} instead
|
|
*/
|
|
public void deliverEvent(Event e)
|
|
{
|
|
if (!handleEvent (e))
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
Component parent = getParent ();
|
|
|
|
if (parent != null)
|
|
parent.deliverEvent (e);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the component located at the specified point. This is done
|
|
* by checking whether or not a child component claims to contain this
|
|
* point. The first child component that does is returned. If no
|
|
* child component claims the point, the container itself is returned,
|
|
* unless the point does not exist within this container, in which
|
|
* case <code>null</code> is returned.
|
|
*
|
|
* @param x The X coordinate of the point.
|
|
* @param y The Y coordinate of the point.
|
|
*
|
|
* @return The component containing the specified point, or
|
|
* <code>null</code> if there is no such point.
|
|
*/
|
|
public Component getComponentAt(int x, int y)
|
|
{
|
|
return locate (x, y);
|
|
}
|
|
|
|
/**
|
|
* Returns the component located at the specified point. This is done
|
|
* by checking whether or not a child component claims to contain this
|
|
* point. The first child component that does is returned. If no
|
|
* child component claims the point, the container itself is returned,
|
|
* unless the point does not exist within this container, in which
|
|
* case <code>null</code> is returned.
|
|
*
|
|
* @param x The x position of the point to return the component at.
|
|
* @param y The y position of the point to return the component at.
|
|
*
|
|
* @return The component containing the specified point, or <code>null</code>
|
|
* if there is no such point.
|
|
*
|
|
* @deprecated use {@link #getComponentAt(int, int)} instead
|
|
*/
|
|
public Component locate(int x, int y)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
if (!contains (x, y))
|
|
return null;
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
{
|
|
// Ignore invisible children...
|
|
if (!component[i].isVisible ())
|
|
continue;
|
|
|
|
int x2 = x - component[i].x;
|
|
int y2 = y - component[i].y;
|
|
if (component[i].contains (x2, y2))
|
|
return component[i];
|
|
}
|
|
return this;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the component located at the specified point. This is done
|
|
* by checking whether or not a child component claims to contain this
|
|
* point. The first child component that does is returned. If no
|
|
* child component claims the point, the container itself is returned,
|
|
* unless the point does not exist within this container, in which
|
|
* case <code>null</code> is returned.
|
|
*
|
|
* @param p The point to return the component at.
|
|
* @return The component containing the specified point, or <code>null</code>
|
|
* if there is no such point.
|
|
*/
|
|
public Component getComponentAt(Point p)
|
|
{
|
|
return getComponentAt (p.x, p.y);
|
|
}
|
|
|
|
public Component findComponentAt(int x, int y)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
if (! contains(x, y))
|
|
return null;
|
|
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
{
|
|
// Ignore invisible children...
|
|
if (!component[i].isVisible())
|
|
continue;
|
|
|
|
int x2 = x - component[i].x;
|
|
int y2 = y - component[i].y;
|
|
// We don't do the contains() check right away because
|
|
// findComponentAt would redundantly do it first thing.
|
|
if (component[i] instanceof Container)
|
|
{
|
|
Container k = (Container) component[i];
|
|
Component r = k.findComponentAt(x2, y2);
|
|
if (r != null)
|
|
return r;
|
|
}
|
|
else if (component[i].contains(x2, y2))
|
|
return component[i];
|
|
}
|
|
|
|
return this;
|
|
}
|
|
}
|
|
|
|
public Component findComponentAt(Point p)
|
|
{
|
|
return findComponentAt(p.x, p.y);
|
|
}
|
|
|
|
/**
|
|
* Called when this container is added to another container to inform it
|
|
* to create its peer. Peers for any child components will also be
|
|
* created.
|
|
*/
|
|
public void addNotify()
|
|
{
|
|
super.addNotify();
|
|
addNotifyContainerChildren();
|
|
}
|
|
|
|
/**
|
|
* Called when this container is removed from its parent container to
|
|
* inform it to destroy its peer. This causes the peers of all child
|
|
* component to be destroyed as well.
|
|
*/
|
|
public void removeNotify()
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
component[i].removeNotify();
|
|
super.removeNotify();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Tests whether or not the specified component is contained within
|
|
* this components subtree.
|
|
*
|
|
* @param comp The component to test.
|
|
*
|
|
* @return <code>true</code> if this container is an ancestor of the
|
|
* specified component, <code>false</code> otherwise.
|
|
*/
|
|
public boolean isAncestorOf(Component comp)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
while (true)
|
|
{
|
|
if (comp == null)
|
|
return false;
|
|
if (comp == this)
|
|
return true;
|
|
comp = comp.getParent();
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a string representing the state of this container for
|
|
* debugging purposes.
|
|
*
|
|
* @return A string representing the state of this container.
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
if (layoutMgr == null)
|
|
return super.paramString();
|
|
|
|
StringBuffer sb = new StringBuffer();
|
|
sb.append(super.paramString());
|
|
sb.append(",layout=");
|
|
sb.append(layoutMgr.getClass().getName());
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Writes a listing of this container to the specified stream starting
|
|
* at the specified indentation point.
|
|
*
|
|
* @param out The <code>PrintStream</code> to write to.
|
|
* @param indent The indentation point.
|
|
*/
|
|
public void list(PrintStream out, int indent)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
super.list(out, indent);
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
component[i].list(out, indent + 2);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Writes a listing of this container to the specified stream starting
|
|
* at the specified indentation point.
|
|
*
|
|
* @param out The <code>PrintWriter</code> to write to.
|
|
* @param indent The indentation point.
|
|
*/
|
|
public void list(PrintWriter out, int indent)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
super.list(out, indent);
|
|
for (int i = 0; i < ncomponents; ++i)
|
|
component[i].list(out, indent + 2);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the focus traversal keys for a given traversal operation for this
|
|
* Container.
|
|
*
|
|
* @exception IllegalArgumentException If id is not one of
|
|
* KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS,
|
|
* KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS,
|
|
* KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS,
|
|
* or KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS,
|
|
* or if keystrokes contains null, or if any Object in keystrokes is not an
|
|
* AWTKeyStroke, or if any keystroke represents a KEY_TYPED event, or if any
|
|
* keystroke already maps to another focus traversal operation for this
|
|
* Container.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public void setFocusTraversalKeys(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)
|
|
{
|
|
Container parent = getParent ();
|
|
|
|
while (parent != null)
|
|
{
|
|
if (parent.areFocusTraversalKeysSet (id))
|
|
{
|
|
keystrokes = parent.getFocusTraversalKeys (id);
|
|
break;
|
|
}
|
|
parent = parent.getParent ();
|
|
}
|
|
|
|
if (keystrokes == null)
|
|
keystrokes = KeyboardFocusManager.getCurrentKeyboardFocusManager ().
|
|
getDefaultFocusTraversalKeys (id);
|
|
}
|
|
|
|
Set sa;
|
|
Set sb;
|
|
Set sc;
|
|
String name;
|
|
switch (id)
|
|
{
|
|
case KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS:
|
|
sa = getFocusTraversalKeys
|
|
(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS);
|
|
sb = getFocusTraversalKeys
|
|
(KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS);
|
|
sc = getFocusTraversalKeys
|
|
(KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS);
|
|
name = "forwardFocusTraversalKeys";
|
|
break;
|
|
case KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS:
|
|
sa = getFocusTraversalKeys
|
|
(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
|
|
sb = getFocusTraversalKeys
|
|
(KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS);
|
|
sc = getFocusTraversalKeys
|
|
(KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS);
|
|
name = "backwardFocusTraversalKeys";
|
|
break;
|
|
case KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS:
|
|
sa = getFocusTraversalKeys
|
|
(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
|
|
sb = getFocusTraversalKeys
|
|
(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS);
|
|
sc = getFocusTraversalKeys
|
|
(KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS);
|
|
name = "upCycleFocusTraversalKeys";
|
|
break;
|
|
case KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS:
|
|
sa = getFocusTraversalKeys
|
|
(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
|
|
sb = getFocusTraversalKeys
|
|
(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS);
|
|
sc = getFocusTraversalKeys
|
|
(KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS);
|
|
name = "downCycleFocusTraversalKeys";
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
|
|
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)
|
|
|| ((AWTKeyStroke) o).keyCode == KeyEvent.VK_UNDEFINED)
|
|
throw new IllegalArgumentException ();
|
|
}
|
|
|
|
if (focusTraversalKeys == null)
|
|
focusTraversalKeys = new Set[3];
|
|
|
|
keystrokes = Collections.unmodifiableSet (new HashSet (keystrokes));
|
|
firePropertyChange (name, focusTraversalKeys[id], keystrokes);
|
|
|
|
focusTraversalKeys[id] = keystrokes;
|
|
}
|
|
|
|
/**
|
|
* Returns the Set of focus traversal keys for a given traversal operation for
|
|
* this Container.
|
|
*
|
|
* @exception IllegalArgumentException If id is not one of
|
|
* KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS,
|
|
* KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS,
|
|
* KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS,
|
|
* or KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public Set getFocusTraversalKeys (int id)
|
|
{
|
|
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 ();
|
|
|
|
Set s = null;
|
|
|
|
if (focusTraversalKeys != null)
|
|
s = focusTraversalKeys[id];
|
|
|
|
if (s == null && parent != null)
|
|
s = parent.getFocusTraversalKeys (id);
|
|
|
|
return s == null ? (KeyboardFocusManager.getCurrentKeyboardFocusManager()
|
|
.getDefaultFocusTraversalKeys(id)) : s;
|
|
}
|
|
|
|
/**
|
|
* Returns whether the Set of focus traversal keys for the given focus
|
|
* traversal operation has been explicitly defined for this Container.
|
|
* If this method returns false, this Container is inheriting the Set from
|
|
* an ancestor, or from the current KeyboardFocusManager.
|
|
*
|
|
* @exception IllegalArgumentException If id is not one of
|
|
* KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS,
|
|
* KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS,
|
|
* KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS,
|
|
* or KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public boolean areFocusTraversalKeysSet (int id)
|
|
{
|
|
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 ();
|
|
|
|
return focusTraversalKeys != null && focusTraversalKeys[id] != null;
|
|
}
|
|
|
|
/**
|
|
* Check whether the given Container is the focus cycle root of this
|
|
* Container's focus traversal cycle. If this Container is a focus
|
|
* cycle root itself, then it will be in two different focus cycles
|
|
* -- it's own, and that of its ancestor focus cycle root's. In
|
|
* that case, if <code>c</code> is either of those containers, this
|
|
* method will return true.
|
|
*
|
|
* @param c the candidate Container
|
|
*
|
|
* @return true if c is the focus cycle root of the focus traversal
|
|
* cycle to which this Container belongs, false otherwise
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public boolean isFocusCycleRoot (Container c)
|
|
{
|
|
if (this == c
|
|
&& isFocusCycleRoot ())
|
|
return true;
|
|
|
|
Container ancestor = getFocusCycleRootAncestor ();
|
|
|
|
if (c == ancestor)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* If this Container is a focus cycle root, set the focus traversal
|
|
* policy that determines the focus traversal order for its
|
|
* children. If non-null, this policy will be inherited by all
|
|
* inferior focus cycle roots. If <code>policy</code> is null, this
|
|
* Container will inherit its policy from the closest ancestor focus
|
|
* cycle root that's had its policy set.
|
|
*
|
|
* @param policy the new focus traversal policy for this Container or null
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public void setFocusTraversalPolicy (FocusTraversalPolicy policy)
|
|
{
|
|
focusTraversalPolicy = policy;
|
|
}
|
|
|
|
/**
|
|
* Return the focus traversal policy that determines the focus
|
|
* traversal order for this Container's children. This method
|
|
* returns null if this Container is not a focus cycle root. If the
|
|
* focus traversal policy has not been set explicitly, then this
|
|
* method will return an ancestor focus cycle root's policy instead.
|
|
*
|
|
* @return this Container's focus traversal policy or null
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public FocusTraversalPolicy getFocusTraversalPolicy ()
|
|
{
|
|
if (!isFocusCycleRoot ())
|
|
return null;
|
|
|
|
if (focusTraversalPolicy == null)
|
|
{
|
|
Container ancestor = getFocusCycleRootAncestor ();
|
|
|
|
if (ancestor != this)
|
|
return ancestor.getFocusTraversalPolicy ();
|
|
else
|
|
{
|
|
KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager ();
|
|
|
|
return manager.getDefaultFocusTraversalPolicy ();
|
|
}
|
|
}
|
|
else
|
|
return focusTraversalPolicy;
|
|
}
|
|
|
|
/**
|
|
* Check whether this Container's focus traversal policy has been
|
|
* explicitly set. If it has not, then this Container will inherit
|
|
* its focus traversal policy from one of its ancestor focus cycle
|
|
* roots.
|
|
*
|
|
* @return true if focus traversal policy is set, false otherwise
|
|
*/
|
|
public boolean isFocusTraversalPolicySet ()
|
|
{
|
|
return focusTraversalPolicy == null;
|
|
}
|
|
|
|
/**
|
|
* Set whether or not this Container is the root of a focus
|
|
* traversal cycle. This Container's focus traversal policy
|
|
* determines the order of focus traversal. Some policies prevent
|
|
* the focus from being transferred between two traversal cycles
|
|
* until an up or down traversal operation is performed. In that
|
|
* case, normal traversal (not up or down) is limited to this
|
|
* Container and all of this Container's descendents that are not
|
|
* descendents of inferior focus cycle roots. In the default case
|
|
* however, ContainerOrderFocusTraversalPolicy is in effect, and it
|
|
* supports implicit down-cycle traversal operations.
|
|
*
|
|
* @return true if this is a focus cycle root, false otherwise
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public void setFocusCycleRoot (boolean focusCycleRoot)
|
|
{
|
|
this.focusCycleRoot = focusCycleRoot;
|
|
}
|
|
|
|
/**
|
|
* Check whether this Container is a focus cycle root.
|
|
*
|
|
* @return true if this is a focus cycle root, false otherwise
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public boolean isFocusCycleRoot ()
|
|
{
|
|
return focusCycleRoot;
|
|
}
|
|
|
|
/**
|
|
* Transfer focus down one focus traversal cycle. If this Container
|
|
* is a focus cycle root, then its default component becomes the
|
|
* focus owner, and this Container becomes the current focus cycle
|
|
* root. No traversal will occur if this Container is not a focus
|
|
* cycle root.
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public void transferFocusDownCycle ()
|
|
{
|
|
KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager ();
|
|
|
|
manager.downFocusCycle (this);
|
|
}
|
|
|
|
/**
|
|
* Sets the ComponentOrientation property of this container and all components
|
|
* contained within it.
|
|
*
|
|
* @exception NullPointerException If orientation is null
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public void applyComponentOrientation (ComponentOrientation orientation)
|
|
{
|
|
if (orientation == null)
|
|
throw new NullPointerException ();
|
|
}
|
|
|
|
public void addPropertyChangeListener (PropertyChangeListener listener)
|
|
{
|
|
if (listener == null)
|
|
return;
|
|
|
|
if (changeSupport == null)
|
|
changeSupport = new PropertyChangeSupport (this);
|
|
|
|
changeSupport.addPropertyChangeListener (listener);
|
|
}
|
|
|
|
public void addPropertyChangeListener (String name,
|
|
PropertyChangeListener listener)
|
|
{
|
|
if (listener == null)
|
|
return;
|
|
|
|
if (changeSupport == null)
|
|
changeSupport = new PropertyChangeSupport (this);
|
|
|
|
changeSupport.addPropertyChangeListener (name, listener);
|
|
}
|
|
|
|
// Hidden helper methods.
|
|
|
|
/**
|
|
* Perform a graphics operation on the children of this container.
|
|
* For each applicable child, the visitChild() method will be called
|
|
* to perform the graphics operation.
|
|
*
|
|
* @param gfx The graphics object that will be used to derive new
|
|
* graphics objects for the children.
|
|
*
|
|
* @param visitor Object encapsulating the graphics operation that
|
|
* should be performed.
|
|
*
|
|
* @param lightweightOnly If true, only lightweight components will
|
|
* be visited.
|
|
*/
|
|
private void visitChildren(Graphics gfx, GfxVisitor visitor,
|
|
boolean lightweightOnly)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
for (int i = ncomponents - 1; i >= 0; --i)
|
|
{
|
|
Component comp = component[i];
|
|
// If we're visiting heavyweights as well,
|
|
// don't recurse into Containers here. This avoids
|
|
// painting the same nested child multiple times.
|
|
boolean applicable = comp.isVisible()
|
|
&& (comp.isLightweight()
|
|
|| !lightweightOnly && ! (comp instanceof Container));
|
|
|
|
if (applicable)
|
|
visitChild(gfx, visitor, comp);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Perform a graphics operation on a child. A translated and clipped
|
|
* graphics object will be created, and the visit() method of the
|
|
* visitor will be called to perform the operation.
|
|
*
|
|
* @param gfx The graphics object that will be used to derive new
|
|
* graphics objects for the child.
|
|
*
|
|
* @param visitor Object encapsulating the graphics operation that
|
|
* should be performed.
|
|
*
|
|
* @param comp The child component that should be visited.
|
|
*/
|
|
private void visitChild(Graphics gfx, GfxVisitor visitor,
|
|
Component comp)
|
|
{
|
|
Rectangle bounds = comp.getBounds();
|
|
Rectangle oldClip = gfx.getClipBounds();
|
|
if (oldClip == null)
|
|
oldClip = bounds;
|
|
|
|
Rectangle clip = oldClip.intersection(bounds);
|
|
|
|
if (clip.isEmpty()) return;
|
|
|
|
boolean clipped = false;
|
|
boolean translated = false;
|
|
try
|
|
{
|
|
gfx.setClip(clip.x, clip.y, clip.width, clip.height);
|
|
clipped = true;
|
|
gfx.translate(bounds.x, bounds.y);
|
|
translated = true;
|
|
visitor.visit(comp, gfx);
|
|
}
|
|
finally
|
|
{
|
|
if (translated)
|
|
gfx.translate (-bounds.x, -bounds.y);
|
|
if (clipped)
|
|
gfx.setClip (oldClip.x, oldClip.y, oldClip.width, oldClip.height);
|
|
}
|
|
}
|
|
|
|
void dispatchEventImpl(AWTEvent e)
|
|
{
|
|
// Give lightweight dispatcher a chance to handle it.
|
|
if (eventTypeEnabled (e.id)
|
|
&& dispatcher != null
|
|
&& dispatcher.handleEvent (e))
|
|
return;
|
|
|
|
if ((e.id <= ContainerEvent.CONTAINER_LAST
|
|
&& e.id >= ContainerEvent.CONTAINER_FIRST)
|
|
&& (containerListener != null
|
|
|| (eventMask & AWTEvent.CONTAINER_EVENT_MASK) != 0))
|
|
processEvent(e);
|
|
else
|
|
super.dispatchEventImpl(e);
|
|
}
|
|
|
|
// This is used to implement Component.transferFocus.
|
|
Component findNextFocusComponent(Component child)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
int start, end;
|
|
if (child != null)
|
|
{
|
|
for (start = 0; start < ncomponents; ++start)
|
|
{
|
|
if (component[start] == child)
|
|
break;
|
|
}
|
|
end = start;
|
|
// This special case lets us be sure to terminate.
|
|
if (end == 0)
|
|
end = ncomponents;
|
|
++start;
|
|
}
|
|
else
|
|
{
|
|
start = 0;
|
|
end = ncomponents;
|
|
}
|
|
|
|
for (int j = start; j != end; ++j)
|
|
{
|
|
if (j >= ncomponents)
|
|
{
|
|
// The JCL says that we should wrap here. However, that
|
|
// seems wrong. To me it seems that focus order should be
|
|
// global within in given window. So instead if we reach
|
|
// the end we try to look in our parent, if we have one.
|
|
if (parent != null)
|
|
return parent.findNextFocusComponent(this);
|
|
j -= ncomponents;
|
|
}
|
|
if (component[j] instanceof Container)
|
|
{
|
|
Component c = component[j];
|
|
c = c.findNextFocusComponent(null);
|
|
if (c != null)
|
|
return c;
|
|
}
|
|
else if (component[j].isFocusTraversable())
|
|
return component[j];
|
|
}
|
|
|
|
return null;
|
|
}
|
|
}
|
|
|
|
private void addNotifyContainerChildren()
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
for (int i = ncomponents; --i >= 0; )
|
|
{
|
|
component[i].addNotify();
|
|
if (component[i].isLightweight ())
|
|
{
|
|
|
|
// If we're not lightweight, and we just got a lightweight
|
|
// child, we need a lightweight dispatcher to feed it events.
|
|
if (! this.isLightweight())
|
|
{
|
|
if (dispatcher == null)
|
|
dispatcher = new LightweightDispatcher (this);
|
|
}
|
|
|
|
|
|
enableEvents(component[i].eventMask);
|
|
if (peer != null && !isLightweight ())
|
|
enableEvents (AWTEvent.PAINT_EVENT_MASK);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Deserialize this Container:
|
|
* <ol>
|
|
* <li>Read from the stream the default serializable fields.</li>
|
|
* <li>Read a list of serializable ContainerListeners as optional
|
|
* data. If the list is null, no listeners will be registered.</li>
|
|
* <li>Read this Container's FocusTraversalPolicy as optional data.
|
|
* If this is null, then this Container will use a
|
|
* DefaultFocusTraversalPolicy.</li>
|
|
* </ol>
|
|
*
|
|
* @param s the stream to read from
|
|
* @throws ClassNotFoundException if deserialization fails
|
|
* @throws IOException if the stream fails
|
|
*/
|
|
private void readObject (ObjectInputStream s)
|
|
throws ClassNotFoundException, IOException
|
|
{
|
|
s.defaultReadObject ();
|
|
String key = (String) s.readObject ();
|
|
while (key != null)
|
|
{
|
|
Object object = s.readObject ();
|
|
if ("containerL".equals (key))
|
|
addContainerListener((ContainerListener) object);
|
|
// FIXME: under what key is the focus traversal policy stored?
|
|
else if ("focusTraversalPolicy".equals (key))
|
|
setFocusTraversalPolicy ((FocusTraversalPolicy) object);
|
|
|
|
key = (String) s.readObject();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Serialize this Container:
|
|
* <ol>
|
|
* <li>Write to the stream the default serializable fields.</li>
|
|
* <li>Write the list of serializable ContainerListeners as optional
|
|
* data.</li>
|
|
* <li>Write this Container's FocusTraversalPolicy as optional data.</li>
|
|
* </ol>
|
|
*
|
|
* @param s the stream to write to
|
|
* @throws IOException if the stream fails
|
|
*/
|
|
private void writeObject (ObjectOutputStream s) throws IOException
|
|
{
|
|
s.defaultWriteObject ();
|
|
AWTEventMulticaster.save (s, "containerL", containerListener);
|
|
if (focusTraversalPolicy instanceof Serializable)
|
|
s.writeObject (focusTraversalPolicy);
|
|
else
|
|
s.writeObject (null);
|
|
}
|
|
|
|
// Nested classes.
|
|
|
|
/* The following classes are used in concert with the
|
|
visitChildren() method to implement all the graphics operations
|
|
that requires traversal of the containment hierarchy. */
|
|
|
|
abstract static class GfxVisitor
|
|
{
|
|
public abstract void visit(Component c, Graphics gfx);
|
|
}
|
|
|
|
static class GfxPaintVisitor extends GfxVisitor
|
|
{
|
|
public void visit(Component c, Graphics gfx) { c.paint(gfx); }
|
|
public static final GfxVisitor INSTANCE = new GfxPaintVisitor();
|
|
}
|
|
|
|
static class GfxPrintVisitor extends GfxVisitor
|
|
{
|
|
public void visit(Component c, Graphics gfx) { c.print(gfx); }
|
|
public static final GfxVisitor INSTANCE = new GfxPrintVisitor();
|
|
}
|
|
|
|
static class GfxPaintAllVisitor extends GfxVisitor
|
|
{
|
|
public void visit(Component c, Graphics gfx) { c.paintAll(gfx); }
|
|
public static final GfxVisitor INSTANCE = new GfxPaintAllVisitor();
|
|
}
|
|
|
|
static class GfxPrintAllVisitor extends GfxVisitor
|
|
{
|
|
public void visit(Component c, Graphics gfx) { c.printAll(gfx); }
|
|
public static final GfxVisitor INSTANCE = new GfxPrintAllVisitor();
|
|
}
|
|
|
|
/**
|
|
* This class provides accessibility support for subclasses of container.
|
|
*
|
|
* @author Eric Blake <ebb9@email.byu.edu>
|
|
*
|
|
* @since 1.3
|
|
*/
|
|
protected class AccessibleAWTContainer extends AccessibleAWTComponent
|
|
{
|
|
/**
|
|
* Compatible with JDK 1.4+.
|
|
*/
|
|
private static final long serialVersionUID = 5081320404842566097L;
|
|
|
|
/**
|
|
* The handler to fire PropertyChange when children are added or removed.
|
|
*
|
|
* @serial the handler for property changes
|
|
*/
|
|
protected ContainerListener accessibleContainerHandler
|
|
= new AccessibleContainerHandler();
|
|
|
|
/**
|
|
* The default constructor.
|
|
*/
|
|
protected AccessibleAWTContainer()
|
|
{
|
|
Container.this.addContainerListener(accessibleContainerHandler);
|
|
}
|
|
|
|
/**
|
|
* Return the number of accessible children of the containing accessible
|
|
* object (at most the total number of its children).
|
|
*
|
|
* @return the number of accessible children
|
|
*/
|
|
public int getAccessibleChildrenCount()
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
int count = 0;
|
|
int i = component == null ? 0 : component.length;
|
|
while (--i >= 0)
|
|
if (component[i] instanceof Accessible)
|
|
count++;
|
|
return count;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return the nth accessible child of the containing accessible object.
|
|
*
|
|
* @param i the child to grab, zero-based
|
|
* @return the accessible child, or null
|
|
*/
|
|
public Accessible getAccessibleChild(int i)
|
|
{
|
|
synchronized (getTreeLock ())
|
|
{
|
|
if (component == null)
|
|
return null;
|
|
int index = -1;
|
|
while (i >= 0 && ++index < component.length)
|
|
if (component[index] instanceof Accessible)
|
|
i--;
|
|
if (i < 0)
|
|
return (Accessible) component[index];
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return the accessible child located at point (in the parent's
|
|
* coordinates), if one exists.
|
|
*
|
|
* @param p the point to look at
|
|
*
|
|
* @return an accessible object at that point, or null
|
|
*
|
|
* @throws NullPointerException if p is null
|
|
*/
|
|
public Accessible getAccessibleAt(Point p)
|
|
{
|
|
Component c = getComponentAt(p.x, p.y);
|
|
return c != Container.this && c instanceof Accessible ? (Accessible) c
|
|
: null;
|
|
}
|
|
|
|
/**
|
|
* This class fires a <code>PropertyChange</code> listener, if registered,
|
|
* when children are added or removed from the enclosing accessible object.
|
|
*
|
|
* @author Eric Blake <ebb9@email.byu.edu>
|
|
*
|
|
* @since 1.3
|
|
*/
|
|
protected class AccessibleContainerHandler implements ContainerListener
|
|
{
|
|
/**
|
|
* Default constructor.
|
|
*/
|
|
protected AccessibleContainerHandler()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Fired when a component is added; forwards to the PropertyChange
|
|
* listener.
|
|
*
|
|
* @param e the container event for adding
|
|
*/
|
|
public void componentAdded(ContainerEvent e)
|
|
{
|
|
AccessibleAWTContainer.this.firePropertyChange
|
|
(ACCESSIBLE_CHILD_PROPERTY, null, e.getChild());
|
|
}
|
|
|
|
/**
|
|
* Fired when a component is removed; forwards to the PropertyChange
|
|
* listener.
|
|
*
|
|
* @param e the container event for removing
|
|
*/
|
|
public void componentRemoved(ContainerEvent e)
|
|
{
|
|
AccessibleAWTContainer.this.firePropertyChange
|
|
(ACCESSIBLE_CHILD_PROPERTY, e.getChild(), null);
|
|
}
|
|
} // class AccessibleContainerHandler
|
|
} // class AccessibleAWTContainer
|
|
} // class Container
|
|
|
|
/**
|
|
* There is a helper class implied from stack traces called
|
|
* LightweightDispatcher, but since it is not part of the public API,
|
|
* rather than mimic it exactly we write something which does "roughly
|
|
* the same thing".
|
|
*/
|
|
|
|
class LightweightDispatcher implements Serializable
|
|
{
|
|
private static final long serialVersionUID = 5184291520170872969L;
|
|
private Container nativeContainer;
|
|
private Cursor nativeCursor;
|
|
private long eventMask;
|
|
|
|
private transient Component mouseEventTarget;
|
|
private transient Component pressedComponent;
|
|
private transient Component lastComponentEntered;
|
|
private transient int pressCount;
|
|
|
|
LightweightDispatcher(Container c)
|
|
{
|
|
nativeContainer = c;
|
|
}
|
|
|
|
void acquireComponentForMouseEvent(MouseEvent me)
|
|
{
|
|
int x = me.getX ();
|
|
int y = me.getY ();
|
|
|
|
// Find the candidate which should receive this event.
|
|
Component parent = nativeContainer;
|
|
Component candidate = null;
|
|
Point p = me.getPoint();
|
|
while (candidate == null && parent != null)
|
|
{
|
|
candidate =
|
|
SwingUtilities.getDeepestComponentAt(parent, p.x, p.y);
|
|
if (candidate == null || (candidate.eventMask & me.getID()) == 0)
|
|
{
|
|
candidate = null;
|
|
p = SwingUtilities.convertPoint(parent, p.x, p.y, parent.parent);
|
|
parent = parent.parent;
|
|
}
|
|
}
|
|
|
|
// If the only candidate we found was the native container itself,
|
|
// don't dispatch any event at all. We only care about the lightweight
|
|
// children here.
|
|
if (candidate == nativeContainer)
|
|
candidate = null;
|
|
|
|
// If our candidate is new, inform the old target we're leaving.
|
|
if (lastComponentEntered != null
|
|
&& lastComponentEntered.isShowing()
|
|
&& lastComponentEntered != candidate)
|
|
{
|
|
// Old candidate could have been removed from
|
|
// the nativeContainer so we check first.
|
|
if (SwingUtilities.isDescendingFrom(lastComponentEntered, nativeContainer))
|
|
{
|
|
Point tp =
|
|
SwingUtilities.convertPoint(nativeContainer,
|
|
x, y, lastComponentEntered);
|
|
MouseEvent exited = new MouseEvent (lastComponentEntered,
|
|
MouseEvent.MOUSE_EXITED,
|
|
me.getWhen (),
|
|
me.getModifiersEx (),
|
|
tp.x, tp.y,
|
|
me.getClickCount (),
|
|
me.isPopupTrigger (),
|
|
me.getButton ());
|
|
lastComponentEntered.dispatchEvent (exited);
|
|
}
|
|
lastComponentEntered = null;
|
|
}
|
|
// If we have a candidate, maybe enter it.
|
|
if (candidate != null)
|
|
{
|
|
mouseEventTarget = candidate;
|
|
if (candidate.isLightweight()
|
|
&& candidate.isShowing()
|
|
&& candidate != nativeContainer
|
|
&& candidate != lastComponentEntered)
|
|
{
|
|
lastComponentEntered = mouseEventTarget;
|
|
Point cp = SwingUtilities.convertPoint(nativeContainer,
|
|
x, y, lastComponentEntered);
|
|
MouseEvent entered = new MouseEvent (lastComponentEntered,
|
|
MouseEvent.MOUSE_ENTERED,
|
|
me.getWhen (),
|
|
me.getModifiersEx (),
|
|
cp.x, cp.y,
|
|
me.getClickCount (),
|
|
me.isPopupTrigger (),
|
|
me.getButton ());
|
|
lastComponentEntered.dispatchEvent (entered);
|
|
}
|
|
}
|
|
|
|
if (me.getID() == MouseEvent.MOUSE_RELEASED
|
|
|| me.getID() == MouseEvent.MOUSE_PRESSED && pressCount > 0
|
|
|| me.getID() == MouseEvent.MOUSE_DRAGGED)
|
|
// If any of the following events occur while a button is held down,
|
|
// they should be dispatched to the same component to which the
|
|
// original MOUSE_PRESSED event was dispatched:
|
|
// - MOUSE_RELEASED
|
|
// - MOUSE_PRESSED: another button pressed while the first is held down
|
|
// - MOUSE_DRAGGED
|
|
if (SwingUtilities.isDescendingFrom(pressedComponent, nativeContainer))
|
|
mouseEventTarget = pressedComponent;
|
|
else if (me.getID() == MouseEvent.MOUSE_CLICKED)
|
|
{
|
|
// Don't dispatch CLICKED events whose target is not the same as the
|
|
// target for the original PRESSED event.
|
|
if (candidate != pressedComponent)
|
|
mouseEventTarget = null;
|
|
else if (pressCount == 0)
|
|
pressedComponent = null;
|
|
}
|
|
}
|
|
|
|
boolean handleEvent(AWTEvent e)
|
|
{
|
|
if (e instanceof MouseEvent)
|
|
{
|
|
MouseEvent me = (MouseEvent) e;
|
|
|
|
acquireComponentForMouseEvent(me);
|
|
|
|
// Avoid dispatching ENTERED and EXITED events twice.
|
|
if (mouseEventTarget != null
|
|
&& mouseEventTarget.isShowing()
|
|
&& e.getID() != MouseEvent.MOUSE_ENTERED
|
|
&& e.getID() != MouseEvent.MOUSE_EXITED)
|
|
{
|
|
MouseEvent newEvt =
|
|
SwingUtilities.convertMouseEvent(nativeContainer, me,
|
|
mouseEventTarget);
|
|
mouseEventTarget.dispatchEvent(newEvt);
|
|
|
|
switch (e.getID())
|
|
{
|
|
case MouseEvent.MOUSE_PRESSED:
|
|
if (pressCount++ == 0)
|
|
pressedComponent = mouseEventTarget;
|
|
break;
|
|
|
|
case MouseEvent.MOUSE_RELEASED:
|
|
// Clear our memory of the original PRESSED event, only if
|
|
// we're not expecting a CLICKED event after this. If
|
|
// there is a CLICKED event after this, it will do clean up.
|
|
if (--pressCount == 0
|
|
&& mouseEventTarget != pressedComponent)
|
|
pressedComponent = null;
|
|
break;
|
|
}
|
|
if (newEvt.isConsumed())
|
|
e.consume();
|
|
}
|
|
}
|
|
|
|
return e.isConsumed();
|
|
}
|
|
|
|
} // class LightweightDispatcher
|