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
1653 lines
44 KiB
Java
1653 lines
44 KiB
Java
/* BasicInternalFrameUI.java --
|
|
Copyright (C) 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package javax.swing.plaf.basic;
|
|
|
|
import java.awt.AWTEvent;
|
|
import java.awt.Color;
|
|
import java.awt.Component;
|
|
import java.awt.Container;
|
|
import java.awt.Dimension;
|
|
import java.awt.Graphics;
|
|
import java.awt.Insets;
|
|
import java.awt.LayoutManager;
|
|
import java.awt.Point;
|
|
import java.awt.Rectangle;
|
|
import java.awt.event.ComponentEvent;
|
|
import java.awt.event.ComponentListener;
|
|
import java.awt.event.MouseEvent;
|
|
import java.beans.PropertyChangeEvent;
|
|
import java.beans.PropertyChangeListener;
|
|
|
|
import javax.swing.DefaultDesktopManager;
|
|
import javax.swing.DesktopManager;
|
|
import javax.swing.JComponent;
|
|
import javax.swing.JDesktopPane;
|
|
import javax.swing.JInternalFrame;
|
|
import javax.swing.KeyStroke;
|
|
import javax.swing.SwingConstants;
|
|
import javax.swing.SwingUtilities;
|
|
import javax.swing.border.AbstractBorder;
|
|
import javax.swing.event.InternalFrameEvent;
|
|
import javax.swing.event.InternalFrameListener;
|
|
import javax.swing.event.MouseInputAdapter;
|
|
import javax.swing.event.MouseInputListener;
|
|
import javax.swing.plaf.ComponentUI;
|
|
import javax.swing.plaf.InternalFrameUI;
|
|
import javax.swing.plaf.UIResource;
|
|
|
|
/**
|
|
* This is the UI delegate for the Basic look and feel for JInternalFrames.
|
|
*/
|
|
public class BasicInternalFrameUI extends InternalFrameUI
|
|
{
|
|
/**
|
|
* This is a helper class that listens to the JInternalFrame for
|
|
* InternalFrameEvents.
|
|
*/
|
|
protected class BasicInternalFrameListener implements InternalFrameListener
|
|
{
|
|
/**
|
|
* This method is called when the JInternalFrame is activated.
|
|
*
|
|
* @param e The InternalFrameEvent.
|
|
*/
|
|
public void internalFrameActivated(InternalFrameEvent e)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JInternalFrame is closed.
|
|
*
|
|
* @param e The InternalFrameEvent.
|
|
*/
|
|
public void internalFrameClosed(InternalFrameEvent e)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JInternalFrame is closing.
|
|
*
|
|
* @param e The InternalFrameEvent.
|
|
*/
|
|
public void internalFrameClosing(InternalFrameEvent e)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JInternalFrame is deactivated.
|
|
*
|
|
* @param e The InternalFrameEvent.
|
|
*/
|
|
public void internalFrameDeactivated(InternalFrameEvent e)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JInternalFrame is deiconified.
|
|
*
|
|
* @param e The InternalFrameEvent.
|
|
*/
|
|
public void internalFrameDeiconified(InternalFrameEvent e)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JInternalFrame is iconified.
|
|
*
|
|
* @param e The InternalFrameEvent.
|
|
*/
|
|
public void internalFrameIconified(InternalFrameEvent e)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JInternalFrame is opened.
|
|
*
|
|
* @param e The InternalFrameEvent.
|
|
*/
|
|
public void internalFrameOpened(InternalFrameEvent e)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This helper class listens to the edges of the JInternalFrame and the
|
|
* TitlePane for mouse events. It is responsible for dragging and resizing
|
|
* the JInternalFrame in response to the MouseEvents.
|
|
*/
|
|
protected class BorderListener extends MouseInputAdapter
|
|
implements SwingConstants
|
|
{
|
|
/** FIXME: Use for something. */
|
|
protected int RESIZE_NONE;
|
|
|
|
/** The x offset from the top left corner of the JInternalFrame. */
|
|
private transient int xOffset = 0;
|
|
|
|
/** The y offset from the top left corner of the JInternalFrame. */
|
|
private transient int yOffset = 0;
|
|
|
|
/** The direction that the resize is occuring in. */
|
|
private transient int direction = -1;
|
|
|
|
/** Cache rectangle that can be reused. */
|
|
private transient Rectangle cacheRect = new Rectangle();
|
|
|
|
/**
|
|
* This method is called when the mouse is clicked.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseClicked(MouseEvent e)
|
|
{
|
|
// There is nothing to do when the mouse is clicked
|
|
// on the border.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is dragged. This method is
|
|
* responsible for resizing or dragging the JInternalFrame.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseDragged(MouseEvent e)
|
|
{
|
|
// If the frame is maximized, there is nothing that
|
|
// can be dragged around.
|
|
if (frame.isMaximum())
|
|
return;
|
|
DesktopManager dm = getDesktopManager();
|
|
Rectangle b = frame.getBounds();
|
|
Dimension min = frame.getMinimumSize();
|
|
if (min == null)
|
|
min = new Dimension(0, 0);
|
|
Insets insets = frame.getInsets();
|
|
int x = e.getX();
|
|
int y = e.getY();
|
|
if (e.getSource() == frame && frame.isResizable())
|
|
{
|
|
switch (direction)
|
|
{
|
|
case NORTH:
|
|
cacheRect.setBounds(b.x,
|
|
Math.min(b.y + y, b.y + b.height
|
|
- min.height), b.width, b.height
|
|
- y);
|
|
break;
|
|
case NORTH_EAST:
|
|
cacheRect.setBounds(b.x,
|
|
Math.min(b.y + y, b.y + b.height
|
|
- min.height), x, b.height - y);
|
|
break;
|
|
case EAST:
|
|
cacheRect.setBounds(b.x, b.y, x, b.height);
|
|
break;
|
|
case SOUTH_EAST:
|
|
cacheRect.setBounds(b.x, b.y, x, y);
|
|
break;
|
|
case SOUTH:
|
|
cacheRect.setBounds(b.x, b.y, b.width, y);
|
|
break;
|
|
case SOUTH_WEST:
|
|
cacheRect.setBounds(Math.min(b.x + x, b.x + b.width - min.width),
|
|
b.y, b.width - x, y);
|
|
break;
|
|
case WEST:
|
|
cacheRect.setBounds(Math.min(b.x + x, b.x + b.width - min.width),
|
|
b.y, b.width - x, b.height);
|
|
break;
|
|
case NORTH_WEST:
|
|
cacheRect.setBounds(Math.min(b.x + x, b.x + b.width - min.width),
|
|
Math.min(b.y + y, b.y + b.height
|
|
- min.height), b.width - x,
|
|
b.height - y);
|
|
break;
|
|
}
|
|
dm.resizeFrame(frame, cacheRect.x, cacheRect.y,
|
|
Math.max(min.width, cacheRect.width),
|
|
Math.max(min.height, cacheRect.height));
|
|
}
|
|
else if (e.getSource() == titlePane)
|
|
{
|
|
Rectangle fBounds = frame.getBounds();
|
|
|
|
dm.dragFrame(frame, e.getX() - xOffset + b.x,
|
|
e.getY() - yOffset + b.y);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse exits the JInternalFrame.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseExited(MouseEvent e)
|
|
{
|
|
// There is nothing to do when the mouse exits
|
|
// the border area.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is moved inside the
|
|
* JInternalFrame.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseMoved(MouseEvent e)
|
|
{
|
|
// There is nothing to do when the mouse moves
|
|
// over the border area.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is pressed.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mousePressed(MouseEvent e)
|
|
{
|
|
activateFrame(frame);
|
|
DesktopManager dm = getDesktopManager();
|
|
int x = e.getX();
|
|
int y = e.getY();
|
|
Insets insets = frame.getInsets();
|
|
|
|
if (e.getSource() == frame && frame.isResizable())
|
|
{
|
|
direction = sectionOfClick(x, y);
|
|
dm.beginResizingFrame(frame, direction);
|
|
}
|
|
else if (e.getSource() == titlePane)
|
|
{
|
|
Rectangle tBounds = titlePane.getBounds();
|
|
|
|
xOffset = e.getX() - tBounds.x + insets.left;
|
|
yOffset = e.getY() - tBounds.y + insets.top;
|
|
|
|
dm.beginDraggingFrame(frame);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is released.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseReleased(MouseEvent e)
|
|
{
|
|
DesktopManager dm = getDesktopManager();
|
|
xOffset = 0;
|
|
yOffset = 0;
|
|
if (e.getSource() == frame && frame.isResizable())
|
|
dm.endResizingFrame(frame);
|
|
else if (e.getSource() == titlePane)
|
|
dm.endDraggingFrame(frame);
|
|
}
|
|
|
|
/**
|
|
* This method determines the direction of the resize based on the
|
|
* coordinates and the size of the JInternalFrame.
|
|
*
|
|
* @param x The x coordinate of the MouseEvent.
|
|
* @param y The y coordinate of the MouseEvent.
|
|
*
|
|
* @return The direction of the resize (a SwingConstant direction).
|
|
*/
|
|
private int sectionOfClick(int x, int y)
|
|
{
|
|
Insets insets = frame.getInsets();
|
|
Rectangle b = frame.getBounds();
|
|
if (x < insets.left && y < insets.top)
|
|
return NORTH_WEST;
|
|
else if (x > b.width - insets.right && y < insets.top)
|
|
return NORTH_EAST;
|
|
else if (x > b.width - insets.right && y > b.height - insets.bottom)
|
|
return SOUTH_EAST;
|
|
else if (x < insets.left && y > b.height - insets.bottom)
|
|
return SOUTH_WEST;
|
|
else if (y < insets.top)
|
|
return NORTH;
|
|
else if (x < insets.left)
|
|
return WEST;
|
|
else if (y > b.height - insets.bottom)
|
|
return SOUTH;
|
|
else if (x > b.width - insets.right)
|
|
return EAST;
|
|
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This helper class listens to the JDesktopPane that parents this
|
|
* JInternalFrame and listens for resize events and resizes the
|
|
* JInternalFrame appropriately.
|
|
*/
|
|
protected class ComponentHandler implements ComponentListener
|
|
{
|
|
/**
|
|
* This method is called when the JDesktopPane is hidden.
|
|
*
|
|
* @param e The ComponentEvent fired.
|
|
*/
|
|
public void componentHidden(ComponentEvent e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JDesktopPane is moved.
|
|
*
|
|
* @param e The ComponentEvent fired.
|
|
*/
|
|
public void componentMoved(ComponentEvent e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JDesktopPane is resized.
|
|
*
|
|
* @param e The ComponentEvent fired.
|
|
*/
|
|
public void componentResized(ComponentEvent e)
|
|
{
|
|
if (frame.isMaximum())
|
|
{
|
|
JDesktopPane pane = (JDesktopPane) e.getSource();
|
|
Insets insets = pane.getInsets();
|
|
Rectangle bounds = pane.getBounds();
|
|
|
|
frame.setBounds(bounds.x + insets.left, bounds.y + insets.top,
|
|
bounds.width - insets.left - insets.right,
|
|
bounds.height - insets.top - insets.bottom);
|
|
frame.revalidate();
|
|
frame.repaint();
|
|
}
|
|
|
|
// Sun also resizes the icons. but it doesn't seem to do anything.
|
|
}
|
|
|
|
/**
|
|
* This method is called when the JDesktopPane is shown.
|
|
*
|
|
* @param e The ComponentEvent fired.
|
|
*/
|
|
public void componentShown(ComponentEvent e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This helper class acts as the LayoutManager for JInternalFrames.
|
|
*/
|
|
public class InternalFrameLayout implements LayoutManager
|
|
{
|
|
/**
|
|
* This method is called when the given Component is added to the
|
|
* JInternalFrame.
|
|
*
|
|
* @param name The name of the Component.
|
|
* @param c The Component added.
|
|
*/
|
|
public void addLayoutComponent(String name, Component c)
|
|
{
|
|
}
|
|
|
|
/**
|
|
* This method is used to set the bounds of the children of the
|
|
* JInternalFrame.
|
|
*
|
|
* @param c The Container to lay out.
|
|
*/
|
|
public void layoutContainer(Container c)
|
|
{
|
|
Dimension dims = frame.getSize();
|
|
Insets insets = frame.getInsets();
|
|
|
|
dims.width -= insets.left + insets.right;
|
|
dims.height -= insets.top + insets.bottom;
|
|
|
|
frame.getRootPane().getGlassPane().setBounds(0, 0, dims.width,
|
|
dims.height);
|
|
int nh = 0;
|
|
int sh = 0;
|
|
int ew = 0;
|
|
int ww = 0;
|
|
|
|
if (northPane != null)
|
|
{
|
|
Dimension nDims = northPane.getPreferredSize();
|
|
nh = Math.min(nDims.height, dims.height);
|
|
|
|
northPane.setBounds(insets.left, insets.top, dims.width, nh);
|
|
}
|
|
|
|
if (southPane != null)
|
|
{
|
|
Dimension sDims = southPane.getPreferredSize();
|
|
sh = Math.min(sDims.height, dims.height - nh);
|
|
|
|
southPane.setBounds(insets.left, insets.top + dims.height - sh,
|
|
dims.width, sh);
|
|
}
|
|
|
|
int remHeight = dims.height - sh - nh;
|
|
|
|
if (westPane != null)
|
|
{
|
|
Dimension wDims = westPane.getPreferredSize();
|
|
ww = Math.min(dims.width, wDims.width);
|
|
|
|
westPane.setBounds(insets.left, insets.top + nh, ww, remHeight);
|
|
}
|
|
|
|
if (eastPane != null)
|
|
{
|
|
Dimension eDims = eastPane.getPreferredSize();
|
|
ew = Math.min(eDims.width, dims.width - ww);
|
|
|
|
eastPane.setBounds(insets.left + dims.width - ew, insets.top + nh,
|
|
ew, remHeight);
|
|
}
|
|
|
|
int remWidth = dims.width - ww - ew;
|
|
|
|
frame.getRootPane().setBounds(insets.left + ww, insets.top + nh,
|
|
remWidth, remHeight);
|
|
}
|
|
|
|
/**
|
|
* This method returns the minimum layout size.
|
|
*
|
|
* @param c The Container to find a minimum layout size for.
|
|
*
|
|
* @return The minimum dimensions for the JInternalFrame.
|
|
*/
|
|
public Dimension minimumLayoutSize(Container c)
|
|
{
|
|
return getSize(c, true);
|
|
}
|
|
|
|
/**
|
|
* This method returns the maximum layout size.
|
|
*
|
|
* @param c The Container to find a maximum layout size for.
|
|
*
|
|
* @return The maximum dimensions for the JInternalFrame.
|
|
*/
|
|
public Dimension maximumLayoutSize(Container c)
|
|
{
|
|
return preferredLayoutSize(c);
|
|
}
|
|
|
|
/**
|
|
* Th8is method returns the preferred layout size.
|
|
*
|
|
* @param c The Container to find a preferred layout size for.
|
|
*
|
|
* @return The preferred dimensions for the JInternalFrame.
|
|
*/
|
|
public Dimension preferredLayoutSize(Container c)
|
|
{
|
|
return getSize(c, false);
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param c DOCUMENT ME!
|
|
* @param min DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
private Dimension getSize(Container c, boolean min)
|
|
{
|
|
Insets insets = frame.getInsets();
|
|
|
|
Dimension contentDims = frame.getContentPane().getPreferredSize();
|
|
if (min)
|
|
contentDims.width = contentDims.height = 0;
|
|
int nWidth = 0;
|
|
int nHeight = 0;
|
|
int sWidth = 0;
|
|
int sHeight = 0;
|
|
int eWidth = 0;
|
|
int eHeight = 0;
|
|
int wWidth = 0;
|
|
int wHeight = 0;
|
|
Dimension dims;
|
|
|
|
if (northPane != null)
|
|
{
|
|
dims = northPane.getPreferredSize();
|
|
if (dims != null)
|
|
{
|
|
nWidth = dims.width;
|
|
nHeight = dims.height;
|
|
}
|
|
}
|
|
|
|
if (southPane != null)
|
|
{
|
|
dims = southPane.getPreferredSize();
|
|
if (dims != null)
|
|
{
|
|
sWidth = dims.width;
|
|
sHeight = dims.height;
|
|
}
|
|
}
|
|
|
|
if (eastPane != null)
|
|
{
|
|
dims = eastPane.getPreferredSize();
|
|
if (dims != null)
|
|
{
|
|
sWidth = dims.width;
|
|
sHeight = dims.height;
|
|
}
|
|
}
|
|
|
|
if (westPane != null)
|
|
{
|
|
dims = westPane.getPreferredSize();
|
|
if (dims != null)
|
|
{
|
|
wWidth = dims.width;
|
|
wHeight = dims.height;
|
|
}
|
|
}
|
|
|
|
int width = Math.max(sWidth, nWidth);
|
|
width = Math.max(width, contentDims.width + eWidth + wWidth);
|
|
|
|
int height = Math.max(eHeight, wHeight);
|
|
height = Math.max(height, contentDims.height);
|
|
height += nHeight + sHeight;
|
|
|
|
width += insets.left + insets.right;
|
|
height += insets.top + insets.bottom;
|
|
|
|
return new Dimension(width, height);
|
|
}
|
|
|
|
/**
|
|
* This method is called when a Component is removed from the
|
|
* JInternalFrame.
|
|
*
|
|
* @param c The Component that was removed.
|
|
*/
|
|
public void removeLayoutComponent(Component c)
|
|
{
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This helper class is used to listen to the JDesktopPane's glassPane for
|
|
* MouseEvents. The JInternalFrame can then be selected if a click is
|
|
* detected on its children.
|
|
*/
|
|
protected class GlassPaneDispatcher implements MouseInputListener
|
|
{
|
|
/** The MouseEvent target. */
|
|
private transient Component mouseEventTarget;
|
|
|
|
/** The component pressed. */
|
|
private transient Component pressedComponent;
|
|
|
|
/** The last component entered. */
|
|
private transient Component lastComponentEntered;
|
|
|
|
/** The number of presses. */
|
|
private transient int pressCount;
|
|
|
|
/**
|
|
* This method is called when the mouse enters the glass pane.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseEntered(MouseEvent e)
|
|
{
|
|
handleEvent(e);
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is clicked on the glass pane.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseClicked(MouseEvent e)
|
|
{
|
|
handleEvent(e);
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is dragged in the glass pane.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseDragged(MouseEvent e)
|
|
{
|
|
handleEvent(e);
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse exits the glass pane.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseExited(MouseEvent e)
|
|
{
|
|
handleEvent(e);
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is moved in the glass pane.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseMoved(MouseEvent e)
|
|
{
|
|
handleEvent(e);
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is pressed in the glass pane.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mousePressed(MouseEvent e)
|
|
{
|
|
activateFrame(frame);
|
|
handleEvent(e);
|
|
}
|
|
|
|
/**
|
|
* This method is called when the mouse is released in the glass pane.
|
|
*
|
|
* @param e The MouseEvent.
|
|
*/
|
|
public void mouseReleased(MouseEvent e)
|
|
{
|
|
handleEvent(e);
|
|
}
|
|
|
|
/**
|
|
* This method acquires a candidate component to dispatch the MouseEvent
|
|
* to.
|
|
*
|
|
* @param me The MouseEvent to acquire a component for.
|
|
*/
|
|
private void acquireComponentForMouseEvent(MouseEvent me)
|
|
{
|
|
int x = me.getX();
|
|
int y = me.getY();
|
|
|
|
// Find the candidate which should receive this event.
|
|
Component parent = frame.getContentPane();
|
|
if (parent == null)
|
|
return;
|
|
Component candidate = null;
|
|
Point p = me.getPoint();
|
|
while (candidate == null && parent != null)
|
|
{
|
|
candidate = SwingUtilities.getDeepestComponentAt(parent, p.x, p.y);
|
|
if (candidate == null)
|
|
{
|
|
p = SwingUtilities.convertPoint(parent, p.x, p.y,
|
|
parent.getParent());
|
|
parent = parent.getParent();
|
|
}
|
|
}
|
|
|
|
// 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 == frame.getContentPane())
|
|
candidate = null;
|
|
|
|
// If our candidate is new, inform the old target we're leaving.
|
|
if (lastComponentEntered != null && lastComponentEntered.isShowing()
|
|
&& lastComponentEntered != candidate)
|
|
{
|
|
Point tp = SwingUtilities.convertPoint(frame.getContentPane(), 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 != frame.getContentPane()
|
|
&& candidate != lastComponentEntered)
|
|
{
|
|
lastComponentEntered = mouseEventTarget;
|
|
Point cp = SwingUtilities.convertPoint(frame.getContentPane(),
|
|
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
|
|
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;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This is a helper method that dispatches the GlassPane MouseEvents to
|
|
* the proper component.
|
|
*
|
|
* @param e The AWTEvent to be dispatched. Usually an instance of
|
|
* MouseEvent.
|
|
*/
|
|
private void handleEvent(AWTEvent e)
|
|
{
|
|
if (e instanceof MouseEvent)
|
|
{
|
|
MouseEvent me = SwingUtilities.convertMouseEvent(frame.getRootPane()
|
|
.getGlassPane(),
|
|
(MouseEvent) e,
|
|
frame.getRootPane()
|
|
.getGlassPane());
|
|
|
|
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(frame
|
|
.getContentPane(),
|
|
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;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This helper class listens for PropertyChangeEvents from the
|
|
* JInternalFrame.
|
|
*/
|
|
public class InternalFramePropertyChangeListener
|
|
implements PropertyChangeListener
|
|
{
|
|
/**
|
|
* This method is called when one of the JInternalFrame's properties
|
|
* change.
|
|
*
|
|
* @param evt The PropertyChangeEvent.
|
|
*/
|
|
public void propertyChange(PropertyChangeEvent evt)
|
|
{
|
|
if (evt.getPropertyName().equals(JInternalFrame.IS_MAXIMUM_PROPERTY))
|
|
{
|
|
if (frame.isMaximum())
|
|
maximizeFrame(frame);
|
|
else
|
|
minimizeFrame(frame);
|
|
}
|
|
else if (evt.getPropertyName().equals(JInternalFrame.IS_CLOSED_PROPERTY))
|
|
closeFrame(frame);
|
|
else if (evt.getPropertyName().equals(JInternalFrame.IS_ICON_PROPERTY))
|
|
{
|
|
if (frame.isIcon())
|
|
iconifyFrame(frame);
|
|
else
|
|
deiconifyFrame(frame);
|
|
}
|
|
else if (evt.getPropertyName().equals(JInternalFrame.IS_SELECTED_PROPERTY))
|
|
{
|
|
if (frame.isSelected())
|
|
activateFrame(frame);
|
|
else
|
|
getDesktopManager().deactivateFrame(frame);
|
|
}
|
|
else if (evt.getPropertyName().equals(JInternalFrame.ROOT_PANE_PROPERTY)
|
|
|| evt.getPropertyName().equals(JInternalFrame.GLASS_PANE_PROPERTY))
|
|
{
|
|
Component old = (Component) evt.getOldValue();
|
|
old.removeMouseListener(glassPaneDispatcher);
|
|
old.removeMouseMotionListener(glassPaneDispatcher);
|
|
|
|
Component newPane = (Component) evt.getNewValue();
|
|
newPane.addMouseListener(glassPaneDispatcher);
|
|
newPane.addMouseMotionListener(glassPaneDispatcher);
|
|
|
|
frame.revalidate();
|
|
}
|
|
/* FIXME: need to add ancestor properties to JComponents.
|
|
else if (evt.getPropertyName().equals(JComponent.ANCESTOR_PROPERTY))
|
|
{
|
|
if (desktopPane != null)
|
|
desktopPane.removeComponentListener(componentListener);
|
|
desktopPane = frame.getDesktopPane();
|
|
if (desktopPane != null)
|
|
desktopPane.addComponentListener(componentListener);
|
|
}
|
|
*/
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This helper class is the border for the JInternalFrame.
|
|
*/
|
|
private class InternalFrameBorder extends AbstractBorder
|
|
implements UIResource
|
|
{
|
|
/** The width of the border. */
|
|
private static final int bSize = 5;
|
|
|
|
/** The size of the corners. */
|
|
private static final int offset = 10;
|
|
|
|
/**
|
|
* This method returns whether the border is opaque.
|
|
*
|
|
* @return Whether the border is opaque.
|
|
*/
|
|
public boolean isBorderOpaque()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* This method returns the insets of the border.
|
|
*
|
|
* @param c The Component to find border insets for.
|
|
*
|
|
* @return The border insets.
|
|
*/
|
|
public Insets getBorderInsets(Component c)
|
|
{
|
|
return new Insets(bSize, bSize, bSize, bSize);
|
|
}
|
|
|
|
/**
|
|
* This method paints the border.
|
|
*
|
|
* @param c The Component that owns the border.
|
|
* @param g The Graphics object to paint with.
|
|
* @param x The x coordinate to paint at.
|
|
* @param y The y coordinate to paint at.
|
|
* @param width The width of the Component.
|
|
* @param height The height of the Component.
|
|
*/
|
|
public void paintBorder(Component c, Graphics g, int x, int y, int width,
|
|
int height)
|
|
{
|
|
g.translate(x, y);
|
|
Color saved = g.getColor();
|
|
Rectangle b = frame.getBounds();
|
|
|
|
Color d = c.getBackground();
|
|
g.setColor(d);
|
|
g.fillRect(0, 0, bSize, b.height);
|
|
g.fillRect(0, 0, b.width, bSize);
|
|
g.fillRect(0, b.height - bSize, b.width, bSize);
|
|
g.fillRect(b.width - bSize, 0, bSize, b.height);
|
|
|
|
int x1 = 0;
|
|
int x2 = bSize;
|
|
int x3 = b.width - bSize;
|
|
int x4 = b.width;
|
|
|
|
int y1 = 0;
|
|
int y2 = bSize;
|
|
int y3 = b.height - bSize;
|
|
int y4 = b.height;
|
|
|
|
g.setColor(Color.GRAY);
|
|
g.fillRect(0, 0, bSize, y4);
|
|
g.fillRect(0, 0, x4, bSize);
|
|
g.fillRect(0, y3, b.width, bSize);
|
|
g.fillRect(x3, 0, bSize, b.height);
|
|
|
|
g.fill3DRect(0, offset, bSize, b.height - 2 * offset, false);
|
|
g.fill3DRect(offset, 0, b.width - 2 * offset, bSize, false);
|
|
g.fill3DRect(offset, b.height - bSize, b.width - 2 * offset, bSize, false);
|
|
g.fill3DRect(b.width - bSize, offset, bSize, b.height - 2 * offset, false);
|
|
|
|
g.translate(-x, -y);
|
|
g.setColor(saved);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The MouseListener that is responsible for dragging and resizing the
|
|
* JInternalFrame in response to MouseEvents.
|
|
*/
|
|
protected MouseInputAdapter borderListener;
|
|
|
|
/**
|
|
* The ComponentListener that is responsible for resizing the JInternalFrame
|
|
* in response to ComponentEvents from the JDesktopPane.
|
|
*/
|
|
protected ComponentListener componentListener;
|
|
|
|
/**
|
|
* The MouseListener that is responsible for activating the JInternalFrame
|
|
* when the mouse press activates one of its descendents.
|
|
*/
|
|
protected MouseInputListener glassPaneDispatcher;
|
|
|
|
/**
|
|
* The PropertyChangeListener that is responsible for listening to
|
|
* PropertyChangeEvents from the JInternalFrame.
|
|
*/
|
|
protected PropertyChangeListener propertyChangeListener;
|
|
|
|
/** The InternalFrameListener that listens to the JInternalFrame. */
|
|
private transient BasicInternalFrameListener internalFrameListener;
|
|
|
|
/** The JComponent placed at the east region of the JInternalFrame. */
|
|
protected JComponent eastPane;
|
|
|
|
/** The JComponent placed at the north region of the JInternalFrame. */
|
|
protected JComponent northPane;
|
|
|
|
/** The JComponent placed at the south region of the JInternalFrame. */
|
|
protected JComponent southPane;
|
|
|
|
/** The JComponent placed at the west region of the JInternalFrame. */
|
|
protected JComponent westPane;
|
|
|
|
/**
|
|
* The Keystroke bound to open the menu.
|
|
* @deprecated
|
|
*/
|
|
protected KeyStroke openMenuKey;
|
|
|
|
/** The TitlePane displayed at the top of the JInternalFrame. */
|
|
protected BasicInternalFrameTitlePane titlePane;
|
|
|
|
/** The JInternalFrame this UI is responsible for. */
|
|
protected JInternalFrame frame;
|
|
|
|
/** The LayoutManager used in the JInternalFrame. */
|
|
protected LayoutManager internalFrameLayout;
|
|
|
|
/** The JDesktopPane that is the parent of the JInternalFrame. */
|
|
private transient JDesktopPane desktopPane;
|
|
|
|
/**
|
|
* Creates a new BasicInternalFrameUI object.
|
|
*
|
|
* @param b The JInternalFrame this UI will represent.
|
|
*/
|
|
public BasicInternalFrameUI(JInternalFrame b)
|
|
{
|
|
}
|
|
|
|
/**
|
|
* This method will create a new BasicInternalFrameUI for the given
|
|
* JComponent.
|
|
*
|
|
* @param b The JComponent to create a BasicInternalFrameUI for.
|
|
*
|
|
* @return A new BasicInternalFrameUI.
|
|
*/
|
|
public static ComponentUI createUI(JComponent b)
|
|
{
|
|
return new BasicInternalFrameUI((JInternalFrame) b);
|
|
}
|
|
|
|
/**
|
|
* This method installs a UI for the JInternalFrame.
|
|
*
|
|
* @param c The JComponent to install this UI on.
|
|
*/
|
|
public void installUI(JComponent c)
|
|
{
|
|
if (c instanceof JInternalFrame)
|
|
{
|
|
frame = (JInternalFrame) c;
|
|
|
|
internalFrameLayout = createLayoutManager();
|
|
frame.setLayout(internalFrameLayout);
|
|
|
|
((JComponent) frame.getRootPane().getGlassPane()).setOpaque(false);
|
|
frame.getRootPane().getGlassPane().setVisible(true);
|
|
|
|
installDefaults();
|
|
installListeners();
|
|
installComponents();
|
|
installKeyboardActions();
|
|
|
|
frame.setOpaque(true);
|
|
titlePane.setOpaque(true);
|
|
frame.invalidate();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method reverses the work done by installUI.
|
|
*
|
|
* @param c The JComponent to uninstall this UI for.
|
|
*/
|
|
public void uninstallUI(JComponent c)
|
|
{
|
|
uninstallKeyboardActions();
|
|
uninstallComponents();
|
|
uninstallListeners();
|
|
uninstallDefaults();
|
|
|
|
frame.setLayout(null);
|
|
((JComponent) frame.getRootPane().getGlassPane()).setOpaque(true);
|
|
frame.getRootPane().getGlassPane().setVisible(false);
|
|
|
|
frame = null;
|
|
}
|
|
|
|
/**
|
|
* This method installs the defaults specified by the look and feel.
|
|
*/
|
|
protected void installDefaults()
|
|
{
|
|
// FIXME: Move border to MetalBorders
|
|
frame.setBorder(new InternalFrameBorder());
|
|
}
|
|
|
|
/**
|
|
* This method installs the keyboard actions for the JInternalFrame.
|
|
*/
|
|
protected void installKeyboardActions()
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method installs the Components for the JInternalFrame.
|
|
*/
|
|
protected void installComponents()
|
|
{
|
|
setNorthPane(createNorthPane(frame));
|
|
setSouthPane(createSouthPane(frame));
|
|
setEastPane(createEastPane(frame));
|
|
setWestPane(createWestPane(frame));
|
|
}
|
|
|
|
/**
|
|
* This method installs the listeners for the JInternalFrame.
|
|
*/
|
|
protected void installListeners()
|
|
{
|
|
glassPaneDispatcher = createGlassPaneDispatcher();
|
|
createInternalFrameListener();
|
|
borderListener = createBorderListener(frame);
|
|
componentListener = createComponentListener();
|
|
propertyChangeListener = createPropertyChangeListener();
|
|
|
|
frame.addMouseListener(borderListener);
|
|
frame.addMouseMotionListener(borderListener);
|
|
frame.addInternalFrameListener(internalFrameListener);
|
|
frame.addPropertyChangeListener(propertyChangeListener);
|
|
|
|
frame.getRootPane().getGlassPane().addMouseListener(glassPaneDispatcher);
|
|
frame.getRootPane().getGlassPane().addMouseMotionListener(glassPaneDispatcher);
|
|
}
|
|
|
|
/**
|
|
* This method uninstalls the defaults for the JInternalFrame.
|
|
*/
|
|
protected void uninstallDefaults()
|
|
{
|
|
frame.setBorder(null);
|
|
}
|
|
|
|
/**
|
|
* This method uninstalls the Components for the JInternalFrame.
|
|
*/
|
|
protected void uninstallComponents()
|
|
{
|
|
setNorthPane(null);
|
|
setSouthPane(null);
|
|
setEastPane(null);
|
|
setWestPane(null);
|
|
}
|
|
|
|
/**
|
|
* This method uninstalls the listeners for the JInternalFrame.
|
|
*/
|
|
protected void uninstallListeners()
|
|
{
|
|
if (desktopPane != null)
|
|
desktopPane.removeComponentListener(componentListener);
|
|
|
|
frame.getRootPane().getGlassPane().removeMouseMotionListener(glassPaneDispatcher);
|
|
frame.getRootPane().getGlassPane().removeMouseListener(glassPaneDispatcher);
|
|
|
|
frame.removePropertyChangeListener(propertyChangeListener);
|
|
frame.removeInternalFrameListener(internalFrameListener);
|
|
frame.removeMouseMotionListener(borderListener);
|
|
frame.removeMouseListener(borderListener);
|
|
|
|
propertyChangeListener = null;
|
|
componentListener = null;
|
|
borderListener = null;
|
|
internalFrameListener = null;
|
|
glassPaneDispatcher = null;
|
|
}
|
|
|
|
/**
|
|
* This method uninstalls the keyboard actions for the JInternalFrame.
|
|
*/
|
|
protected void uninstallKeyboardActions()
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method creates a new LayoutManager for the JInternalFrame.
|
|
*
|
|
* @return A new LayoutManager for the JInternalFrame.
|
|
*/
|
|
protected LayoutManager createLayoutManager()
|
|
{
|
|
return new InternalFrameLayout();
|
|
}
|
|
|
|
/**
|
|
* This method creates a new PropertyChangeListener for the JInternalFrame.
|
|
*
|
|
* @return A new PropertyChangeListener for the JInternalFrame.
|
|
*/
|
|
protected PropertyChangeListener createPropertyChangeListener()
|
|
{
|
|
return new InternalFramePropertyChangeListener();
|
|
}
|
|
|
|
/**
|
|
* This method returns the preferred size of the given JComponent.
|
|
*
|
|
* @param x The JComponent to find a preferred size for.
|
|
*
|
|
* @return The preferred size.
|
|
*/
|
|
public Dimension getPreferredSize(JComponent x)
|
|
{
|
|
return internalFrameLayout.preferredLayoutSize(x);
|
|
}
|
|
|
|
/**
|
|
* This method returns the minimum size of the given JComponent.
|
|
*
|
|
* @param x The JComponent to find a minimum size for.
|
|
*
|
|
* @return The minimum size.
|
|
*/
|
|
public Dimension getMinimumSize(JComponent x)
|
|
{
|
|
return internalFrameLayout.minimumLayoutSize(x);
|
|
}
|
|
|
|
/**
|
|
* This method returns the maximum size of the given JComponent.
|
|
*
|
|
* @param x The JComponent to find a maximum size for.
|
|
*
|
|
* @return The maximum size.
|
|
*/
|
|
public Dimension getMaximumSize(JComponent x)
|
|
{
|
|
return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
|
|
}
|
|
|
|
/**
|
|
* This method replaces the currentPane with the newPane. When replacing it
|
|
* also removes the MouseHandlers for the old pane and installs them on
|
|
* the new pane.
|
|
*
|
|
* @param currentPane The old pane to remove.
|
|
* @param newPane The new pane to install.
|
|
*/
|
|
protected void replacePane(JComponent currentPane, JComponent newPane)
|
|
{
|
|
if (currentPane != null)
|
|
{
|
|
deinstallMouseHandlers(currentPane);
|
|
frame.remove(currentPane);
|
|
}
|
|
|
|
if (newPane != null)
|
|
{
|
|
installMouseHandlers(newPane);
|
|
frame.add(newPane);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method removes the necessary MouseListeners from the given
|
|
* JComponent.
|
|
*
|
|
* @param c The JComponent to remove MouseListeners from.
|
|
*/
|
|
protected void deinstallMouseHandlers(JComponent c)
|
|
{
|
|
c.removeMouseListener(borderListener);
|
|
c.removeMouseMotionListener(borderListener);
|
|
}
|
|
|
|
/**
|
|
* This method installs the necessary MouseListeners from the given
|
|
* JComponent.
|
|
*
|
|
* @param c The JComponent to install MouseListeners on.
|
|
*/
|
|
protected void installMouseHandlers(JComponent c)
|
|
{
|
|
c.addMouseListener(borderListener);
|
|
c.addMouseMotionListener(borderListener);
|
|
}
|
|
|
|
/**
|
|
* This method creates the north pane used in the JInternalFrame.
|
|
*
|
|
* @param w The JInternalFrame to create a north pane for.
|
|
*
|
|
* @return The north pane.
|
|
*/
|
|
protected JComponent createNorthPane(JInternalFrame w)
|
|
{
|
|
titlePane = new BasicInternalFrameTitlePane(w);
|
|
return titlePane;
|
|
}
|
|
|
|
/**
|
|
* This method creates the west pane used in the JInternalFrame.
|
|
*
|
|
* @param w The JInternalFrame to create a west pane for.
|
|
*
|
|
* @return The west pane.
|
|
*/
|
|
protected JComponent createWestPane(JInternalFrame w)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* This method creates the south pane used in the JInternalFrame.
|
|
*
|
|
* @param w The JInternalFrame to create a south pane for.
|
|
*
|
|
* @return The south pane.
|
|
*/
|
|
protected JComponent createSouthPane(JInternalFrame w)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* This method creates the east pane used in the JInternalFrame.
|
|
*
|
|
* @param w The JInternalFrame to create an east pane for.
|
|
*
|
|
* @return The east pane.
|
|
*/
|
|
protected JComponent createEastPane(JInternalFrame w)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* This method returns a new BorderListener for the given JInternalFrame.
|
|
*
|
|
* @param w The JIntenalFrame to create a BorderListener for.
|
|
*
|
|
* @return A new BorderListener.
|
|
*/
|
|
protected MouseInputAdapter createBorderListener(JInternalFrame w)
|
|
{
|
|
return new BorderListener();
|
|
}
|
|
|
|
/**
|
|
* This method creates a new InternalFrameListener for the JInternalFrame.
|
|
*/
|
|
protected void createInternalFrameListener()
|
|
{
|
|
internalFrameListener = new BasicInternalFrameListener();
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
protected final boolean isKeyBindingRegistered()
|
|
{
|
|
// FIXME: Implement.
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param b DOCUMENT ME!
|
|
*/
|
|
protected final void setKeyBindingRegistered(boolean b)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @return DOCUMENT ME!
|
|
*/
|
|
public final boolean isKeyBindingActive()
|
|
{
|
|
// FIXME: Implement.
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*
|
|
* @param b DOCUMENT ME!
|
|
*/
|
|
protected final void setKeyBindingActive(boolean b)
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*/
|
|
protected void setupMenuOpenKey()
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* DOCUMENT ME!
|
|
*/
|
|
protected void setupMenuCloseKey()
|
|
{
|
|
// FIXME: Implement.
|
|
}
|
|
|
|
/**
|
|
* This method returns the north pane.
|
|
*
|
|
* @return The north pane.
|
|
*/
|
|
public JComponent getNorthPane()
|
|
{
|
|
return northPane;
|
|
}
|
|
|
|
/**
|
|
* This method sets the north pane to be the given JComponent.
|
|
*
|
|
* @param c The new north pane.
|
|
*/
|
|
public void setNorthPane(JComponent c)
|
|
{
|
|
replacePane(northPane, c);
|
|
northPane = c;
|
|
}
|
|
|
|
/**
|
|
* This method returns the south pane.
|
|
*
|
|
* @return The south pane.
|
|
*/
|
|
public JComponent getSouthPane()
|
|
{
|
|
return southPane;
|
|
}
|
|
|
|
/**
|
|
* This method sets the south pane to be the given JComponent.
|
|
*
|
|
* @param c The new south pane.
|
|
*/
|
|
public void setSouthPane(JComponent c)
|
|
{
|
|
replacePane(southPane, c);
|
|
southPane = c;
|
|
}
|
|
|
|
/**
|
|
* This method sets the east pane to be the given JComponent.
|
|
*
|
|
* @param c The new east pane.
|
|
*/
|
|
public void setEastPane(JComponent c)
|
|
{
|
|
replacePane(eastPane, c);
|
|
eastPane = c;
|
|
}
|
|
|
|
/**
|
|
* This method returns the east pane.
|
|
*
|
|
* @return The east pane.
|
|
*/
|
|
public JComponent getEastPane()
|
|
{
|
|
return eastPane;
|
|
}
|
|
|
|
/**
|
|
* This method sets the west pane to be the given JComponent.
|
|
*
|
|
* @param c The new west pane.
|
|
*/
|
|
public void setWestPane(JComponent c)
|
|
{
|
|
replacePane(westPane, c);
|
|
westPane = c;
|
|
}
|
|
|
|
/**
|
|
* This method returns the west pane.
|
|
*
|
|
* @return The west pane.
|
|
*/
|
|
public JComponent getWestPane()
|
|
{
|
|
return westPane;
|
|
}
|
|
|
|
/**
|
|
* This method returns the DesktopManager to use with the JInternalFrame.
|
|
*
|
|
* @return The DesktopManager to use with the JInternalFrame.
|
|
*/
|
|
protected DesktopManager getDesktopManager()
|
|
{
|
|
DesktopManager value = frame.getDesktopPane().getDesktopManager();
|
|
if (value == null)
|
|
value = createDesktopManager();
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* This method returns a default DesktopManager that can be used with this
|
|
* JInternalFrame.
|
|
*
|
|
* @return A default DesktopManager that can be used with this
|
|
* JInternalFrame.
|
|
*/
|
|
protected DesktopManager createDesktopManager()
|
|
{
|
|
return new DefaultDesktopManager();
|
|
}
|
|
|
|
/**
|
|
* This is a convenience method that closes the JInternalFrame.
|
|
*
|
|
* @param f The JInternalFrame to close.
|
|
*/
|
|
protected void closeFrame(JInternalFrame f)
|
|
{
|
|
getDesktopManager().closeFrame(f);
|
|
}
|
|
|
|
/**
|
|
* This is a convenience method that maximizes the JInternalFrame.
|
|
*
|
|
* @param f The JInternalFrame to maximize.
|
|
*/
|
|
protected void maximizeFrame(JInternalFrame f)
|
|
{
|
|
getDesktopManager().maximizeFrame(f);
|
|
}
|
|
|
|
/**
|
|
* This is a convenience method that minimizes the JInternalFrame.
|
|
*
|
|
* @param f The JInternalFrame to minimize.
|
|
*/
|
|
protected void minimizeFrame(JInternalFrame f)
|
|
{
|
|
getDesktopManager().minimizeFrame(f);
|
|
}
|
|
|
|
/**
|
|
* This is a convenience method that iconifies the JInternalFrame.
|
|
*
|
|
* @param f The JInternalFrame to iconify.
|
|
*/
|
|
protected void iconifyFrame(JInternalFrame f)
|
|
{
|
|
getDesktopManager().iconifyFrame(f);
|
|
}
|
|
|
|
/**
|
|
* This is a convenience method that deiconifies the JInternalFrame.
|
|
*
|
|
* @param f The JInternalFrame to deiconify.
|
|
*/
|
|
protected void deiconifyFrame(JInternalFrame f)
|
|
{
|
|
getDesktopManager().deiconifyFrame(f);
|
|
}
|
|
|
|
/**
|
|
* This is a convenience method that activates the JInternalFrame.
|
|
*
|
|
* @param f The JInternalFrame to activate.
|
|
*/
|
|
protected void activateFrame(JInternalFrame f)
|
|
{
|
|
getDesktopManager().activateFrame(f);
|
|
}
|
|
|
|
/**
|
|
* This method returns a new ComponentListener for the JDesktopPane.
|
|
*
|
|
* @return A new ComponentListener.
|
|
*/
|
|
protected ComponentListener createComponentListener()
|
|
{
|
|
return new ComponentHandler();
|
|
}
|
|
|
|
/**
|
|
* This method returns a new GlassPaneDispatcher.
|
|
*
|
|
* @return A new GlassPaneDispatcher.
|
|
*/
|
|
protected MouseInputListener createGlassPaneDispatcher()
|
|
{
|
|
return new GlassPaneDispatcher();
|
|
}
|
|
}
|