
2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage variants): Update image observer. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (createImage): Start image production. * gnu/java/awt/peer/gtk/GtkFramePeer.java (setMenuBar): Protect against negative menu bar widths. (setBounds): Likewise. (postConfigureEvent): Likewise. * gnu/java/awt/peer/gtk/GtkImage.java (imageComplete): Don't remove consumer unless only a single frame has completed. * gnu/java/awt/peer/gtk/GtkImagePainter.java (GtkImagePainter): Add observer parameter. (setPixels): Update image observer. (imageComplete): Likewise. * java/applet/Applet.java (width): New field. (height): Likewise. (setStub): Set size if width or height field has been set. (resize): If stub is null save width and height values. * java/awt/Component.java (reshape): Protect against null parent. * java/awt/image/MemoryImageSource.java (MemoryImageSource(int,int,ColorModel,byte[],int,int)): Document. (MemoryImageSource(int,int,ColorModel,int[],int,int)): Likewise. (MemoryImageSource(int,int,ColorModel,byte[],int,int,Hashtable)): Reference pixel array directly, rather than creating a local copy. (MemoryImageSource(int,int,ColorModel,int[],int,int,Hashtable)): Likewise. (newPixels(int,int,int,int)): Fix for loop and array copy bounds. (newPixels(int,int,int,int,boolean)): Likewise. (startProduction): If animated call imageComplete with SINGLEFRAME. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Uncomment gdk_flush lines. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c (drawPixels): Return if g is null or g->drawable is not a gdk drawable. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultSingleSelectionModel.java, javax/swing/JPasswordField.java, javax/swing/tree/AbstractLayoutCache.java: Reformatted and javadocs cleaned up. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/Component.java: Fixed argument names to match javadocs. (setFont): Rewritten set property first and then fire event. (setLocale): Likewise. * javax/swing/text/JTextComponent.java (setEditable): Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Button.java (AccessibleAWTButton.getAccessibleActionDescription): Explain the source of 'click'. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java: Remove stub comments. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Button.java (AccessibleAWTButton.getAccessibleActionDescription): Return 'click'. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/CardLayout.java: Made some constants static. (serialVersionUID): Made private. (addLayoutComponent): Simplified code. * java/awt/event/InputEvent.java (getModifiersEx): Added missing @param tag. * java/awt/image/RGBImageFilter.java (filterRGBPixels): Reformatted, removed wrong @param tag. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/text/FieldView.java, javax/swing/text/JTextComponent.java: Removed debug code. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/BorderFactory.java (BorderFactory): Added private constructor. * javax/swing/SwingUtilities.java (SwingUtilities): Likewise. (computeStringWidth): New method. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/color/ICC_Profile.java (icSigNamedColorTag): Removed. * java/awt/datatransfer/DataFlavor.java (isMimeTypeEqual): Made final. * java/awt/image/AffineTransformOp.java: Reworked javadocs. (TYPE_BICUBIC): Added @since tag. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java (AccessibleAWTCheckBox): Remove todo comments. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java (itemStateChanged): Implement function. (getAccessibleContext): Add AccessibleAWTCheckBox to item listeners. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/Polygon.java (contains): Reimplemented. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/print/PrinterJob.java: Reformatted. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/AffineTransformOp.java, java/awt/image/ColorConvertOp.java, java/awt/image/LookupOp.java, java/awt/image/RescaleOp.java: Added final keywords where they belong. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/CardLayout.java, java/awt/Component.java, java/awt/Font.java, java/awt/image/SinglePixelPackedSampleModel.java: Fixed javadocs and argument names all over. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/DataBufferShort.java: Fixed file header. * java/awt/image/DataBufferUShort.java: Likewise. (DataBufferUShort): Throw NullPointerException if dataArray is null. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Arc2D.java (setAngleStart): Corrected (wrong sign on atan2 y parameter). (setAngles): Likewise. (containsAngle): Return false on zero extent, don't include final angle. (contains): Treat OPEN-type arcs like CHORD ones, not as PIE ones. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/AffineTransform.java, (inverseTransform): Fixed bug and simplified code. (createTransformedShape): Return null on null parameter. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/color/ICC_ColorSpace.java, java/awt/color/ICC_Profile.java, java/awt/color/ICC_ProfileGray.java, java/awt/color/ICC_ProfileRGB.java: Re-indent copyright header to be standardish. * java/awt/datatransfer/StringSelection.java: Reformatted. * java/awt/geom/Area.java (EPSILON): Made static. (RS_EPSILON): Likewise. (PE_EPSILON): Likewide. 2004-11-30 Sven de Marothy <sven@physto.se> * javax/swing/SwingUtilities.java: (computeDifference): Implemented (computeIntersection): Likewise (computeUnion): Likewise (isRectangleContainingRectangle): Likewise 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/BasicStroke.java, java/awt/Button.java, java/awt/Canvas.java, java/awt/CheckboxMenuItem.java, java/awt/Container.java, java/awt/EventQueue.java, java/awt/FileDialog.java, java/awt/FlowLayout.java, java/awt/FontMetrics.java, java/awt/Graphics.java, java/awt/GridLayout.java, java/awt/KeyboardFocusManager.java, java/awt/Label.java, java/awt/LayoutManager2.java, java/awt/List.java, java/awt/MenuBar.java, java/awt/Scrollbar.java, java/awt/Toolkit.java, java/awt/Window.java, java/awt/datatransfer/DataFlavor.java, java/awt/datatransfer/FlavorTable.java, java/awt/event/ActionListener.java, java/awt/event/HierarchyBoundsAdapter.java, java/awt/geom/Arc2D.java, java/awt/geom/Rectangle2D.java, java/awt/geom/RectangularShape.java, java/awt/im/spi/InputMethod.java, java/awt/image/ByteLookupTable.java, java/awt/image/ColorModel.java, java/awt/image/DirectColorModel.java, java/awt/image/ShortLookupTable.java, java/awt/print/Book.java: Fixed javadocs and method argument names all over. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkFontPeer.java (buildString): Optimise String building. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/TextArea.java (AccessibleAWTTextArea, getAccessibleContext): Implement. * java/awt/TextField.java (AccessibleAWTTextField, getAccessibleContext): Implement. 2004-11-30 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. * Makefile.am (jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo): Fixed typo. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Menu.java (AccessibleAWTMenu, getAccessibleContext): Implement. * java/awt/PopupMenu.java (AccessibleAWTMenu, getAccessibleContext): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/print/PrinterJob.java (lookupPrintServices, getPrintService, setPrintService): Implement. (lookupStreamPrintServices): Add commented out implementation. (printer): New field. 2004-11-30 Mark Wielaard <mark@klomp.org> * javax/swing/ToolTipManager.java (mouseMoved): Set currentComponent when not yet set. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/GeneralPath.java (evaluateCrossings): Fixed epsilon value, should always be nonzero. 2004-11-30 Paul Jenner <psj.home@ntlworld.com> * java/awt/image/Raster.java (createPackedRaster): Implemented. 2004-11-30 Graydon Hoare <graydon@redhat.com> * javax/swing/plaf/basic/BasicTextUI.java: Listen to focus events, indicate focus via caret. * javax/swing/text/GapContent.java (getString): Return substring. * javax/swing/text/PlainDocument.java (reindex): New method. (createDefaultRoot): Call it. (insertUpdate): Likewise. (removeUpdate): Likewise. * javax/swing/text/Utilities.java (drawTabbedText): Always advance on tab and newline, even if no painting happens. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am: List peer JNI header: Java source file dependencies explicitly. Likewise for JNI .lo: JNI header dependencies. * Makefile.in: Regenerate. 2004-11-30 Graydon Hoare <graydon@redhat.com> * Makefile.am: Add entry for BasicTextPaneUI.java * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (GdkGraphics2D): Set clip after transform. (drawImage): Protect against null image. * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Protect against non-GtkImage args. * gnu/java/awt/peer/gtk/GtkToolkit.java (checkImage): Protect against non-GtkImage args. * java/awt/print/PrinterJob.java: (print): Add variant taking PrintRequestAttributeSet. (printDialog): Likewise. * javax/swing/JComponent.java: (transferHandler): New field. (getComponentGraphics): Build new Graphics for each sub-paint. (getTransferHandler): New method. (setTransferHandler): New method. * javax/swing/JDesktopPane.java (setDragMode): Force LIVE_DRAG_MODE. * javax/swing/JMenuItem.java (menuSelectionChanged): Protect against null parent. * javax/swing/JTable.java (setDefaultRenderer): New method. * javax/swing/JTree.java: Get basic ctors and UI working. * javax/swing/JViewport.java (JViewport): Set scroll mode. * javax/swing/RepaintManager.java (addDirtyRegion): Skip empty regions. * javax/swing/ScrollPaneLayout.java (minimumLayoutSize): Do not bound scrollpane minimum by central view minimum. * javax/swing/ToolTipManager.java (showTip): Guard against null component. * javax/swing/TransferHandler.java: Stub out. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add entry for TextPaneUI, change Tree icons to pngs. * javax/swing/plaf/basic/BasicMenuItemUI.java: (installDefaults): Set text position and alignment. (paintMenuItem): Layout icon with normal compound function. * javax/swing/plaf/basic/BasicTableHeaderUI.java: (getMaximumSize): Delete. (getMinimumSize): Delete. (getPreferredSize): Use column model's total width. * javax/swing/plaf/basic/BasicTextPaneUI.java: New file. * javax/swing/plaf/basic/BasicTextUI.java (modelChanged): Make resilient against nulls. * javax/swing/plaf/basic/BasicTreeUI.java: Add some simplistic config / painting functions. * javax/swing/plaf/basic/BasicViewportUI.java (paintSimple): Add new non-backingstore paint mode. (paintBackingStore): Split out backing store code. (paint): Switch on painting mode. * javax/swing/text/SimpleAttributeSet.java (SimpleAttributeSet): Resist nulls. * javax/swing/tree/DefaultTreeCellRenderer.java: Implement. * javax/swing/tree/DefaultTreeModel.java: Partially implement. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (setFont): Set pango context's description and language. 2004-11-30 Mark Wielaard <mark@klomp.org> * java/awt/image/LookupOp.java: Comments and indentation fixes. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java (AccessibleAWTCheckBox): Implement. (getAccessibleContext): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/TextComponent.java (AccessibleAWTTextComponent): Implement. (getIndexAtPoint, getCharacterBounds): New methods. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Button.java (AccessibleAWTButton): Implement. 2004-11-30 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (filenameFilterCallback): Made static. 2004-11-30 Michael Koch <konqueror@gmx.de> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (cairoShowGlyphs) Removed. 2004-11-30 Sven de Marothy <sven@physto.se> * gnu/java/awt/color/RgbProfileConverter.java (RgbProfileConverter): Don't invert matrix when reverse CLUT is available. * gnu/java/awt/color/LinearRGBConverter.java: Documentation update. * java/awt/color/ICC_ColorSpace.java: Likewise. * java/awt/color/ICC_Profile.java: Likewise. * java/awt/color/ICC_ProfileGray.java: Likewise. * java/awt/color/ICC_ProfileRGB.java: Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/MenuItem.java (AccessibleAWTMenuItem): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Choice.java (AccessibleAWTChoice): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BandedSampleModel.java (scanlineStride): Remove field hiding ComponentSampleModel.scanlineStride. 2004-11-30 Noa Resare <noa@resare.com> * java/awt/geom/GeneralPath.java (currentSegment): Fix typo in transform.transform() invocation. 2004-11-30 Sven de Marothy <sven@physto.se> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (createImage): Created bitmap should be filled with bg color 2004-11-30 Noa Resare <noa@resare.com> * java/awt/Choice.java (add): Implement correct selection behavior when peer == null. (insert): Likewise. (remove): Likewise. 2004-11-30 Mark Wielaard <mark@klomp.org> * gnu/java/awt/peer/gtk/GtkChoicePeer.java (GtkChoicePeer): Call select() when Choice has a selected item. 2004-11-30 Michael Koch <address@bogus.example.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.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_GdkGraphicsEnvironment.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c: Fixed method names to start at begin of line. This is desired by GNU coding style guide. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkWidgetSetVisible): Unused. Removed. (connectJObject): Likewise. * gnu/java/awt/peer/gtk/GtkScrollPanePeer.java (gtkScrolledWindowSetScrollPosition): Commented out. 2004-11-30 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c (Java_gnu_java_awt_peer_gtk_GdkTextLayout_setText): Installed and renamed from Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText. 2004-11-30 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText): Removed. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (init_dpi_conversion_factor): Correct prototype. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/image/ConvolveOp.java: Added missing copyright notice. 2004-11-30 Robert Schuster <theBohemian@gmx.net> Fixes bug #10908 * gnu/java/beans/IntrospectionIncubator.java: (addMethod): static methods are discarded now, too. 2004-11-30 Mark Wielaard <mark@klomp.org> * Makefile.am (awt_java_source_files): Add new gnu/java/awt/color java source files. * Makefile.in: Regenerated. 2004-11-30 Sven de Marothy <sven@physto.se> * gnu/java/awt/color/CieXyzConverter.java, gnu/java/awt/color/GrayScaleConverter.java, gnu/java/awt/color/SrgbConverter.java, gnu/java/awt/color/ClutProfileConverter.java, gnu/java/awt/color/LinearRGBConverter.java, gnu/java/awt/color/TagEntry.java, gnu/java/awt/color/ColorLookUpTable.java, gnu/java/awt/color/ProfileHeader.java, gnu/java/awt/color/ToneReproductionCurve.java, gnu/java/awt/color/ColorSpaceConverter.java, gnu/java/awt/color/PyccConverter.java, gnu/java/awt/color/GrayProfileConverter.java, gnu/java/awt/color/RgbProfileConverter.java: New files. * java/awt/color/ICC_ColorSpace.java, java/awt/color/ICC_Profile.java, java/awt/color/ICC_ProfileGray.java, java/awt/color/ICC_ProfileRGB.java: Implemented (sans PhotoYCC color space). 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/AffineTransformOp.java (filter): Implement bilinear interpolation for Rasters. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (IndexColorModel): Actually use the provided colormap. Throw documented exceptions. Document exceptions. 2004-11-30 Paul Jenner <psj.home@ntlworld.com> * java/awt/image/IndexColorModel.java (IndexColorModel): Fix constructor. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/AffineTransformOp.java: Add TYPE_BICUBIC. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/AffineTransformOp.java (filter): Implement Raster filtering. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentSampleModel.java (getDataElements, setDataElements): Implement SHORT, FLOAT, and INT transfer types. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Font.java (name): New field. (size): Likewise. (style): Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (createBandedRaster): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ConvolveOp.java: New class. * Makefile.am: Add ConvolveOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/RescaleOp.java (BandCombineOp, ColorConvertOp, LookupOp, RescaleOp): Fix loop bounds. 2004-11-30 jlquinn <jlquinn@optonline.net> * Makefile.am: Fix typo in BandCombineOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BandCombineOp.java: New class. * Makefile.am: Add BandCombineOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/LookupOp.java: New class. * Makefile.am: Add LookupOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/SampleModel.java (createSubsetSampleModel): Add javadocs. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorModel.java (cloneColorModel): Fix line wrap. Use Boolean.valueOf. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (releasePeerGraphicsResource): Fixed typo in method name. * gnu/java/awt/peer/gtk/GdkFontPeer.java (finalize): Fixed typo in releasePeerGraphicsResource. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/font/TextAttribute.java (RUN_DIRECTION_LTR): Initialie with static value instead of calculating it. (RUN_DIRECTION_RTL): Likewise. (STRIKETHROUGH_ON): Likewise. (SWAP_COLORS_ON): Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorConvertOp.java: New class. * java/awt/image/ColorModel.java (cloneColorModel): New method. * Makefile.am: Add ColorConvertOp. * Makefile.in: Regenerate. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/DefaultKeyboardFocusManager.java (dispatchEvent): Track Window focus owner on FOCUS_GAINED events. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c (Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun): Fix pointer warning. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter): Fix pointer warning. * jni/gtk-peer/gtkpeer.h: Introduce widget_union to fix type punned warnings. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect): Use widget_union to fix type punned pointer warning. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (window_get_new_state): Introduce unions to fix warnings as above. (window_property_changed_cb): Likewise. (window_active_state_change_cb): Mark unused variables unused. (window_focus_state_change_cb): Likewise. (window_focus_in_cb): Likewise. (window_focus_out_cb): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Convert PangoFontMap correctly with PANGO_FT2FONT_MAP macro. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JMenuBar.java (updateUI): Simplified. * javax/swing/tree/DefaultTreeSelectionModel.java: Reorganized import statements. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/font/TextAttribute.java, javax/swing/JComponent.java, javax/swing/JInternalFrame.java, javax/swing/table/TableColumn.java, javax/swing/text/StyleConstants.java: Replaced "new Boolean(boolean)" with "Boolean.valueOf(boolean)". 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultTreeCellEditor.java, javax/swing/tree/DefaultTreeModel.java, javax/swing/tree/DefaultTreeSelectionModel.java: Jalopied. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultTreeCellEditor.java (EditorContainer.EditorContainer): Fixed arguments. (EditorContainer.EditorContainer): New method. (DefaultTextField.DefaultTextField): Fixed arguments, implemented. (DefaultTextField.getBorder): Implemented. (listenerList): New field. (addCellEditorListener): Implemented. (removeCellEditorListener): Implemented. (getCellEditorListeners): New method. * javax/swing/tree/DefaultTreeModel.java (addTreeModelListener): Fixed javadoc. (removeTreeModelListener): Likewise. (getTreeModelListeners): New method. (fireTreeNodesChanged): Implemented. (fireTreeNodesInserted): Likewise. (fireTreeNodesRemoved): Likewise. (fireTreeStructureChanged): Likewise. (getListeners): Fixed javadoc. * javax/swing/tree/DefaultTreeSelectionModel.java (addTreeSelectionListener): Implemented. (removeTreeSelectionListener): Likewise. (fireValueChanged): Likewise. (getListeners): Likewise. (addPropertyChangeListener): Likewise. (removePropertyChangeListener): Likewise. (getTreeSelectionListeners): New method. (getPropertyChangeListeners): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicScrollBarUI.java (maximumThumbSize): Removed static keyword. (minimumThumbSize): Likewise. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (CloseAction): Made public. (IconifyAction): Likewise. (MaximizeAction): Likewise. (MoveAction): Likewise. (RestoreAction): Likewise. (SizeAction): Likewise. (SystemMenuBar): Likewise. * javax/swing/plaf/basic/BasicSliderUI.java (TrackListener): Likewise. * javax/swing/plaf/basic/BasicSplitPaneUI.java (KeyboardDownRightHandler): Likewise. (KeyboardEndHandler): Likewise. (KeyboardHomeHandler): Likewise. (KeyboardResizeToggleHandler): Likewise. (KeyboardUpLeftHandler): Likewise. (PropertyHandler): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (PropertyChangeHandler): Likewise. (TabSelectionHandler): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/text/JTextComponent.java (getKeymap): Made public. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java (getStream): Throws IOException. (read): Likewise. * javax/swing/JRootPane.java (createContentPane): Fixed return type. * javax/swing/JSpinner.java (commitEdit): Throws ParseException. * javax/swing/plaf/metal/MetalLookAndFeel.java (serialVersionUID): New field. * javax/swing/table/TableColumn.java (resizedPostingDisableCount): Added @deprecated tag. (disableResizedPosting): Likewise. (enableResizedPosting): Likewise. * javax/swing/text/Document.java (TitleProperty): Fixed value. * javax/swing/tree/TreeCellEditor.java (TreeCellEditor): Extends CellEditor. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JWindow.java javax/swing/SpinnerModel.java javax/swing/Timer.java javax/swing/event/MenuKeyEvent.java javax/swing/plaf/basic/BasicButtonUI.java javax/swing/plaf/basic/BasicIconFactory.java javax/swing/plaf/basic/BasicTabbedPaneUI.java javax/swing/text/AttributeSet.java javax/swing/text/Highlighter.java javax/swing/text/StyleConstants.java javax/swing/tree/TreeCellEditor.java: Removed redundant and reordered modifiers. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicToolTipUI.java: Reformatted copyright header. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractAction.java, javax/swing/AbstractButton.java, javax/swing/AbstractCellEditor.java, javax/swing/AbstractListModel.java, javax/swing/AbstractSpinnerModel.java, javax/swing/ActionMap.java, javax/swing/BorderFactory.java, javax/swing/Box.java, javax/swing/ButtonModel.java, javax/swing/CellEditor.java, javax/swing/CellRendererPane.java, javax/swing/DefaultBoundedRangeModel.java, javax/swing/DefaultButtonModel.java, javax/swing/DefaultCellEditor.java, javax/swing/DefaultDesktopManager.java, javax/swing/DefaultListCellRenderer.java, javax/swing/DefaultListSelectionModel.java, javax/swing/DefaultSingleSelectionModel.java, javax/swing/GrayFilter.java, javax/swing/InputMap.java, javax/swing/JApplet.java, javax/swing/JCheckBoxMenuItem.java, javax/swing/JColorChooser.java, javax/swing/JComboBox.java, javax/swing/JComponent.java, javax/swing/JDesktopPane.java, javax/swing/JDialog.java, javax/swing/JEditorPane.java, javax/swing/JFileChooser.java, javax/swing/JFormattedTextField.java, javax/swing/JFrame.java, javax/swing/JInternalFrame.java, javax/swing/JLabel.java, javax/swing/JLayeredPane.java, javax/swing/JList.java, javax/swing/JMenu.java, javax/swing/JMenuBar.java, javax/swing/JMenuItem.java, javax/swing/JOptionPane.java, javax/swing/JPanel.java, javax/swing/JPasswordField.java, javax/swing/JPopupMenu.java, javax/swing/JRadioButtonMenuItem.java, javax/swing/JRootPane.java, javax/swing/JSpinner.java, javax/swing/JSplitPane.java, javax/swing/JTabbedPane.java, javax/swing/JTable.java, javax/swing/JTextArea.java, javax/swing/JTextPane.java, javax/swing/JToggleButton.java, javax/swing/JToolBar.java, javax/swing/JToolTip.java, javax/swing/JTree.java, javax/swing/JViewport.java, javax/swing/ListModel.java, javax/swing/LookAndFeel.java, javax/swing/MenuSelectionManager.java, javax/swing/ProgressMonitorInputStream.java, javax/swing/RepaintManager.java, javax/swing/RootPaneContainer.java, javax/swing/ScrollPaneLayout.java, javax/swing/SpringLayout.java, javax/swing/SwingUtilities.java, javax/swing/Timer.java, javax/swing/ToolTipManager.java, javax/swing/UIDefaults.java, javax/swing/UIManager.java, javax/swing/border/MatteBorder.java, javax/swing/colorchooser/AbstractColorChooserPanel.java, javax/swing/colorchooser/ColorSelectionModel.java, javax/swing/colorchooser/DefaultColorSelectionModel.java, javax/swing/colorchooser/DefaultHSBChooserPanel.java, javax/swing/colorchooser/DefaultPreviewPanel.java, javax/swing/colorchooser/DefaultRGBChooserPanel.java, javax/swing/colorchooser/DefaultSwatchChooserPanel.java, javax/swing/event/AncestorEvent.java, javax/swing/event/HyperlinkEvent.java, javax/swing/event/InternalFrameEvent.java, javax/swing/event/MenuDragMouseEvent.java, javax/swing/event/TableColumnModelEvent.java, javax/swing/event/TableModelEvent.java, javax/swing/event/TreeExpansionEvent.java, javax/swing/event/TreeModelEvent.java, javax/swing/event/TreeSelectionEvent.java, javax/swing/event/TreeWillExpandListener.java, javax/swing/event/UndoableEditEvent.java, javax/swing/filechooser/FileView.java, javax/swing/plaf/BorderUIResource.java, javax/swing/plaf/ComponentUI.java, javax/swing/plaf/FileChooserUI.java, javax/swing/plaf/IconUIResource.java, javax/swing/plaf/ListUI.java, javax/swing/plaf/PopupMenuUI.java, javax/swing/plaf/SplitPaneUI.java, javax/swing/plaf/TabbedPaneUI.java, javax/swing/plaf/TextUI.java, javax/swing/plaf/TreeUI.java, javax/swing/plaf/basic/BasicArrowButton.java, javax/swing/plaf/basic/BasicBorders.java, javax/swing/plaf/basic/BasicButtonUI.java, javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java, javax/swing/plaf/basic/BasicColorChooserUI.java, javax/swing/plaf/basic/BasicComboBoxEditor.java, javax/swing/plaf/basic/BasicComboBoxRenderer.java, javax/swing/plaf/basic/BasicComboBoxUI.java, javax/swing/plaf/basic/BasicComboPopup.java, javax/swing/plaf/basic/BasicDesktopIconUI.java, javax/swing/plaf/basic/BasicDesktopPaneUI.java, javax/swing/plaf/basic/BasicIconFactory.java, javax/swing/plaf/basic/BasicInternalFrameTitlePane.java, javax/swing/plaf/basic/BasicInternalFrameUI.java, javax/swing/plaf/basic/BasicListUI.java, javax/swing/plaf/basic/BasicLookAndFeel.java, javax/swing/plaf/basic/BasicMenuBarUI.java, javax/swing/plaf/basic/BasicMenuItemUI.java, javax/swing/plaf/basic/BasicMenuUI.java, javax/swing/plaf/basic/BasicOptionPaneUI.java, javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java, javax/swing/plaf/basic/BasicPopupMenuUI.java, javax/swing/plaf/basic/BasicProgressBarUI.java, javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java, javax/swing/plaf/basic/BasicRootPaneUI.java, javax/swing/plaf/basic/BasicScrollBarUI.java, javax/swing/plaf/basic/BasicSeparatorUI.java, javax/swing/plaf/basic/BasicSliderUI.java, javax/swing/plaf/basic/BasicSpinnerUI.java, javax/swing/plaf/basic/BasicSplitPaneDivider.java, javax/swing/plaf/basic/BasicSplitPaneUI.java, javax/swing/plaf/basic/BasicTabbedPaneUI.java, javax/swing/plaf/basic/BasicTableHeaderUI.java, javax/swing/plaf/basic/BasicTableUI.java, javax/swing/plaf/basic/BasicTextAreaUI.java, javax/swing/plaf/basic/BasicTextFieldUI.java, javax/swing/plaf/basic/BasicTextUI.java, javax/swing/plaf/basic/BasicToolBarSeparatorUI.java, javax/swing/plaf/basic/BasicToolBarUI.java, javax/swing/plaf/basic/BasicToolTipUI.java, javax/swing/plaf/basic/BasicTreeUI.java, javax/swing/plaf/basic/BasicViewportUI.java, javax/swing/plaf/basic/ComboPopup.java, javax/swing/table/AbstractTableModel.java, javax/swing/table/DefaultTableCellRenderer.java, javax/swing/table/DefaultTableColumnModel.java, javax/swing/table/DefaultTableModel.java, javax/swing/table/JTableHeader.java, javax/swing/table/TableCellEditor.java, javax/swing/table/TableCellRenderer.java, javax/swing/table/TableColumn.java, javax/swing/table/TableColumnModel.java, javax/swing/text/AbstractDocument.java, javax/swing/text/Caret.java, javax/swing/text/DefaultCaret.java, javax/swing/text/DefaultEditorKit.java, javax/swing/text/DefaultHighlighter.java, javax/swing/text/EditorKit.java, javax/swing/text/JTextComponent.java, javax/swing/text/LayeredHighlighter.java, javax/swing/text/PasswordView.java, javax/swing/text/SimpleAttributeSet.java, javax/swing/text/StyleConstants.java, javax/swing/text/StyleContext.java, javax/swing/text/StyledEditorKit.java, javax/swing/text/TextAction.java, javax/swing/text/View.java, javax/swing/tree/AbstractLayoutCache.java, javax/swing/tree/DefaultTreeCellRenderer.java, javax/swing/tree/DefaultTreeModel.java, javax/swing/tree/DefaultTreeSelectionModel.java, javax/swing/tree/FixedHeightLayoutCache.java, javax/swing/tree/TreeCellRenderer.java, javax/swing/tree/TreeSelectionModel.java, javax/swing/tree/VariableHeightLayoutCache.java, javax/swing/undo/AbstractUndoableEdit.java, javax/swing/undo/UndoableEditSupport.java: Imports cleaned up. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/Container.java, java/awt/Font.java, java/awt/font/TextLayout.java: Imports cleaned up. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (getLabel): Added @deprecated tag. (setLabel): Likewise. * javax/swing/FocusManager.java (disableSwingFocusManager): Likewise. (isFocusManagerEnabled): Likewise. * javax/swing/JComponent.java (isManagingFocus): Added version to @deprecated tag. (getNextFocusableComponent): Moved @deprecated tag to bottom of javadoc. (getConditionForKeyStroke): Likewise. (getActionForKeyStroke): Likewise. * javax/swing/JDesktopPane.java (LIVE_DRAG_MODE): Added @specnote tag. (OUTLINE_DRAG_MODE): Likewise. * javax/swing/JInternalFrame.java (MENU_BAR_PROPERTY): Fixed value. (getMenuBar): Added @deprecated tag. (setMenuBar): Likewise. * javax/swing/JViewport.java (isBackingStoreEnabled): Likewise. (setBackingStoreEnabled): Likewise. * javax/swing/plaf/basic/BasicDesktopPaneUI.java (closeKey): Likewise. (maximizeKey): Likewise. (minimizeKey): Likewise. (navigateKey): Likewise. (navigateKey2): Likewise. * javax/swing/plaf/basic/BasicInternalFrameUI.java (openMenuKey): Likewise. * javax/swing/plaf/basic/BasicSplitPaneUI.java (keyboardDownRightListener): Likewise. (keyboardEndListener): Likewise. (keyboardHomeListener): Likewise. (keyboardResizeToggleListener): Likewise. (keyboardUpLeftListener): Likewise. (dividerResizeToggleKey): Likewise. (downKey): Likewise. (endKey): Likewise. (homeKey): Likewise. (leftKey): Likewise. (rightKey): Likewise. (upKey): Likewise. (createKeyboardUpLeftListener): Likewise. (createKeyboardDownRightListener): Likewise. (createKeyboardHomeListener): Likewise. (createKeyboardEndListener): Likewise. (createKeyboardResizeToggleListener): Likewise. (getDividerBorderSize): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (downKey): Likewise. (leftKey): Likewise. (rightKey): Likewise. (upKey): Likewise. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Use the GTK_TEXT_VIEW macro. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (connect_awt_hook_cb): Mark unused variable unused. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c (selection_get): Do the cast right. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create): According to the gtk API gtk_combo_box_new_text actually returns a GtkWidget. Remove unused var menu. (selection_changed): Remove unused value. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds): Fix pointer warning with using an intermediate variable. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_updated): Fix unused var warning for BE archs. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_connectSignals): Remove unused var. (realize_cb): Mark unused variable unused. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (seek_glyphstring_idx): Fix a C90 warning. * jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c (Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun): Mark unused arguments unused. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState), (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes), (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex), (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c (Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerFontMetrics), (Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerTextMetrics): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter): Likewise. (filenameFilterCallback): Remove unused var. (handle_response): Declare str_fileName and remove last else statement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c: New File. (nativeGetNumFontsFamilies) New function. (nativeGetFontFamilies) Likewise. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java (getAvailableFontFamilyNames): Implement. * Makefile.am (gtk_c_source_files): Add GdkGraphicsEnvironment.c. * Makefile.in: Regenerate. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/ClasspathFontPeer.java (setStandardAttributes(String,Map)): If size attribute doesn't exist, default to size 12. Clamp size value to a minimum of 1. 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * javax/swing/JDialog.java (decorated): Likewise. * javax/swing/JFrame.java (defaultLookAndFeelDecorated): Likewise. 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * javax/swing/plaf/basic/BasicToolBarUI.java (offset, regular): Made final. * javax/swing/plaf/basic/BasicScrollBarUI.java (DECREASE_HIGHLIGHT, INCREASE_HIGHLIGHT, NO_HIGHLIGHT, POSITIVE_SCROLL, NEGATIVE_SCROLL): Made final. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/BitwiseXORComposite.java, gnu/java/awt/ClasspathToolkit.java, gnu/java/awt/image/XBMDecoder.java, gnu/java/awt/peer/GLightweightPeer.java, gnu/java/awt/peer/gtk/GdkGlyphVector.java: Reorganized import statements. 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * java/awt/Button.java (next_button_number): Removed useless initializer. * java/awt/Frame.java (next_frame_number): Likewise. * java/awt/Panel.java (next_panel_number): Likewise, * java/awt/Scrollbar.java (next_scrollbar_number): Likewise. * java/awt/TextArea.java (next_text_number): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/ByteLookupTable.java (ByteLookupTable) :Fixed HTML entities in javadocs. (lookupPixel): Fix case when dst is null. * java/awt/image/ShortLookupTable.java (ShortLookupTable) :Fixed HTML entities in javadocs. (lookupPixel): Fix case when dst is null. * java/awt/image/DataBufferByte.java, java/awt/image/DataBufferDouble.java, java/awt/image/DataBufferFloat.java, java/awt/image/DataBufferInt.java, java/awt/image/DataBufferShort.java, java/awt/image/DataBufferUShort.java: Fix initialization of bankData in constructors. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (setNativeBounds): Set GtkEventBox, GtkButton and GtkLabel size requests. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (setNativeBounds): Make package private. Set size request even if GTK parent is NULL. * gnu/java/awt/peer/gtk/GtkLabelPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (setNativeBounds): Set GtkEventBox and GtkLabel size requests. 2004-11-30 Mark Wielaard <mark@klomp.org> Workaround for bug #17952. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (request_frame_extents): Check window->window != NULL. 2004-11-30 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gdkfont.h: Include gtkpeer.h not gtkcairopeer.h. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Use native_text_layout_state_table here. * jni/gtk-peer/gdkfont.h: Mark native_text_layout_state_table extern. 2004-11-30 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (setChars): Only call pango_itemize() when vec->glyphitems != NULL. Only call pango_shape() when gi->glyphs->num_glyphs > 0. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkToolkit.java: Merged import statements. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (isBufferedImageGraphics): Simplified. 2004-11-30 Paul Jenner <psj.home@ntlworld.com> * javax/swing/JTree.java (isRootVisible): Fixed typo in method name. * javax/swing/JScrollBar.java (setValues): Likewise. * javax/swing/JScrollPane.java (createScrollListener): Call JScrollBar.setValues. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkContainerPeer.java (endValidate): Don't call setParentAndBounds on GtkWindowPeers. * java/awt/Component.java (static): Don't set default keyboard focus manager. * java/awt/KeyboardFocusManager.java (getCurrentKeyboardFocusManager): If current keyboard focus manager is null set a default. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (gtkWidgetSetBackground): New method. (block_expose_events_cb): New function. (connectSignals): Block the AWT's expose event processing on button press and release. (gtkSetLabel): Set text on proper widget. (gtkWidgetModifyFont): Modify font on proper widget. (gtkWidgetSetBackground): Set normal, active and prelight colours. (gtkWidgetSetForeground): Set forground colour of proper widget. (gtkActivate): Activate the correct widget. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (clearRect): Only clear rectangle if the backing component is not an event box. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (beginNativeRepaintID): New variable. (endNativeRepaintID): Likewise. (gtkInit): Initialize new fields with method IDs. * jni/gtk-peer/gtkpeer.h (beginNativeRepaintID): Declare extern. (endNativeRepaintID): Likewise. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * javax/swing/JList.java (init): Revert accidental commit. * gnu/java/awt/peer/gtk/GdkGraphics.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (GdkGraphics): Call initComponentGraphics or connectSignals depending on component's realization status. (realize_cb): New function. (initComponentGraphics): New method. (connectSignals): New method. (clipRect): Return immediately if component is not realized. (setClip): Likewise. (translate): Likewise. (drawImage variants): Return false immediately if component is not realized. * gnu/java/awt/peer/gtk/GdkGraphics2D.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (connectSignals): New method. (GdkGraphics2D): Call initComponentGraphics2D or connectSignals depending on component's realization status. Move other initialization calls to ... (initComponentGraphics2D): New method. (realize_cb): New function. (cairoSetMatrix): Return immediately if gr is NULL. (cairoNewPath): Likewise. (cairoRectangle): Likewise. (cairoClip): Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetRepaintArea): Remove method. (isRealized): New method. (GtkComponentPeer): Move setParent, connectJObject and setCursor calls to setParentAndBounds. Call setParentAndBounds. (setParentAndBounds): New method. (setComponentBounds): Return immediately if bounds are all zero. (repaint): Remove call to gtkWidgetRepaintArea. Return immediately if requested paint region is 0x0. (setCursor): New method. (gtkWidgetSetParent): Only set widget's parent if its parent is currently NULL. (setNativeBounds): Only set widget's bounds if it has a parent. (connectSignals): Don't call gtk_widget_realize. Connect "realize" signal to connect_awt_hook_cb handler. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (isValidating): New field. (beginValidate): Set isValidating true. (endValidate): Set parents and bounds for children first, then for this. Set isValidating false. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (connectJObject): Remove method. (connectSignals): Don't call gtk_widget_realize. * gnu/java/awt/peer/gtk/GtkListPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (connectJObject): Remove method. (connectSignals): Don't call gtk_widget_realize. * gnu/java/awt/peer/gtk/GtkPanelPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (connectJObject): Remove method. * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c (connectJObject): Remove method. * gnu/java/awt/peer/gtk/GtkWindowPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (create): Don't call gtk_widget_realize. (connectJObject): Remove method. (connectSignals): Don't call gtk_widget_realize. Connect "realize" signal to connect_awt_hook_cb handler. (nativeSetBounds): Don't attempt to move GDK window if it is NULL. * java/awt/Container.java (addImpl): Don't call comp.addNotify if peer is not null. (validateTree): Create peers for all children before calling doLayout. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (connectSignals): Don't call gtk_widget_realize. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (connect_awt_hook_cb): New function. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (initComponentGraphicsID): New variable. (initComponentGraphics2DID): Likewise. (setCursorID): Likewise. (gtkInit): Initialize new fields with method IDs. * jni/gtk-peer/gtkpeer.h (initComponentGraphicsID): Declare extern. (initComponentGraphics2DID): Declare extern. (setCursorID): Likewise. (connect_awt_hook_cb): Declare function. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkClasspathFontPeer.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/GtkButtonPeer.java, gnu/java/awt/peer/gtk/GtkClipboard.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/GtkListPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java: Import statements reworked. Some little reformattings. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/AffineTransformOp.java (TYPE_BILINEAR): Initialize with 2. * java/awt/print/Printable.java: Jalopied. (PAGE_EXISTS): Initialize with 0; (NO_SUCH_PAGE): Initialized with 1. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * Makefile.am: Add BufferedImageFilter.java. * Makefile.in: Regenerate. 2004-11-30 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (install_font_peer): Minor bug fixes to track cairo font semantics. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BufferedImageFilter.java: Implement. 2004-11-30 Graydon Hoare <graydon@redhat.com> * Makefile.am (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c) (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c) (gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java) (gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java): Remove. (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c) (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c) (gnu/java/awt/peer/gtk/GdkTextLayout.java) (gnu/java/awt/peer/gtk/GdkFontPeer.java) (gnu/java/awt/peer/ClasspathTextLayoutPeer.java): Add * Makefile.in: Regenerate. * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Add stub. * gnu/java/awt/ClasspathToolkit.java (getClasspathTextLayoutPeer) Add. * gnu/java/awt/peer/ClasspathFontPeer.java (copyStyleToAttrs) (copySizeToAttrs): Make public. * gnu/java/awt/peer/ClasspathTextLayoutPeer.java: New file. * gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java: Remove. * gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java: Remove. * gnu/java/awt/peer/gtk/GdkFontMetrics.java: Rewrite. * gnu/java/awt/peer/gtk/GdkFontPeer.java: New file. * gnu/java/awt/peer/gtk/GdkGlyphVector.java: Adjust type names. * gnu/java/awt/peer/gtk/GdkGraphics.java (getFontPeer): New function. (drawString): Pass font peer to native side. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (cairoSetFont) (cairoShowGlyphs) (PainterThread): Remove. (GdkGraphics2D): Set hints during construction. (shifted) (walkPath) (draw) (setRenderingHint) (setRenderingHints): Reimplement normalization logic. (getDefaultHints) (updateBufferedImage) (isBufferedImageGraphics) (updateImagePixels) (drawImage): Make final. (drawImage): Always paint synchronously. (drawString) (drawGlyphVector): Rewrite. (releasePeerGraphicResource) (getPeerTextMetrics) (getPeerFontMetrics) (drawGdkGlyphVector) (drawGdkTextLayout) (cairoDrawGdkGlyphVector) (cairoDrawGdkTextLayout) (cairoDrawString) (getFontPeer): New functions. * gnu/java/awt/peer/gtk/GdkTextLayout.java: New file. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (getFontMetrics): Get metrics via toolkit, to hit cache. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Use getFontMetrics. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java (LRUCache): New class. (fontCache) (metricsCache) (imageCache): New members. (getFontMetrics) (getImage) (getClasspathFontPeer): Use caches. (getFontPeer): Route through getClasspathFontPeer. * java/awt/Font.java (attrsToMap): Remove, adjust ctors. * java/awt/font/TextLayout.java: Implement in terms of peer. * javax/swing/plaf/basic/BasicSliderUI.java (paintThumb): Use polyline rather than polygon. * javax/swing/plaf/basic/BasicGraphicsUtils.java: Update comment but, alas, still do not switch to using TextLayouts. * javax/swing/text/Utilities.java (drawTabbedText): Draw text run-at-a-time, not char-at-a-time. * jni/gtk-peer/gdkfont.h: Publicize some of the font interface, add layout table. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Remove files. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Rewrite to incorporate brains of old GdkClasspathFontPeerMetrics. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: Rewrite to incorporate brains of old GdkClasspathFontPeer. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: New file. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Rewrite to use persistent layout in peer font. Comment out extraneous gdk_flush calls. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (metrics_cairo) (metrics_surface): New static variables. (paint_glyph_run) (install_font_peer): New helper functions. (releasePeerGraphicResource) (getPeerTextMetrics) (getPeerFontMetrics) (cairoDrawGdkTextLayout) (cairoDrawGdkGlyphVector): New native methods. (cairoDrawString): Rewrite, leaving layout-based version commented out for the time being. * jni/gtk-peer/gtkpeer.h (graphics): Add fields for pango stuff. 2004-11-30 David Gilbert <david.gilbert@object-refinery.com> * java/awt/geom/AffineTransform.java: Fixed javadocs overall. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentColorModel.java: Remove FIXME comment since it's correct. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java: Fix use of immutable BigIntegers. 2004-11-30 Tom Tromey <tromey@redhat.com> * javax/swing/plaf/basic/BasicOptionPaneUI.java (MessageIcon): Renamed from 'messageIcon'. (errorIcon, infoIcon, warningIcon, questionIcon): Updated. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/RescaleOp.java: Fix formatting. 2004-11-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicComboPopup.java (SCROLL_DOWN): made final. (SCROLL_UP): made final. 2004-11-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicComboPopup.java: Added javadocs for undocumented fields. (show): scroll down to the selected item and highlight selected item. (startAutoScrolling): Implemented. (stopAutoScrolling): Implemented. (autoScrollUp): Implemented. (autoScrollDown): Implemented. (InvocationMouseHandler.mouseReleased): Implemented. (InvocationMouseMotionHandler.mouseDragged): Implemented. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/RescaleOp.java: Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (getRGBs, convertToIntDiscrete): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java: Add class docs. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (isValid, getValidPixels): Implement. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/MenuBar.java, java/awt/peer/MenuBarPeer.java: Revert accidentally commited changes. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/AWTKeyStroke.java, java/awt/Canvas.java, java/awt/CardLayout.java, java/awt/CheckboxMenuItem.java, java/awt/Component.java, java/awt/Container.java, java/awt/DefaultKeyboardFocusManager.java, java/awt/EventDispatchThread.java, java/awt/FileDialog.java, java/awt/FlowLayout.java, java/awt/Font.java, java/awt/Frame.java, java/awt/Graphics2D.java, java/awt/GraphicsEnvironment.java, java/awt/GridBagConstraints.java, java/awt/GridBagLayout.java, java/awt/GridLayout.java, java/awt/Image.java, java/awt/KeyboardFocusManager.java, java/awt/Label.java, java/awt/List.java, java/awt/MediaTracker.java, java/awt/Menu.java, java/awt/MenuBar.java, java/awt/MenuComponent.java, java/awt/Panel.java, java/awt/PopupMenu.java, java/awt/ScrollPane.java, java/awt/Scrollbar.java, java/awt/SystemColor.java, java/awt/TextArea.java, java/awt/TextField.java, java/awt/Toolkit.java, java/awt/Window.java, java/awt/color/ICC_Profile.java, java/awt/datatransfer/DataFlavor.java, java/awt/datatransfer/StringSelection.java, java/awt/datatransfer/SystemFlavorMap.java, java/awt/dnd/Autoscroll.java, java/awt/dnd/DropTarget.java, java/awt/dnd/DropTargetContext.java, java/awt/dnd/DropTargetDragEvent.java, java/awt/dnd/peer/DropTargetContextPeer.java, java/awt/event/AdjustmentEvent.java, java/awt/event/InputEvent.java, java/awt/event/InvocationEvent.java, java/awt/event/KeyEvent.java, java/awt/event/MouseEvent.java, java/awt/font/TextLayout.java, java/awt/geom/GeneralPath.java, java/awt/geom/Point2D.java, java/awt/im/InputContext.java, java/awt/im/spi/InputMethodContext.java, java/awt/image/AffineTransformOp.java, java/awt/image/BufferedImage.java, java/awt/image/ColorModel.java, java/awt/image/ComponentColorModel.java, java/awt/image/CropImageFilter.java, java/awt/image/DirectColorModel.java, java/awt/image/MemoryImageSource.java, java/awt/image/PackedColorModel.java, java/awt/image/PixelGrabber.java, java/awt/image/RasterOp.java, java/awt/peer/MenuBarPeer.java: Some fixes for checkstyle. Import statement and modifier order redordering. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java (setModel): Reimplemented. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java (append): Re-implemented. (insert): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JSpinner.java (serialVersionUID): New static field. * javax/swing/JToggleButton.java (JToggleButton): Fixed email addresses. * javax/swing/SpinnerNumberModel.java (serialVersionUID): Added javadoc. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java: Don't use JTextComponent.doc directly. GCJ from java-gui-branch has a bug here which is fixed in HEAD ... 2004-11-30 Andrew John Hughes <address@hidden> * javax/swing/JTextArea.java: Added additional documentation. 2004-11-30 Andrew John Hughes <address@hidden> * javax/swing/JRadioButton.java: Implemented additional constructors and accessibility classes. Added documentation and fixed a typo in AbstractButton. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (IndexColorModel): Implement missing constructor. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentColorModel.java (ComponentColorModel): Implement missing 1.4 constructor. 2004-11-30 Andrew John Hughes <address@hidden> * javax/swing/JToggleButton.java: Implemented additional constructors and accessibility classes. Added documentation and fixed a typo in AbstractButton. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorModel.java (getDataElement, getDataElements): Document since 1.4. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BandedSampleModel.java: Implement. * Makefile.am: Add java/awt/image/BandedSampleModel.java. * Makefile.in: Regenerated. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/Window.java: Fixed whitespace difference with GNU classpath. 2004-11-30 Mark Wielaard <mark@klomp.org> * Makefile.am: Add javax/swing/SpinnerListModel.java. * Makefile.in: Regenerated. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/swing/SpinnerListModel.java, javax/swing/SpinnerModel.java Implemented SpinnerListModel. Added documentation to SpinnerModel. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (init_dpi_conversion_factor): Apply the patch from main correctly. 2004-06-26 Andreas Tobler <a.tobler@schweiz.ch> 2004-11-30 Tom Tromey <tromey@redhat.com> Bug 9948. * javax/swing/JDesktopPane.java (LIVE_DRAG_MODE): Now final. (OUTLINE_DRAG_MODE): LIVE_DRAG_MODE. * javax/swing/plaf/basic/BasicSplitPaneUI.java (NON_CONTINUOUS_DIVIDER): Now final. Initialize. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/Canvas.java (AccessibleAWTCanvas): added serialization UID * java/awt/Label.java (AccessibleAWTLabel): added serialization UID * javax/swing/JRootPane.java (AccessibleJRootPane): added comment to existing UID * javax/swing/JSpinner.java (DefaultEditor): added serialization UID (NumberEditor): added serialization UID * javax/swing/text/html/HTML.java (UnknownTag): added serialization UID 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * javax/swing/JInternalFrame.java (CONTENT_PANE_PROPERTY,FRAME_ICON_PROPERTY,GLASS_PANE_PROPERTY, IS_CLOSED_PROPERTY,IS_ICON_PROPERTY,IS_MAXIMUM_PROPERTY, IS_SELECTED_PROPERTY,LAYERED_PANE_PROPERTY,MENU_BAR_PROPERTY, ROOT_PANE_PROPERTY,TITLE_PROPERTY): Made final as per API spec. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (CLOSE_CMD,ICONIFY_CMD,MAXIMIZE_CMD,MOVE_CMD,RESTORE_CMD,SIZE_CMD): Made final as per API spec. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gtkpeer.h: Remove duplicated copyright string. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Arc2D.java: Reformatted. (setArc): Correct documentation to say 'upper left corner'. (setArcByTangent,contains,intersects): Implemented. (containsAngle): Corrected to handle negative extents. (ArcIterator): Set to private. (ArcIterator): Corrected for CHORD-type arcs, negative extents. (intersects): Fix: Now checks the arc segment. (contains): Cleaned up. * java/awt/geom/CubicCurve2a.javaD: Fix insideness-test. Reindent. (contains): Implemented. (intersects): Implemented. * java/awt/geom/QuadCurve2D.java: Fix insideness-test. Reindent. * java/awt/geom/GeneralPath: Fix insideness-test. Reindent and document. Fully (re)implemented using separate xpoints and ypoints float[] coords. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * configure.ac: Introduce AC_C_BIGENDIAN_CROSS for WORDS_BIGENDIAN. * configure: Regenerate. * include/config.h.in: Likewise. * jni/gtk-peer/gtkpeer.h (SWAPU32): Introduce macro to swap pixels. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c: Moved SWAPU32 macro to gtkpeer.h. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getImagePixels): Convert pixels from 0xBBGGRRAA to 0xAARRGGBB only on Little Endian architectures. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_updated): Likewise. 2004-11-30 David Gilbert <david.gilbert@object-refinery.com> * java/awt/SystemColor.java: Fix @link doc entries. 2004-11-30 David Gilbert <david.gilbert@object-refinery.com> * java/awt/RenderingHints.java: Documented. (RenderingHints): Accept null init Map. (putAll): Preprocess map to generate appropriate exceptions. (remove): Cast object to Key and remove from hintMap. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/MenuComponent.java, java/awt/MenuBar.java: Implementation of accessibility classes and methods for these two components. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/KeyboardFocusManager.java: Added missing documentation. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/Label.java, java/awt/Canvas.java: Added accessibility classes to AWT Label and Canvas, as well as additional documentation for Canvas. 2004-11-30 David Gilbert <address@bogus.example.com> * java/awt/image/DataBuffer.java: Update API documentation. * java/awt/image/DataBufferByte.java: Likewise. * java/awt/image/DataBufferDouble.java: Likewise. * java/awt/image/DataBufferFloat.java: Likewise. * java/awt/image/DataBufferInt.java: Likewise. * java/awt/image/DataBufferShort.java: Likewise. * java/awt/image/DataBufferUShort.java: Likewise. 2004-11-30 Dalibor Topic <robilad@kaffe.org> * java/awt/Component.java (postEvent): Only delegate to parent if a parent exists. Reported by: Stephane Meslin-Weber <steph@tangency.co.uk> 2004-11-30 Sven de Marothy <sven@physto.se> *java/awt/AWTEventMulticaster.java, java/awt/Adjustable.java, java/awt/Point.java, java/awt/Polygon.java, java/awt/Rectangle.java, java/awt/Shape.java, java/awt/geom/Area.java, java/awt/geom/Ellipse2D.java, java/awt/geom/PathIterator.java, java/awt/geom/Point2D.java, java/awt/geom/Rectangle2D.java, java/lang/Comparable.java, java/util/Arrays.java: Fixed documentation errors 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentSampleModel.java: Add documentation. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentSampleModel.java (constructor): Initialize numBanks when figuring out the max bank index. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (createPackedRaster): Implement MultiPixelPackedSampleModel codepath. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/MultiPixelPackedSampleModel.java: Implement. * Makefile.am: Add MultiPixelPackedSampleModel.java. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (getNumBands): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (createPackedRaster(int,int,int,int,int,Point)): Implement for bands>1. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/SinglePixelPackedSampleModel.java (SinglePixelPackedSampleModel): Throw exception for unsupported datatype. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorModel.java (getDataElement): Implemented. Update javadoc. (getDataElements): Add missing version. Remove bogus version. Update javadoc. 2004-11-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicComboBoxUI.java: (paintCurrentValue): Pass correct parameters to getListCellRendererComponent(). (ListDataHandler.intervalRemoved): Implemented. (PropertyChangeHandler.propertyChange): Handle changes in MODEL_CHANGED_PROPERTY of the JComboBox * javax/swing/plaf/basic/BasicComboPopup.java: (BasicComboPopup): Moved code that configures popup to configurePopup() and call it instead. (firePopupMenuWillBecomeVisible): Implemented. (firePopupMenuWillBecomeInvisible): Likewise. (firePopupMenuCanceled): Likewise. (configureList): Set list's visibleRowCount same as comboBox's visibleRowCount. (configurePopup): Implemented. (getPopupHeightForRowCount): Get item's from JComboBox's model and not from model of the JList. (ListMouseMotionHandler.mouseMoved): Implemented. (PropertyChangeHandler.propertyChange): Handles change in the JComboBox's model. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (isMaximumSizeSet): New method. (isMinimumSizeSet): Likewise. (isPreferredSizeSet): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JSpinner.java: Some Re-formatting. (spinner): New field. (DefaultEditor): New method. (getSpinner): Likewise. (NumberEdito): Likewise. (getModel): Likewise 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/InputVerifier.java: Re-formatted. * javax/swing/JComponent.java (inputVerifier): New property field. (getInputVerifier): New method. (setInputVerifier): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (JComponent): Added javadoc comment. (setBorder): Fire property change eventr. (setEnabled): Likewise. (setMaximumSize): Likewise. (setMinimumSize): Likewise. (setPreferredSize): Likewise. (setOpaque): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextField.java (action): New field. (actionCommand): Likewise. (actionPropertyChangeListener): Likewise. (setHorizontalAlignment): Abort soon if new value == old value. Fire event before repainting. (postActionEvent): New method. (getAction): Likewise. (setAction): Likewise. (getActionCommand): Likewise. (setActionCommand): Likewise. (createActionPropertyChangeListener): Likewise. (configurePropertiesFromAction): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/DebugGraphics.java: Re-formatted. Fixed some javadocs. * javax/swing/JApplet.java (rootPaneCheckingEnabled): Renamed from checking. * javax/swing/JCheckBox.java (BORDER_PAINTED_FLAT_CHANGED_PROPERTY): New statif field. * javax/swing/JFrame.java: Re-formatted a bit and reordered some methods. (rootPaneCheckingEnabled): Renamed from checking. (getPreferredSize): Simplified. * javax/swing/JTextArea.java (getColumnWidth): New method. (getLineCount): Likewise. (getLineStartOffset): Likewise. (getLineEndOffset): Likewise. (getLineOfOffset): Likewise. (getRowHeight): Likewise. (insert): Likewise. (replaceRange): Likewise. * javax/swing/JTextField.java (scrollOffset): new field. (getScrollOffset): New method. (setScrollOffset): Likewise. (getColumnWidth): Likewise. * javax/swing/JTree.java (ANCHOR_SELECTION_PATH_PROPERTY): New static field. (CELL_EDITOR_PROPERTY): Likewise. (CELL_RENDERER_PROPERTY): Likewise. (EDITABLE_PROPERTY): Likewise. (EXPANDS_SELECTED_PATHS_PROPERTY): Likewise. (INVOKES_STOP_CELL_EDITING_PROPERTY): Likewise. (LARGE_MODEL_PROPERTY): Likewise. (LEAD_SELECTION_PATH_PROPERTY): Likewise. (ROOT_VISIBLE_PROPERTY): Likewise. (ROW_HEIGHT_PROPERTY): Likewise. (SCROLLS_ON_EXPAND_PROPERTY): Likewise. (SELECTION_MODEL_PROPERTY): Likewise. (SHOWS_ROOT_HANDLES_PROPERTY): Likewise. (TOGGLE_CLICK_COUNT_PROPERTY): Likewise. (TREE_MODEL_PROPERTY): Likewise. (VISIBLE_ROW_COUNT_PROPERTY): Likewise. (cellEditor): New field. (invokesStopCellEditing): Likewise. (largeModel): Likewise. (rowHeight): Likewise. (scrollsOnExpand): Likewise. (selectionModel): Likewise. (toggleClickCount): Likewise. (visibleRowCount): Likewise. (setShowsRootHandles): Fixed typo in method name. (getCellEditor): New method. (setCellEditor): Likewise. (getSelectionModel): Likewise. (setSelectionModel): Likewise. (getVisibleRowCount): Likewise. (setVisibleRowCount): Likewise. (isLargeModel): Likewise. (setLargeModel): Likewise. (getRowHeight): Likewise. (setRowHeight): Likewise. (getInvokesStopCellEditing): Likewise. (setInvokesStopCellEditing): Likewise. (getToggleClickCount): Likewise. (setToggleClickCount): Likewise. (getScrollsOnExpand): Likewise. (setScrollsOnExpand): Likewise. * javax/swing/table/DefaultTableColumnModel.java (addColumnModelListener): Fixed javadoc. (removeColumnModelListener): Implemented. Fixed javadoc. (getColumnModelListeners): New method. * javax/swing/table/JTableHeader.java (columnModel): Made protected. (draggedColumn): Likewise. (draggedDistance): Likewise. (reorderingAllowed): Likewise. (resizingAllowed): Likewise. (resizingColumn): Likewise. (table): Likewise. (updateTableInRealTime): Likewise. (createDefaultColumnModel): Renamed from createDefaultTableColumnModel. (setDefaultRenderer): New method. * javax/swing/table/TableColumn.java (getPropertyChangeListeners): New method. * javax/swing/text/DefaultHighlighter.java (drawsLayeredHighlights): New field. (getDrawsLayeredHighlights): New method. (setDrawsLayeredHighlights): Likewise. * javax/swing/text/DocumentFilter.java (FilterBypass): New inner class. (insertString): New method. (remove): Likewise. (replace): Likewise. * javax/swing/text/JTextComponent.java (dragEnabled): New field. (getSelectedText): New method. (getDragEnabled): Likewise. (setDragEnabled): Likewise. (replaceSelection): Reimplemented. * javax/swing/text/NavigationFilter.java (FilterBypass): New inner class. (NavigationFilter): New method. (moveDot): Likewise. (setDot): Likewise. * javax/swing/text/SimpleAttributeSet.java (EMPTY): Made public final. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/SpinnerNumberModel.java (getMinimum): New method. (setMinimum): Likewise. (getMaximum): Likewise. (setMaximum): Likewise. (getStepSize): Likewise. (setStepSize): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JMenu.java (getMenuListeners): New method. (fireMenuSelected): Simplified. * javax/swing/JRootPane.java (NONE): New static field. (FRAME): Likewise. (PLAIN_DIALOG): Likewise. (INFORMATION_DIALOG): Likewise. (ERROR_DIALOG): Likewise. (COLOR_CHOOSER_DIALOG): Likewise. (FILE_CHOOSER_DIALOG): Likewise. (QUESTION_DIALOG): Likewise. (WARNING_DIALOG): Likewise. (defaultButton): New field. (getDefaultButton): New method. (setDefaultButton): Likewise. * javax/swing/JScrollPane.java (getUI): New method. (setUI): Likewise. * javax/swing/JTable.java (getUI): Javadoc added. (setUI): New method. * javax/swing/JViewport.java (getUI): New method. (setUI): Likewise. * javax/swing/UIDefaults.java (removePropertyChangeListener): Made public. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JApplet.java, javax/swing/JFrame.java: Re-indented. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java: Little re-formatting. (changeEvent): Made protected. (fireStateChanged): Removed argument. (setHorizontalAlignment): Abort method when old value is equal too new value. (setHorizontalTextPosition): Likewise. (setVerticalAlignment): Likewise. (setVerticalTextPosition): Likewise. (setBorderPainted): Likewise. (setIcon): Likewise. (setText): Likewise. (setIconTextGap): Likewise. (setMargin): Likewise. (setPressedIcon): Likewise. (setFocusPainted): Likewise. (setDisabledSelectedIcon): Likewise. (setRolloverIcon): Likewise. (setRolloverSelectedIcon): Likewise. (setSelectedIcon): Likewise. (setContentAreaFilled): Likewise. 2004-11-30 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicArrowButton.java: Jalopy. Reimplement. * javax/swing/plaf/basic/BasicScrollBarUI.java: Jalopy. (arrowIcon, upIcon, downIcon, leftIcon, rightIcon): Removed. (createIncreaseButton): Use BasicArrowButton. (createDecreaseButton): Ditto. * javax/swing/plaf/basic/BasicSplitPaneDivider.java: (createRightOneTouchButton): Remove button border. (createLeftOneTouchButton): Ditto. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JSpinner.java (setModel): New method. * javax/swing/SpringLayout.java (Constraints): May not be final. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkClipboard.java, java/awt/datatransfer/Clipboard.java, java/awt/datatransfer/ClipboardOwner.java: Reformated to make it use our coding standard. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/SpinnerNumberModel.java (SpinnerNumberModel): Implements java.io.Serializable. (serialVersionUID): New field. (SpinnerNumberModel): Added missing @throws tags to javadocs. * javax/swing/UIManager.java (get): New method. (getBoolean): Likewise. (getBorder): Likewise. (getColor): Likewise. (getDimension): Likewise. (getFont): Likewise. (getIcon): Likewise. (getInsets): Likewise. (getInt): Likewise. (getString): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JPasswordField.java: Reformated. Implemented construtors. * javax/swing/plaf/basic/BasicPasswordFieldUI.java (create): New method. * javax/swing/text/PlainView.java (selectedColor): Made package-private to allow access from sub-classes in same package too. (unselectedColor): Likewise. (font): Likewise. (drawSelectedText): Make protected. (drawUnselectedText): Likewise. * javax/swing/text/PasswordView.java: New file. * Makefile.am: Added javax/swing/text/PasswordView.java. * Makefile.in: Regenerated. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (setMenuBar): Set menu bar's width. * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (nativeSetHelpMenu): Add FIXME comment. (addHelpMenu): Elide call to nativeSetHelpMenu. * java/awt/Menu.java (isTearOff): Rename to tearOff. (menuSerializedDataVersion): Initialize to 1. (separatorLabel): Mark transient. (insert(MenuItem,int)): Implement. * java/awt/MenuBar.java (setHelpMenu): Call getPeer to retrieve peer. (countMenus): Count help menu. * java/awt/MenuComponent.java (nameExplicitlySet, newEventsOnly, accessibleContext): Add fields. * java/awt/MenuItem.java: Remove event mask FIXME. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (gtkWidgetModifyFont): Only set font if label is non-NULL. (setLabel): Don't treat "-" specially. 2004-11-30 Kim Ho <kho@redhat.com> * javax/swing/colorchooser/DefaultHSBChooserPanel.java: (stateChanged): Only update the image and the track if the values are not being adjusted. (updateChooser): Grab the new mouse point from the spinner values. Update the image and track only if the values are not being adjusted. (getHSBValues): New method. * javax/swing/colorchooser/DefaultRGBChooserPanel.java: (SliderHandler::stateChanged): Changed internalChange to updateChange. Set sliderChange. (SpinnerHandler::stateChanged): Ditto. Set spinnerChange. (spinnerChange): New variable. (sliderChange): Ditto. (updateChange): Renamed from internalChange. (updateChooser): Do not update sliders if the sliders were the original source of the change. Ditto for spinners. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (mousePress): Don't scroll the JViewport if there will be extra space at the end of the run. Change layout() to revalidate(). (calculateSize): Use the component's width/height unless it is smaller than the max tab width/height. (calculateTabRects): Subtract the tab run overlay. (rotateTabRuns): Don't rotate if there's only one run. (layoutContainer): Reuse the viewport point. (createLayoutManager): Set the viewport to use no layout. (paintTabArea): Don't paint the tabs that are not visible to the JViewport. (paintContentBorderTopEdge): Check for scroll tab layout before looking for gap. (paintContentBorderLeftEdge): Ditto. (paintContentBorderBottomEdge): Ditto. (paintContentBorderRightEdge): Ditto. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkButtonPeer.java (gtkWidgetSetFont): Rename ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkFramePeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (setMenuBarWidth): New method. (setBounds): Set the menu bar width. (postConfigureEvent): Set the menu bar width if the window's width has changed. * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (GtkMenuBarPeer): Don't call create. (setFont): New method. * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java (create): New method. (setFont): Likewise. (GtkMenuComponentPeer): Call create and setFont. * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (connectSignals): Make package private. (gtkWidgetModifyFont): New method. (create): Likewise. (GtkMenuItemPeer): Don't call create. (setFont): New method. * java/awt/CheckboxMenuItem.java (addNotify): Fix peer == null condition. * java/awt/Container.java (validateTree): Fix comment typos. * java/awt/MenuComponent.java (getFont): Return parent's font if our font is null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c (create): Remove call to deprecated gtk_check_menu_item_set_show_toggle function. 2004-11-30 Hans Boehm <Hans.Boehm@hp.com> * java/lang/natObject.cc (LOCK_LOG, LOG): Add debug tracing. (Almost everywhere): add LOG calls, fix, add comments. (_Jv_MonitorEnter): Replace masking of LOCKED bit with assertion. Add explicit check for LOCKED bit in slow case (PR 16662). (_Jv_MonitorExit): Add casts in debug-only code. Always release LOCKED bit before throwing exception. (_Jv_ObjectCheckMonitor): Lock may be held if lightweight lock isn't. Handle easy cases without lock acquisition. (Object::wait): Use NotifyAll for lock inflation. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (gtkFixedMove): Remove method. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Area.java: Implemented. 2004-11-30 Mark Wielaard <mark@klomp.org> * java/awt/geom/Arc2D.java (ArcIterator): Make package private. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Arc2D.java Reformatted. (setArc): Correct documentation to say 'upper left corner'. (setArcByTangent,contains,intersects): Implemented. (containsAngle): Corrected to handle negative extents. (ArcIterator): Set to private. (ArcIterator): Corrected for CHORD-type arcs, negative extents. * java/awt/geom/Ellipse2D.java Documented. (contains,intersects): Implemented. * java/awt/geom/Line2D.java (linesIntersect): Correct handling of special cases. 2004-11-30 Mark Wielaard <mark@klomp.org> * gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Use Color.BLACK if c == null, don't create new Color object each time. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (comp): New private field. (setColor): Use Color.BLACK when argument null. (setComposite): Set this.comp field. (getComposite): Return this.comp, or AlphaComposite.SrcOver when null. (DrawState.comp): New private field. (DrawState.save): Save Composite. (DrawState.restore): Restore comp field. * java/awt/FontMetrics.java (gRC): New static final private field. (getLineMetrics(String, Graphics)): New method. (getLineMetrics(String, int, int, Graphics)): Likewise. (getLineMetrics(char[], int, int, Graphics)): Likewise. (getLineMetrics(CharacterIterator, int, int, Graphics)): Likewise. * javax/swing/JMenu.java (JMenu(String, boolean)): Ignore tearoff argument. PR SWING/17294. * javax/swing/plaf/basic/BasicGraphicsUtils.java (): Always use the fall-back code since none of the TextArea methods are really implemented now. PR SWING/17296. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (GdkGlyphVector_setChars): Replace assert() with if block when pango_itemize() returns null. PR AWT/17295. (GdkGlyphVector_allInkExtents): Likewise when vec->glyphitems is null. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (gtk_c_source_files): Add gnu_java_awt_peer_gtk_GtkFramePeer.c. * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GdkGraphics.java (getClipBounds): Remove comment. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (create): Pack GtkButton in GtkEventBox. (connectJObject): Remove. (focus_in_cb): New function. (focus_out_cb): Likewise. (connectSignals): Connect focus-in-event and focus-out-event signals. (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. (gtkWidgetRequestFocus): New method. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (isInRepaint): New field. (gtkSetFont): Remove method. (addExposeFilter): Likewise. (removeExposeFilter): Likewise. (gtkWidgetQueueDrawArea): Rename to ... (gtkWidgetRepaintArea): New method. (beginNativeRepaint): New method. (endNativeRepaint): New method. (setComponentBounds): Move implementation here from GtkComponentPeer. (paint): Remove implementation. (repaint): Wrap call to gtkWidgetRepaintArea with calls to beginNativeRepaint and endNativeRepaint. (setBounds): Use menu bar height in bounds calculation. (postExposeEvent): Only post paint event if we're not doing a native repaint. (gtkWidgetSetParent): Replace gtk_layout_put with gtk_fixed_put. (setNativeBounds): Replace gtk_layout_move with gtk_fixed_move. (find_gtk_layout): Remove function. (filter_expose_event_handler): Likewise. * gnu/java/awt/peer/gtk/GtkDialogPeer.java (postExposeEvent): Likewise. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java (setComponentBounds): Call GtkComponentPeer's setComponentBounds. * gnu/java/awt/peer/gtk/GtkFramePeer.java (getMenuBarHeight): New method. (moveLayout): Rename to ... (gtkFixedMove): New method. (gtkLayoutSetVisible): Rename to ... (gtkFixedSetVisible): New method. (setMenuBar): Rearrange, to make the three separate cases clearer. (postExposeEvent): Only post paint event if we're not doing a native repaint. * gnu/java/awt/peer/gtk/GtkGenericPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkImagePainter.java (GtkImagePainter(GtkImage,GdkGraphics,int,int,int,int,Color)): Call run directly, rather than spawning a new thread. (GtkImagePainter(GtkImage,GdkGraphics,int,int,int,int,int,int,int,int,Color)): Likewise. * gnu/java/awt/peer/gtk/GtkLabelPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. (create): Rename ebox to eventbox. * gnu/java/awt/peer/gtk/GtkListPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java (GtkMenuComponentPeer): Set the default font. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise. * java/awt/Component.java (locale): Initialize to default locale. * java/awt/Container.java (invalidateTree): Make package-private. (paint): Paint self first. (setMenuBar): Call invalidateTree. * java/awt/Panel.java (dispatchEventImpl): Remove method. * java/awt/Window.java (show): Call no-parameter variant of requestFocusInWindow. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (initState): Remove special case for window widget. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (grab_current_drawable): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c (create): Replace GtkLayout with GtkFixed. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Remove special cases for GDK_EXPOSE events. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c: New file. Move all GtkFramePeer native method implementations here from gnu_java_awt_peer_gtk_GtkWindowPeer.c. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (create): Replace GtkLayout with GtkFixed. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (find_layout): Remove function. (create): Replace GtkLayout with GtkFixed. (connectSignals): Remove find_layout call. (toBack): Replace XFlush with gdk_flush. (toFront): Replace XFlush with gdk_flush. Move GtkFramePeer native method implementations to gnu_java_awt_peer_gtk_GtkFramePeer.c. * jni/gtk-peer/gtkpeer.h: Remove declaration of find_gtk_layout. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java (lineWrap): Renamed from "wrapping". (wrapStyleWord): NEw field. (getLineWrap): Re-edited javadoc comment. (setLineWrap): Likewise. (getWrapStyleWord): New method. (setWrapStyleWord): Likewise. From-SVN: r91544
1913 lines
58 KiB
Java
1913 lines
58 KiB
Java
/* AbstractButton.java -- Provides basic button functionality.
|
|
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
package javax.swing;
|
|
|
|
import java.awt.Graphics;
|
|
import java.awt.Image;
|
|
import java.awt.Insets;
|
|
import java.awt.ItemSelectable;
|
|
import java.awt.Point;
|
|
import java.awt.Rectangle;
|
|
import java.awt.event.ActionEvent;
|
|
import java.awt.event.ActionListener;
|
|
import java.awt.event.ItemEvent;
|
|
import java.awt.event.ItemListener;
|
|
import java.beans.PropertyChangeEvent;
|
|
import java.beans.PropertyChangeListener;
|
|
|
|
import javax.accessibility.AccessibleAction;
|
|
import javax.accessibility.AccessibleIcon;
|
|
import javax.accessibility.AccessibleRelationSet;
|
|
import javax.accessibility.AccessibleStateSet;
|
|
import javax.accessibility.AccessibleText;
|
|
import javax.accessibility.AccessibleValue;
|
|
import javax.swing.event.ChangeEvent;
|
|
import javax.swing.event.ChangeListener;
|
|
import javax.swing.plaf.ButtonUI;
|
|
import javax.swing.text.AttributeSet;
|
|
|
|
|
|
/**
|
|
* <p>The purpose of this class is to serve as a facade over a number of
|
|
* classes which collectively represent the semantics of a button: the
|
|
* button's model, its listeners, its action, and its look and feel. Some
|
|
* parts of a button's state are stored explicitly in this class, other
|
|
* parts are delegates to the model. Some methods related to buttons are
|
|
* implemented in this class, other methods pass through to the current
|
|
* model or look and feel.</p>
|
|
*
|
|
* <p>Furthermore this class is supposed to serve as a base class for
|
|
* several kinds of buttons with similar but non-identical semantics:
|
|
* toggle buttons (radio buttons and checkboxes), simple "push" buttons,
|
|
* menu items.</p>
|
|
*
|
|
* <p>Buttons have many properties, some of which are stored in this class
|
|
* while others are delegated to the button's model. The following properties
|
|
* are available:</p>
|
|
*
|
|
* <table>
|
|
* <tr><th>Property </th><th>Stored in</th><th>Bound?</th></tr>
|
|
*
|
|
* <tr><td>action </td><td>button</td> <td>no</td></tr>
|
|
* <tr><td>actionCommand </td><td>model</td> <td>no</td></tr>
|
|
* <tr><td>borderPainted </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>contentAreaFilled </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>disabledIcon </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>disabledSelectedIcon </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>displayedMnemonicIndex </td><td>button</td> <td>no</td></tr>
|
|
* <tr><td>enabled </td><td>model</td> <td>no</td></tr>
|
|
* <tr><td>focusPainted </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>horizontalAlignment </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>horizontalTextPosition </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>icon </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>iconTextGap </td><td>button</td> <td>no</td></tr>
|
|
* <tr><td>label (same as text) </td><td>model</td> <td>yes</td></tr>
|
|
* <tr><td>margin </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>multiClickThreshold </td><td>button</td> <td>no</td></tr>
|
|
* <tr><td>pressedIcon </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>rolloverEnabled </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>rolloverIcon </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>rolloverSelectedIcon </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>selected </td><td>model</td> <td>no</td></tr>
|
|
* <tr><td>selectedIcon </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>selectedObjects </td><td>button</td> <td>no</td></tr>
|
|
* <tr><td>text </td><td>model</td> <td>yes</td></tr>
|
|
* <tr><td>UI </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>verticalAlignment </td><td>button</td> <td>yes</td></tr>
|
|
* <tr><td>verticalTextPosition </td><td>button</td> <td>yes</td></tr>
|
|
*
|
|
* </table>
|
|
*
|
|
* <p>The various behavioral aspects of these properties follows:</p>
|
|
*
|
|
* <ul>
|
|
*
|
|
* <li>When non-bound properties stored in the button change, the button
|
|
* fires ChangeEvents to its ChangeListeners.</li>
|
|
*
|
|
* <li>When bound properties stored in the button change, the button fires
|
|
* PropertyChangeEvents to its PropertyChangeListeners</li>
|
|
*
|
|
* <li>If any of the model's properties change, it fires a ChangeEvent to
|
|
* its ChangeListeners, which include the button.</li>
|
|
*
|
|
* <li>If the button receives a ChangeEvent from its model, it will
|
|
* propagate the ChangeEvent to its ChangeListeners, with the ChangeEvent's
|
|
* "source" property set to refer to the button, rather than the model. The
|
|
* the button will request a repaint, to paint its updated state.</li>
|
|
*
|
|
* <li>If the model's "selected" property changes, the model will fire an
|
|
* ItemEvent to its ItemListeners, which include the button, in addition to
|
|
* the ChangeEvent which models the property change. The button propagates
|
|
* ItemEvents directly to its ItemListeners.</li>
|
|
*
|
|
* <li>If the model's armed and pressed properties are simultaneously
|
|
* <code>true</code>, the model will fire an ActionEvent to its
|
|
* ActionListeners, which include the button. The button will propagate
|
|
* this ActionEvent to its ActionListeners, with the ActionEvent's "source"
|
|
* property set to refer to the button, rather than the model.</li>
|
|
*
|
|
* </ul>
|
|
*
|
|
* @author Ronald Veldema (rveldema@cs.vu.nl)
|
|
* @author Graydon Hoare (graydon@redhat.com)
|
|
*/
|
|
|
|
public abstract class AbstractButton extends JComponent
|
|
implements ItemSelectable, SwingConstants
|
|
{
|
|
private static final long serialVersionUID = -937921345538462020L;
|
|
|
|
/** The icon displayed by default. */
|
|
Icon default_icon;
|
|
|
|
/** The icon displayed when the button is pressed. */
|
|
Icon pressed_icon;
|
|
|
|
/** The icon displayed when the button is disabled. */
|
|
Icon disabeldIcon;
|
|
|
|
/** The icon displayed when the button is selected. */
|
|
Icon selectedIcon;
|
|
|
|
/** The icon displayed when the button is selected but disabled. */
|
|
Icon disabledSelectedIcon;
|
|
|
|
/** The icon displayed when the button is rolled over. */
|
|
Icon rolloverIcon;
|
|
|
|
/** The icon displayed when the button is selected and rolled over. */
|
|
Icon rolloverSelectedIcon;
|
|
|
|
/** The icon currently displayed. */
|
|
Icon current_icon;
|
|
|
|
/** The text displayed in the button. */
|
|
String text;
|
|
|
|
/** The gap between icon and text, if both icon and text are non-<code>null</code>. */
|
|
int iconTextGap;
|
|
|
|
/** The vertical alignment of the button's text and icon. */
|
|
int verticalAlignment;
|
|
|
|
/** The horizontal alignment of the button's text and icon. */
|
|
int horizontalAlignment;
|
|
|
|
/** The horizontal position of the button's text relative to its icon. */
|
|
int horizontalTextPosition;
|
|
|
|
/** The vertical position of the button's text relative to its icon. */
|
|
int verticalTextPosition;
|
|
|
|
/** Whether or not the button paints its border. */
|
|
boolean borderPainted;
|
|
|
|
/** Whether or not the button paints its focus state. */
|
|
boolean focusPainted;
|
|
|
|
/** Whether or not the button fills its content area. */
|
|
boolean contentAreaFilled;
|
|
|
|
/** Whether rollover is enabled. */
|
|
boolean rollOverEnabled;
|
|
|
|
/** The action taken when the button is clicked. */
|
|
Action action;
|
|
|
|
/** The button's current state. */
|
|
protected ButtonModel model;
|
|
|
|
/** The margin between the button's border and its label. */
|
|
Insets margin;
|
|
|
|
/** A hint to the look and feel class, suggesting which character in the
|
|
* button's label should be underlined when drawing the label. */
|
|
int mnemonicIndex;
|
|
|
|
/** Listener the button uses to receive ActionEvents from its model. */
|
|
protected ActionListener actionListener;
|
|
|
|
/** Listener the button uses to receive ItemEvents from its model. */
|
|
protected ItemListener itemListener;
|
|
|
|
/** Listener the button uses to receive ChangeEvents from its model. */
|
|
protected ChangeListener changeListener;
|
|
|
|
/** The time in miliseconds in which clicks get coalesced into a single
|
|
* <code>ActionEvent</code>. */
|
|
long multiClickThreshhold;
|
|
|
|
/** Listener the button uses to receive PropertyChangeEvents from its
|
|
Action. */
|
|
PropertyChangeListener actionPropertyChangeListener;
|
|
|
|
/** ChangeEvent that is fired to button's ChangeEventListeners */
|
|
protected ChangeEvent changeEvent = new ChangeEvent(this);
|
|
|
|
/** Fired in a PropertyChangeEvent when the "borderPainted" property changes. */
|
|
public static final String BORDER_PAINTED_CHANGED_PROPERTY = "borderPainted";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "contentAreaFilled" property changes. */
|
|
public static final String CONTENT_AREA_FILLED_CHANGED_PROPERTY = "contentAreaFilled";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "disabledIcon" property changes. */
|
|
public static final String DISABLED_ICON_CHANGED_PROPERTY = "disabledIcon";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "disabledSelectedIcon" property changes. */
|
|
public static final String DISABLED_SELECTED_ICON_CHANGED_PROPERTY = "disabledSelectedIcon";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "focusPainted" property changes. */
|
|
public static final String FOCUS_PAINTED_CHANGED_PROPERTY = "focusPainted";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "horizontalAlignment" property changes. */
|
|
public static final String HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY = "horizontalAlignment";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "horizontalTextPosition" property changes. */
|
|
public static final String HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY = "horizontalTextPosition";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "icon" property changes. */
|
|
public static final String ICON_CHANGED_PROPERTY = "icon";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "margin" property changes. */
|
|
public static final String MARGIN_CHANGED_PROPERTY = "margin";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "mnemonic" property changes. */
|
|
public static final String MNEMONIC_CHANGED_PROPERTY = "mnemonic";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "model" property changes. */
|
|
public static final String MODEL_CHANGED_PROPERTY = "model";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "pressedIcon" property changes. */
|
|
public static final String PRESSED_ICON_CHANGED_PROPERTY = "pressedIcon";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "rolloverEnabled" property changes. */
|
|
public static final String ROLLOVER_ENABLED_CHANGED_PROPERTY = "rolloverEnabled";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "rolloverIcon" property changes. */
|
|
public static final String ROLLOVER_ICON_CHANGED_PROPERTY = "rolloverIcon";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "rolloverSelectedIcon" property changes. */
|
|
public static final String ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY = "rolloverSelectedIcon";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "selectedIcon" property changes. */
|
|
public static final String SELECTED_ICON_CHANGED_PROPERTY = "selectedIcon";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "text" property changes. */
|
|
public static final String TEXT_CHANGED_PROPERTY = "text";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "verticalAlignment" property changes. */
|
|
public static final String VERTICAL_ALIGNMENT_CHANGED_PROPERTY = "verticalAlignment";
|
|
|
|
/** Fired in a PropertyChangeEvent when the "verticalTextPosition" property changes. */
|
|
public static final String VERTICAL_TEXT_POSITION_CHANGED_PROPERTY = "verticalTextPosition";
|
|
|
|
/**
|
|
* A Java Accessibility extension of the AbstractButton.
|
|
*/
|
|
protected abstract class AccessibleAbstractButton
|
|
extends AccessibleJComponent implements AccessibleAction, AccessibleValue,
|
|
AccessibleText
|
|
{
|
|
private static final long serialVersionUID = -5673062525319836790L;
|
|
|
|
protected AccessibleAbstractButton()
|
|
{
|
|
}
|
|
|
|
public AccessibleStateSet getAccessibleStateSet()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public String getAccessibleName()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public AccessibleIcon[] getAccessibleIcon()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public AccessibleRelationSet getAccessibleRelationSet()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public AccessibleAction getAccessibleAction()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public AccessibleValue getAccessibleValue()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public int getAccessibleActionCount()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
public String getAccessibleActionDescription(int value0)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public boolean doAccessibleAction(int value0)
|
|
{
|
|
return false; // TODO
|
|
}
|
|
|
|
public Number getCurrentAccessibleValue()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public boolean setCurrentAccessibleValue(Number value0)
|
|
{
|
|
return false; // TODO
|
|
}
|
|
|
|
public Number getMinimumAccessibleValue()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public Number getMaximumAccessibleValue()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public AccessibleText getAccessibleText()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public int getIndexAtPoint(Point value0)
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
public Rectangle getCharacterBounds(int value0)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public int getCharCount()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
public int getCaretPosition()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
public String getAtIndex(int value0, int value1)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public String getAfterIndex(int value0, int value1)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public String getBeforeIndex(int value0, int value1)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public AttributeSet getCharacterAttribute(int value0)
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
public int getSelectionStart()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
public int getSelectionEnd()
|
|
{
|
|
return 0; // TODO
|
|
}
|
|
|
|
public String getSelectedText()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
|
|
private Rectangle getTextRectangle()
|
|
{
|
|
return null; // TODO
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates a new AbstractButton object.
|
|
*/
|
|
public AbstractButton()
|
|
{
|
|
this("",null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new AbstractButton object.
|
|
*
|
|
* @param txt Value to use for the button's "text" property
|
|
* @param icon Value to use for the button's "defaultIcon" property
|
|
*/
|
|
AbstractButton(String txt, Icon icon)
|
|
{
|
|
init (txt, icon);
|
|
updateUI();
|
|
}
|
|
|
|
/**
|
|
* Get the model the button is currently using.
|
|
*
|
|
* @return The current model
|
|
*/
|
|
public ButtonModel getModel()
|
|
{
|
|
return model;
|
|
}
|
|
|
|
/**
|
|
* Set the model the button is currently using. This un-registers all
|
|
* listeners associated with the current model, and re-registers them
|
|
* with the new model.
|
|
*
|
|
* @param newModel The new model
|
|
*/
|
|
public void setModel(ButtonModel newModel)
|
|
{
|
|
if (newModel == model)
|
|
return;
|
|
|
|
if (model != null)
|
|
{
|
|
model.removeActionListener(actionListener);
|
|
model.removeChangeListener(changeListener);
|
|
model.removeItemListener(itemListener);
|
|
}
|
|
ButtonModel old = model;
|
|
model = newModel;
|
|
if (model != null)
|
|
{
|
|
model.addActionListener(actionListener);
|
|
model.addChangeListener(changeListener);
|
|
model.addItemListener(itemListener);
|
|
}
|
|
firePropertyChange(MODEL_CHANGED_PROPERTY, old, model);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
protected void init(String text, Icon icon)
|
|
{
|
|
this.text = text;
|
|
default_icon = icon;
|
|
model = new DefaultButtonModel();
|
|
actionListener = createActionListener();
|
|
changeListener = createChangeListener();
|
|
itemListener = createItemListener();
|
|
|
|
model.addActionListener(actionListener);
|
|
model.addChangeListener(changeListener);
|
|
model.addItemListener(itemListener);
|
|
|
|
horizontalAlignment = CENTER;
|
|
horizontalTextPosition = TRAILING;
|
|
verticalAlignment = CENTER;
|
|
verticalTextPosition = CENTER;
|
|
borderPainted = true;
|
|
contentAreaFilled = true;
|
|
|
|
focusPainted = true;
|
|
setFocusable(true);
|
|
|
|
setAlignmentX(LEFT_ALIGNMENT);
|
|
setAlignmentY(CENTER_ALIGNMENT);
|
|
|
|
setDisplayedMnemonicIndex(-1);
|
|
}
|
|
|
|
/**
|
|
* Get the action command string for this button's model.
|
|
*
|
|
* @return The current action command string from the button's model
|
|
*/
|
|
public String getActionCommand()
|
|
{
|
|
return getModel().getActionCommand();
|
|
}
|
|
|
|
/**
|
|
* Set the action command string for this button's model.
|
|
*
|
|
* @param aCommand The new action command string to set in the button's
|
|
* model.
|
|
*/
|
|
public void setActionCommand(String aCommand)
|
|
{
|
|
getModel().setActionCommand(aCommand);
|
|
}
|
|
|
|
/**
|
|
* Adds an ActionListener to the button's listener list. When the
|
|
* button's model is clicked it fires an ActionEvent, and these
|
|
* listeners will be called.
|
|
*
|
|
* @param l The new listener to add
|
|
*/
|
|
public void addActionListener(ActionListener l)
|
|
{
|
|
listenerList.add(ActionListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Removes an ActionListener from the button's listener list.
|
|
*
|
|
* @param l The listener to remove
|
|
*/
|
|
public void removeActionListener(ActionListener l)
|
|
{
|
|
listenerList.remove(ActionListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Returns all added <code>ActionListener</code> objects.
|
|
*
|
|
* @return an array of listeners
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public ActionListener[] getActionListeners()
|
|
{
|
|
return (ActionListener[]) listenerList.getListeners(ActionListener.class);
|
|
}
|
|
|
|
/**
|
|
* Adds an ItemListener to the button's listener list. When the button's
|
|
* model changes state (between any of ARMED, ENABLED, PRESSED, ROLLOVER
|
|
* or SELECTED) it fires an ItemEvent, and these listeners will be
|
|
* called.
|
|
*
|
|
* @param l The new listener to add
|
|
*/
|
|
public void addItemListener(ItemListener l)
|
|
{
|
|
listenerList.add(ItemListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Removes an ItemListener from the button's listener list.
|
|
*
|
|
* @param l The listener to remove
|
|
*/
|
|
public void removeItemListener(ItemListener l)
|
|
{
|
|
listenerList.remove(ItemListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Returns all added <code>ItemListener</code> objects.
|
|
*
|
|
* @return an array of listeners
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public ItemListener[] getItemListeners()
|
|
{
|
|
return (ItemListener[]) listenerList.getListeners(ItemListener.class);
|
|
}
|
|
|
|
/**
|
|
* Adds a ChangeListener to the button's listener list. When the button's
|
|
* model changes any of its (non-bound) properties, these listeners will be
|
|
* called.
|
|
*
|
|
* @param l The new listener to add
|
|
*/
|
|
public void addChangeListener(ChangeListener l)
|
|
{
|
|
listenerList.add(ChangeListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Removes a ChangeListener from the button's listener list.
|
|
*
|
|
* @param l The listener to remove
|
|
*/
|
|
public void removeChangeListener(ChangeListener l)
|
|
{
|
|
listenerList.remove(ChangeListener.class, l);
|
|
}
|
|
|
|
/**
|
|
* Returns all added <code>ChangeListener</code> objects.
|
|
*
|
|
* @return an array of listeners
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public ChangeListener[] getChangeListeners()
|
|
{
|
|
return (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
|
|
}
|
|
|
|
/**
|
|
* Calls {@link ItemListener.itemStateChanged} on each ItemListener in
|
|
* the button's listener list.
|
|
*
|
|
* @param e The event signifying that the button's model changed state
|
|
*/
|
|
public void fireItemStateChanged(ItemEvent e)
|
|
{
|
|
e.setSource(this);
|
|
ItemListener[] listeners = getItemListeners();
|
|
|
|
for (int i = 0; i < listeners.length; i++)
|
|
listeners[i].itemStateChanged(e);
|
|
}
|
|
|
|
/**
|
|
* Calls {@link ActionListener.actionPerformed} on each {@link
|
|
* ActionListener} in the button's listener list.
|
|
*
|
|
* @param e The event signifying that the button's model was clicked
|
|
*/
|
|
public void fireActionPerformed(ActionEvent e)
|
|
{
|
|
e.setSource(this);
|
|
ActionListener[] listeners = getActionListeners();
|
|
|
|
for (int i = 0; i < listeners.length; i++)
|
|
listeners[i].actionPerformed(e);
|
|
}
|
|
|
|
/**
|
|
* Calls {@link ChangeEvent.stateChanged} on each {@link ChangeListener}
|
|
* in the button's listener list.
|
|
*/
|
|
public void fireStateChanged()
|
|
{
|
|
ChangeListener[] listeners = getChangeListeners();
|
|
|
|
for (int i = 0; i < listeners.length; i++)
|
|
listeners[i].stateChanged(changeEvent);
|
|
}
|
|
|
|
/**
|
|
* Get the current keyboard mnemonic value. This value corresponds to a
|
|
* single key code (one of the {@link java.awt.event.KeyEvent} VK_*
|
|
* codes) and is used to activate the button when pressed in conjunction
|
|
* with the "mouseless modifier" of the button's look and feel class, and
|
|
* when focus is in one of the button's ancestors.
|
|
*
|
|
* @return The button's current keyboard mnemonic
|
|
*/
|
|
public int getMnemonic()
|
|
{
|
|
return getModel().getMnemonic();
|
|
}
|
|
|
|
/**
|
|
* Set the current keyboard mnemonic value. This value corresponds to a
|
|
* single key code (one of the {@link java.awt.event.KeyEvent} VK_*
|
|
* codes) and is used to activate the button when pressed in conjunction
|
|
* with the "mouseless modifier" of the button's look and feel class, and
|
|
* when focus is in one of the button's ancestors.
|
|
*
|
|
* @param mne A new mnemonic to use for the button
|
|
*/
|
|
public void setMnemonic(char mne)
|
|
{
|
|
setMnemonic((int) mne);
|
|
}
|
|
|
|
/**
|
|
* Set the current keyboard mnemonic value. This value corresponds to a
|
|
* single key code (one of the {@link java.awt.event.KeyEvent} VK_*
|
|
* codes) and is used to activate the button when pressed in conjunction
|
|
* with the "mouseless modifier" of the button's look and feel class, and
|
|
* when focus is in one of the button's ancestors.
|
|
*
|
|
* @param mne A new mnemonic to use for the button
|
|
*/
|
|
public void setMnemonic(int mne)
|
|
{
|
|
int old = getModel().getMnemonic();
|
|
|
|
if (old != mne)
|
|
{
|
|
getModel().setMnemonic(mne);
|
|
|
|
if (text != null && ! text.equals(""))
|
|
{
|
|
// Since lower case char = upper case char for
|
|
// mnemonic, we will convert both text and mnemonic
|
|
// to upper case before checking if mnemonic character occurs
|
|
// in the menu item text.
|
|
int upperCaseMne = Character.toUpperCase((char) mne);
|
|
String upperCaseText = text.toUpperCase();
|
|
setDisplayedMnemonicIndex(upperCaseText.indexOf(upperCaseMne));
|
|
}
|
|
|
|
firePropertyChange(MNEMONIC_CHANGED_PROPERTY, old, mne);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Sets the button's mnemonic index. The mnemonic index is a hint to the
|
|
* look and feel class, suggesting which character in the button's label
|
|
* should be underlined when drawing the label. If the mnemonic index is
|
|
* -1, no mnemonic will be displayed.
|
|
*
|
|
* If no mnemonic index is set, the button will choose a mnemonic index
|
|
* by default, which will be the first occurrence of the mnemonic
|
|
* character in the button's text.
|
|
*
|
|
* @param index An offset into the "text" property of the button
|
|
* @throws IllegalArgumentException If <code>index</code> is not within the
|
|
* range of legal offsets for the "text" property of the button.
|
|
* @since 1.4
|
|
*/
|
|
|
|
public void setDisplayedMnemonicIndex(int index)
|
|
{
|
|
if (index < -1 || (text != null && index >= text.length()))
|
|
throw new IllegalArgumentException();
|
|
|
|
mnemonicIndex = index;
|
|
}
|
|
|
|
/**
|
|
* Get the button's mnemonic index, which is an offset into the button's
|
|
* "text" property. The character specified by this offset should be
|
|
* underlined when the look and feel class draws this button.
|
|
*
|
|
* @return An index into the button's "text" property
|
|
*/
|
|
public int getDisplayedMnemonicIndex()
|
|
{
|
|
return mnemonicIndex;
|
|
}
|
|
|
|
|
|
/**
|
|
* Set the "rolloverEnabled" property. When rollover is enabled, and the
|
|
* look and feel supports it, the button will change its icon to
|
|
* rolloverIcon, when the mouse passes over it.
|
|
*
|
|
* @param r Whether or not to enable rollover icon changes
|
|
*/
|
|
public void setRolloverEnabled(boolean r)
|
|
{
|
|
if (rollOverEnabled != r)
|
|
{
|
|
rollOverEnabled = r;
|
|
firePropertyChange(ROLLOVER_ENABLED_CHANGED_PROPERTY, !r, r);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns whether or not rollover icon changes are enabled on the
|
|
* button.
|
|
*
|
|
* @return The state of the "rolloverEnabled" property
|
|
*/
|
|
public boolean isRolloverEnabled()
|
|
{
|
|
return rollOverEnabled;
|
|
}
|
|
|
|
/**
|
|
* Set the value of the button's "selected" property. Selection is only
|
|
* meaningful for toggle-type buttons (check boxes, radio buttons).
|
|
*
|
|
* @param s New value for the property
|
|
*/
|
|
public void setSelected(boolean s)
|
|
{
|
|
getModel().setSelected(s);
|
|
}
|
|
|
|
/**
|
|
* Get the value of the button's "selected" property. Selection is only
|
|
* meaningful for toggle-type buttons (check boxes, radio buttons).
|
|
*
|
|
* @return The value of the property
|
|
*/
|
|
public boolean isSelected()
|
|
{
|
|
return getModel().isSelected();
|
|
}
|
|
|
|
/**
|
|
* Enables or disables the button. A button will neither be selectable
|
|
* nor preform any actions unless it is enabled.
|
|
*
|
|
* @param b Whether or not to enable the button
|
|
*/
|
|
public void setEnabled(boolean b)
|
|
{
|
|
super.setEnabled(b);
|
|
getModel().setEnabled(b);
|
|
}
|
|
|
|
/**
|
|
* Set the horizontal alignment of the button's text and icon. The
|
|
* alignment is a numeric constant from {@link SwingConstants}. It must
|
|
* be one of: <code>RIGHT</code>, <code>LEFT</code>, <code>CENTER</code>,
|
|
* <code>LEADING</code> or <code>TRAILING</code>. The default is
|
|
* <code>RIGHT</code>.
|
|
*
|
|
* @return The current horizontal alignment
|
|
*/
|
|
public int getHorizontalAlignment()
|
|
{
|
|
return horizontalAlignment;
|
|
}
|
|
|
|
/**
|
|
* Set the horizontal alignment of the button's text and icon. The
|
|
* alignment is a numeric constant from {@link SwingConstants}. It must
|
|
* be one of: <code>RIGHT</code>, <code>LEFT</code>, <code>CENTER</code>,
|
|
* <code>LEADING</code> or <code>TRAILING</code>. The default is
|
|
* <code>RIGHT</code>.
|
|
*
|
|
* @param a The new horizontal alignment
|
|
* @throws IllegalArgumentException If alignment is not one of the legal
|
|
* constants.
|
|
*/
|
|
public void setHorizontalAlignment(int a)
|
|
{
|
|
if (horizontalAlignment == a)
|
|
return;
|
|
|
|
int old = horizontalAlignment;
|
|
horizontalAlignment = a;
|
|
firePropertyChange(HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY, old, a);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Get the horizontal position of the button's text relative to its
|
|
* icon. The position is a numeric constant from {@link
|
|
* SwingConstants}. It must be one of: <code>RIGHT</code>,
|
|
* <code>LEFT</code>, <code>CENTER</code>, <code>LEADING</code> or
|
|
* <code>TRAILING</code>. The default is <code>TRAILING</code>.
|
|
*
|
|
* @return The current horizontal text position
|
|
*/
|
|
public int getHorizontalTextPosition()
|
|
{
|
|
return horizontalTextPosition;
|
|
}
|
|
|
|
/**
|
|
* Set the horizontal position of the button's text relative to its
|
|
* icon. The position is a numeric constant from {@link
|
|
* SwingConstants}. It must be one of: <code>RIGHT</code>,
|
|
* <code>LEFT</code>, <code>CENTER</code>, <code>LEADING</code> or
|
|
* <code>TRAILING</code>. The default is <code>TRAILING</code>.
|
|
*
|
|
* @param t The new horizontal text position
|
|
* @throws IllegalArgumentException If position is not one of the legal
|
|
* constants.
|
|
*/
|
|
public void setHorizontalTextPosition(int t)
|
|
{
|
|
if (horizontalTextPosition == t)
|
|
return;
|
|
|
|
int old = horizontalTextPosition;
|
|
horizontalTextPosition = t;
|
|
firePropertyChange(HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY, old, t);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Get the vertical alignment of the button's text and icon. The
|
|
* alignment is a numeric constant from {@link SwingConstants}. It must
|
|
* be one of: <code>CENTER</code>, <code>TOP</code>, or
|
|
* <code>BOTTOM</code>. The default is <code>CENTER</code>.
|
|
*
|
|
* @return The current vertical alignment
|
|
*/
|
|
public int getVerticalAlignment()
|
|
{
|
|
return verticalAlignment;
|
|
}
|
|
|
|
/**
|
|
* Set the vertical alignment of the button's text and icon. The
|
|
* alignment is a numeric constant from {@link SwingConstants}. It must
|
|
* be one of: <code>CENTER</code>, <code>TOP</code>, or
|
|
* <code>BOTTOM</code>. The default is <code>CENTER</code>.
|
|
*
|
|
* @param a The new vertical alignment
|
|
* @throws IllegalArgumentException If alignment is not one of the legal
|
|
* constants.
|
|
*/
|
|
public void setVerticalAlignment(int a)
|
|
{
|
|
if (verticalAlignment == a)
|
|
return;
|
|
|
|
int old = verticalAlignment;
|
|
verticalAlignment = a;
|
|
firePropertyChange(VERTICAL_ALIGNMENT_CHANGED_PROPERTY, old, a);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Get the vertical position of the button's text relative to its
|
|
* icon. The alignment is a numeric constant from {@link
|
|
* SwingConstants}. It must be one of: <code>CENTER</code>,
|
|
* <code>TOP</code>, or <code>BOTTOM</code>. The default is
|
|
* <code>CENTER</code>.
|
|
*
|
|
* @return The current vertical position
|
|
*/
|
|
public int getVerticalTextPosition()
|
|
{
|
|
return verticalTextPosition;
|
|
}
|
|
|
|
/**
|
|
* Set the vertical position of the button's text relative to its
|
|
* icon. The alignment is a numeric constant from {@link
|
|
* SwingConstants}. It must be one of: <code>CENTER</code>,
|
|
* <code>TOP</code>, or <code>BOTTOM</code>. The default is
|
|
* <code>CENTER</code>.
|
|
*
|
|
* @param t The new vertical position
|
|
* @throws IllegalArgumentException If position is not one of the legal
|
|
* constants.
|
|
*/
|
|
public void setVerticalTextPosition(int t)
|
|
{
|
|
if (verticalTextPosition == t)
|
|
return;
|
|
|
|
int old = verticalTextPosition;
|
|
verticalTextPosition = t;
|
|
firePropertyChange(VERTICAL_TEXT_POSITION_CHANGED_PROPERTY, old, t);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Set the value of the "borderPainted" property. If set to
|
|
* <code>false</code>, the button's look and feel class should not paint
|
|
* a border for the button. The default is <code>true</code>.
|
|
*
|
|
* @return The current value of the property.
|
|
*/
|
|
public boolean isBorderPainted()
|
|
{
|
|
return borderPainted;
|
|
}
|
|
|
|
/**
|
|
* Set the value of the "borderPainted" property. If set to
|
|
* <code>false</code>, the button's look and feel class should not paint
|
|
* a border for the button. The default is <code>true</code>.
|
|
*
|
|
* @param b The new value of the property.
|
|
*/
|
|
public void setBorderPainted(boolean b)
|
|
{
|
|
if (borderPainted == b)
|
|
return;
|
|
|
|
boolean old = borderPainted;
|
|
borderPainted = b;
|
|
firePropertyChange(BORDER_PAINTED_CHANGED_PROPERTY, old, b);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Get the value of the "action" property.
|
|
*
|
|
* @return The current value of the "action" property
|
|
*/
|
|
public Action getAction()
|
|
{
|
|
return action;
|
|
}
|
|
|
|
/**
|
|
* <p>Set the button's "action" property, subscribing the new action to the
|
|
* button, as an ActionListener, if it is not already subscribed. The old
|
|
* Action, if it exists, is unsubscribed, and the button is unsubscribed
|
|
* from the old Action if it was previously subscribed as a
|
|
* PropertyChangeListener.</p>
|
|
*
|
|
* <p>This method also configures several of the button's properties from
|
|
* the Action, by calling {@link configurePropertiesFromAction}, and
|
|
* subscribes the button to the Action as a PropertyChangeListener.
|
|
* Subsequent changes to the Action will thus reconfigure the button
|
|
* automatically.</p>
|
|
*
|
|
* @param a The new value of the "action" property
|
|
*/
|
|
public void setAction(Action a)
|
|
{
|
|
if (action != null)
|
|
{
|
|
action.removePropertyChangeListener(actionPropertyChangeListener);
|
|
removeActionListener(action);
|
|
if (actionPropertyChangeListener != null)
|
|
{
|
|
action.removePropertyChangeListener(actionPropertyChangeListener);
|
|
actionPropertyChangeListener = null;
|
|
}
|
|
}
|
|
|
|
Action old = action;
|
|
action = a;
|
|
configurePropertiesFromAction(action);
|
|
if (action != null)
|
|
{
|
|
actionPropertyChangeListener = createActionPropertyChangeListener(a);
|
|
action.addPropertyChangeListener(actionPropertyChangeListener);
|
|
addActionListener(action);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Return the button's default "icon" property.
|
|
*
|
|
* @return The current default icon
|
|
*/
|
|
public Icon getIcon()
|
|
{
|
|
return default_icon;
|
|
}
|
|
|
|
/**
|
|
* Set the button's default "icon" property. This icon is used as a basis
|
|
* for the pressed and disabled icons, if none are explicitly set.
|
|
*
|
|
* @param i The new default icon
|
|
*/
|
|
public void setIcon(Icon i)
|
|
{
|
|
if (default_icon == i)
|
|
return;
|
|
|
|
Icon old = default_icon;
|
|
default_icon = i;
|
|
firePropertyChange(ICON_CHANGED_PROPERTY, old, i);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's "text" property. This property is synonymous with
|
|
* the "label" property.
|
|
*
|
|
* @return The current "text" property
|
|
*/
|
|
public String getText()
|
|
{
|
|
return text;
|
|
}
|
|
|
|
/**
|
|
* Set the button's "label" property. This property is synonymous with the
|
|
* "text" property.
|
|
*
|
|
* @param label The new "label" property
|
|
*
|
|
* @deprecated use <code>setText(text)</code>
|
|
*/
|
|
public void setLabel(String label)
|
|
{
|
|
setText(label);
|
|
}
|
|
|
|
/**
|
|
* Return the button's "label" property. This property is synonymous with
|
|
* the "text" property.
|
|
*
|
|
* @return The current "label" property
|
|
*
|
|
* @deprecated use <code>getText()</code>
|
|
*/
|
|
public String getLabel()
|
|
{
|
|
return getText();
|
|
}
|
|
|
|
/**
|
|
* Set the button's "text" property. This property is synonymous with the
|
|
* "label" property.
|
|
*
|
|
* @param t The new "text" property
|
|
*/
|
|
public void setText(String t)
|
|
{
|
|
if (text == t)
|
|
return;
|
|
|
|
String old = text;
|
|
text = t;
|
|
firePropertyChange(TEXT_CHANGED_PROPERTY, old, t);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Set the value of the {@link #iconTextGap} property.
|
|
*
|
|
* @param i The new value of the property
|
|
*/
|
|
public void setIconTextGap(int i)
|
|
{
|
|
if (iconTextGap == i)
|
|
return;
|
|
|
|
int old = iconTextGap;
|
|
iconTextGap = i;
|
|
fireStateChanged();
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Get the value of the {@link #iconTextGap} property.
|
|
*
|
|
* @return The current value of the property
|
|
*/
|
|
public int getIconTextGap()
|
|
{
|
|
return iconTextGap;
|
|
}
|
|
|
|
/**
|
|
* Return the button's "margin" property, which is an {@link Insets} object
|
|
* describing the distance between the button's border and its text and
|
|
* icon.
|
|
*
|
|
* @return The current "margin" property
|
|
*/
|
|
public Insets getMargin()
|
|
{
|
|
return margin;
|
|
}
|
|
|
|
/**
|
|
* Set the button's "margin" property, which is an {@link Insets} object
|
|
* describing the distance between the button's border and its text and
|
|
* icon.
|
|
*
|
|
* @param m The new "margin" property
|
|
*/
|
|
public void setMargin(Insets m)
|
|
{
|
|
if (margin == m)
|
|
return;
|
|
|
|
Insets old = margin;
|
|
margin = m;
|
|
firePropertyChange(MARGIN_CHANGED_PROPERTY, old, m);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's "pressedIcon" property. The look and feel class
|
|
* should paint this icon when the "pressed" property of the button's
|
|
* {@link ButtonModel} is <code>true</code>. This property may be
|
|
* <code>null</code>, in which case the default icon is used.
|
|
*
|
|
* @return The current "pressedIcon" property
|
|
*/
|
|
public Icon getPressedIcon()
|
|
{
|
|
return pressed_icon;
|
|
}
|
|
|
|
/**
|
|
* Set the button's "pressedIcon" property. The look and feel class
|
|
* should paint this icon when the "pressed" property of the button's
|
|
* {@link ButtonModel} is <code>true</code>. This property may be
|
|
* <code>null</code>, in which case the default icon is used.
|
|
*
|
|
* @param pressedIcon The new "pressedIcon" property
|
|
*/
|
|
public void setPressedIcon(Icon pressedIcon)
|
|
{
|
|
if (pressed_icon == pressedIcon)
|
|
return;
|
|
|
|
Icon old = pressed_icon;
|
|
pressed_icon = pressedIcon;
|
|
firePropertyChange(PRESSED_ICON_CHANGED_PROPERTY, old, pressed_icon);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's "disabledIcon" property. The look and feel class
|
|
* should paint this icon when the "enabled" property of the button's
|
|
* {@link ButtonModel} is <code>false</code>. This property may be
|
|
* <code>null</code>, in which case an icon is constructed, based on the
|
|
* default icon.
|
|
*
|
|
* @return The current "disabledIcon" property
|
|
*/
|
|
public Icon getDisabledIcon()
|
|
{
|
|
if (disabeldIcon == null
|
|
&& default_icon instanceof ImageIcon)
|
|
disabeldIcon = new ImageIcon(GrayFilter.createDisabledImage(((ImageIcon) default_icon).getImage()));
|
|
|
|
return disabeldIcon;
|
|
}
|
|
|
|
/**
|
|
* Set the button's "disabledIcon" property. The look and feel class should
|
|
* paint this icon when the "enabled" property of the button's {@link
|
|
* ButtonModel} is <code>false</code>. This property may be
|
|
* <code>null</code>, in which case an icon is constructed, based on the
|
|
* default icon.
|
|
*
|
|
* @param disabledIcon The new "disabledIcon" property
|
|
*/
|
|
public void setDisabledIcon(Icon d)
|
|
{
|
|
disabeldIcon = d;
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's "paintFocus" property. This property controls
|
|
* whether or not the look and feel class will paint a special indicator
|
|
* of focus state for the button. If it is false, the button still paints
|
|
* when focused, but no special decoration is painted to indicate the
|
|
* presence of focus.
|
|
*
|
|
* @return The current "paintFocus" property
|
|
*/
|
|
public boolean isFocusPainted()
|
|
{
|
|
return focusPainted;
|
|
}
|
|
|
|
/**
|
|
* Set the button's "paintFocus" property. This property controls whether
|
|
* or not the look and feel class will paint a special indicator of focus
|
|
* state for the button. If it is false, the button still paints when
|
|
* focused, but no special decoration is painted to indicate the presence
|
|
* of focus.
|
|
*
|
|
* @param b The new "paintFocus" property
|
|
*/
|
|
public void setFocusPainted(boolean p)
|
|
{
|
|
if (focusPainted == p)
|
|
return;
|
|
|
|
boolean old = focusPainted;
|
|
focusPainted = p;
|
|
firePropertyChange(FOCUS_PAINTED_CHANGED_PROPERTY, old, p);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's "focusTraversable" property. This property controls
|
|
* whether or not the button can receive focus when the user attempts to
|
|
* traverse the focus hierarchy.
|
|
*
|
|
* @return The current "focusTraversable" property
|
|
*/
|
|
public boolean isFocusTraversable()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Verifies that a particular key is one of the valid constants used for
|
|
* describing horizontal alignment and positioning. The valid constants
|
|
* are the following members of {@link SwingConstants}:
|
|
* <code>RIGHT</code>, <code>LEFT</code>, <code>CENTER</code>,
|
|
* <code>LEADING</code> or <code>TRAILING</code>.
|
|
*
|
|
* @param key The key to check
|
|
* @param exception A message to include in an IllegalArgumentException
|
|
*
|
|
* @return the value of key
|
|
*
|
|
* @throws IllegalArgumentException If key is not one of the valid constants
|
|
*
|
|
* @see setHorizontalTextPosition()
|
|
* @see setHorizontalAlignment()
|
|
*/
|
|
protected int checkHorizontalKey(int key, String exception)
|
|
{
|
|
switch (key)
|
|
{
|
|
case SwingConstants.RIGHT:
|
|
case SwingConstants.LEFT:
|
|
case SwingConstants.CENTER:
|
|
case SwingConstants.LEADING:
|
|
case SwingConstants.TRAILING:
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException(exception);
|
|
}
|
|
return key;
|
|
}
|
|
|
|
/**
|
|
* Verifies that a particular key is one of the valid constants used for
|
|
* describing vertical alignment and positioning. The valid constants are
|
|
* the following members of {@link SwingConstants}: <code>TOP</code>,
|
|
* <code>BOTTOM</code> or <code>CENTER</code>.
|
|
*
|
|
* @param key The key to check
|
|
* @param exception A message to include in an IllegalArgumentException
|
|
*
|
|
* @return the value of key
|
|
*
|
|
* @throws IllegalArgumentException If key is not one of the valid constants
|
|
*
|
|
* @see setVerticalTextPosition()
|
|
* @see setVerticalAlignment()
|
|
*/
|
|
protected int checkVerticalKey(int key, String exception)
|
|
{
|
|
switch (key)
|
|
{
|
|
case SwingConstants.TOP:
|
|
case SwingConstants.BOTTOM:
|
|
case SwingConstants.CENTER:
|
|
break;
|
|
default:
|
|
throw new IllegalArgumentException(exception);
|
|
}
|
|
return key;
|
|
}
|
|
|
|
/**
|
|
* Configure various properties of the button by reading properties
|
|
* of an {@link Action}. The mapping of properties is as follows:
|
|
*
|
|
* <table>
|
|
*
|
|
* <tr><th>Action keyed property</th> <th>AbstractButton property</th></tr>
|
|
*
|
|
* <tr><td>NAME </td> <td>text </td></tr>
|
|
* <tr><td>SMALL_ICON </td> <td>icon </td></tr>
|
|
* <tr><td>SHORT_DESCRIPTION </td> <td>toolTipText </td></tr>
|
|
* <tr><td>MNEMONIC_KEY </td> <td>mnemonic </td></tr>
|
|
* <tr><td>ACTION_COMMAND_KEY </td> <td>actionCommand </td></tr>
|
|
*
|
|
* </table>
|
|
*
|
|
* <p>In addition, this method always sets the button's "enabled" property to
|
|
* the value of the Action's "enabled" property.</p>
|
|
*
|
|
* <p>If the provided Action is <code>null</code>, the text, icon, and
|
|
* toolTipText properties of the button are set to <code>null</code>, and
|
|
* the "enabled" property is set to <code>true</code>; the mnemonic and
|
|
* actionCommand properties are unchanged.</p>
|
|
*
|
|
* @param a An Action to configure the button from
|
|
*/
|
|
protected void configurePropertiesFromAction(Action a)
|
|
{
|
|
if (a == null)
|
|
{
|
|
setText(null);
|
|
setIcon(null);
|
|
setEnabled(true);
|
|
setToolTipText(null);
|
|
}
|
|
else
|
|
{
|
|
setText((String)(a.getValue(Action.NAME)));
|
|
setIcon((Icon)(a.getValue(Action.SMALL_ICON)));
|
|
setEnabled(a.isEnabled());
|
|
setToolTipText((String)(a.getValue(Action.SHORT_DESCRIPTION)));
|
|
if (a.getValue(Action.MNEMONIC_KEY) != null)
|
|
setMnemonic(((Integer)(a.getValue(Action.MNEMONIC_KEY))).intValue());
|
|
String actionCommand = (String)(a.getValue(Action.ACTION_COMMAND_KEY));
|
|
|
|
// Set actionCommand to button's text by default if it is not specified
|
|
if (actionCommand != null)
|
|
setActionCommand((String)(a.getValue(Action.ACTION_COMMAND_KEY)));
|
|
else
|
|
setActionCommand(getText());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <p>A factory method which should return an {@link ActionListener} that
|
|
* propagates events from the button's {@link ButtonModel} to any of the
|
|
* button's ActionListeners. By default, this is an inner class which
|
|
* calls {@link AbstractButton.fireActionPerformed} with a modified copy
|
|
* of the incoming model {@link ActionEvent}.</p>
|
|
*
|
|
* <p>The button calls this method during construction, stores the
|
|
* resulting ActionListener in its <code>actionListener</code> member
|
|
* field, and subscribes it to the button's model. If the button's model
|
|
* is changed, this listener is unsubscribed from the old model and
|
|
* subscribed to the new one.</p>
|
|
*
|
|
* @return A new ActionListener
|
|
*/
|
|
protected ActionListener createActionListener()
|
|
{
|
|
return new ActionListener()
|
|
{
|
|
public void actionPerformed(ActionEvent e)
|
|
{
|
|
AbstractButton.this.fireActionPerformed(e);
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* <p>A factory method which should return a {@link PropertyChangeListener}
|
|
* that accepts changes to the specified {@link Action} and reconfigure
|
|
* the {@link AbstractButton}, by default using the {@link
|
|
* configurePropertiesFromAction} method.</p>
|
|
*
|
|
* <p>The button calls this method whenever a new Action is assigned to
|
|
* the button's "action" property, via {@link setAction}, and stores the
|
|
* resulting PropertyChangeListener in its
|
|
* <code>actionPropertyChangeListener</code> member field. The button
|
|
* then subscribes the listener to the button's new action. If the
|
|
* button's action is changed subsequently, the listener is unsubscribed
|
|
* from the old action and subscribed to the new one.</p>
|
|
*
|
|
* @param a The Action which will be listened to, and which should be
|
|
* the same as the source of any PropertyChangeEvents received by the
|
|
* new listener returned from this method.
|
|
*
|
|
* @return A new PropertyChangeListener
|
|
*/
|
|
protected PropertyChangeListener createActionPropertyChangeListener(Action a)
|
|
{
|
|
return new PropertyChangeListener()
|
|
{
|
|
public void propertyChange(PropertyChangeEvent e)
|
|
{
|
|
Action act = (Action) (e.getSource());
|
|
if (e.getPropertyName().equals(AbstractAction.ENABLED_PROPERTY))
|
|
setEnabled(act.isEnabled());
|
|
else if (e.getPropertyName().equals(Action.NAME))
|
|
setText((String)(act.getValue(Action.NAME)));
|
|
else if (e.getPropertyName().equals(Action.SMALL_ICON))
|
|
setIcon((Icon)(act.getValue(Action.SMALL_ICON)));
|
|
else if (e.getPropertyName().equals(Action.SHORT_DESCRIPTION))
|
|
setToolTipText((String)(act.getValue(Action.SHORT_DESCRIPTION)));
|
|
else if (e.getPropertyName().equals(Action.MNEMONIC_KEY))
|
|
if (act.getValue(Action.MNEMONIC_KEY) != null)
|
|
setMnemonic(((Integer)(act.getValue(Action.MNEMONIC_KEY))).intValue());
|
|
else if (e.getPropertyName().equals(Action.ACTION_COMMAND_KEY))
|
|
setActionCommand((String)(act.getValue(Action.ACTION_COMMAND_KEY)));
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* <p>Factory method which creates a {@link ChangeListener}, used to
|
|
* subscribe to ChangeEvents from the button's model. Subclasses of
|
|
* AbstractButton may wish to override the listener used to subscribe to
|
|
* such ChangeEvents. By default, the listener just propagates the
|
|
* {@link ChangeEvent} to the button's ChangeListeners, via the {@link
|
|
* AbstractButton.fireStateChanged} method.</p>
|
|
*
|
|
* <p>The button calls this method during construction, stores the
|
|
* resulting ChangeListener in its <code>changeListener</code> member
|
|
* field, and subscribes it to the button's model. If the button's model
|
|
* is changed, this listener is unsubscribed from the old model and
|
|
* subscribed to the new one.</p>
|
|
*
|
|
* @return The new ChangeListener
|
|
*/
|
|
protected ChangeListener createChangeListener()
|
|
{
|
|
return new ChangeListener()
|
|
{
|
|
public void stateChanged(ChangeEvent e)
|
|
{
|
|
AbstractButton.this.fireStateChanged();
|
|
AbstractButton.this.repaint();
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* <p>Factory method which creates a {@link ItemListener}, used to
|
|
* subscribe to ItemEvents from the button's model. Subclasses of
|
|
* AbstractButton may wish to override the listener used to subscribe to
|
|
* such ItemEvents. By default, the listener just propagates the
|
|
* {@link ItemEvent} to the button's ItemListeners, via the {@link
|
|
* AbstractButton.fireItemStateChanged} method.</p>
|
|
*
|
|
* <p>The button calls this method during construction, stores the
|
|
* resulting ItemListener in its <code>changeListener</code> member
|
|
* field, and subscribes it to the button's model. If the button's model
|
|
* is changed, this listener is unsubscribed from the old model and
|
|
* subscribed to the new one.</p>
|
|
*
|
|
* <p>Note that ItemEvents are only generated from the button's model
|
|
* when the model's <em>selected</em> property changes. If you want to
|
|
* subscribe to other properties of the model, you must subscribe to
|
|
* ChangeEvents.
|
|
*
|
|
* @return The new ItemListener
|
|
*/
|
|
protected ItemListener createItemListener()
|
|
{
|
|
return new ItemListener()
|
|
{
|
|
public void itemStateChanged(ItemEvent e)
|
|
{
|
|
AbstractButton.this.fireItemStateChanged(e);
|
|
}
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Programmatically perform a "click" on the button: arming, pressing,
|
|
* waiting, un-pressing, and disarming the model.
|
|
*/
|
|
public void doClick()
|
|
{
|
|
doClick(100);
|
|
}
|
|
|
|
/**
|
|
* Programmatically perform a "click" on the button: arming, pressing,
|
|
* waiting, un-pressing, and disarming the model.
|
|
*
|
|
* @param pressTime The number of milliseconds to wait in the pressed state
|
|
*/
|
|
public void doClick(int pressTime)
|
|
{
|
|
getModel().setArmed(true);
|
|
getModel().setPressed(true);
|
|
try
|
|
{
|
|
java.lang.Thread.sleep(pressTime);
|
|
}
|
|
catch (java.lang.InterruptedException e)
|
|
{
|
|
// probably harmless
|
|
}
|
|
getModel().setPressed(false);
|
|
getModel().setArmed(false);
|
|
}
|
|
|
|
/**
|
|
* Return the button's disabled selected icon. The look and feel class
|
|
* should paint this icon when the "enabled" property of the button's model
|
|
* is <code>false</code> and its "selected" property is
|
|
* <code>true</code>. This icon can be <code>null</code>, in which case
|
|
* it is synthesized from the button's selected icon.
|
|
*
|
|
* @return The current disabled selected icon
|
|
*/
|
|
public Icon getDisabledSelectedIcon()
|
|
{
|
|
return disabledSelectedIcon;
|
|
}
|
|
|
|
/**
|
|
* Set the button's disabled selected icon. The look and feel class
|
|
* should paint this icon when the "enabled" property of the button's model
|
|
* is <code>false</code> and its "selected" property is
|
|
* <code>true</code>. This icon can be <code>null</code>, in which case
|
|
* it is synthesized from the button's selected icon.
|
|
*
|
|
* @param icon The new disabled selected icon
|
|
*/
|
|
public void setDisabledSelectedIcon(Icon icon)
|
|
{
|
|
if (disabledSelectedIcon == icon)
|
|
return;
|
|
|
|
Icon old = disabledSelectedIcon;
|
|
disabledSelectedIcon = icon;
|
|
firePropertyChange(DISABLED_SELECTED_ICON_CHANGED_PROPERTY, old, icon);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's rollover icon. The look and feel class should
|
|
* paint this icon when the "rolloverEnabled" property of the button is
|
|
* <code>true</code> and the mouse rolls over the button.
|
|
*
|
|
* @return The current rollover icon
|
|
*/
|
|
public Icon getRolloverIcon()
|
|
{
|
|
return rolloverIcon;
|
|
}
|
|
|
|
/**
|
|
* Set the button's rollover icon. The look and feel class should
|
|
* paint this icon when the "rolloverEnabled" property of the button is
|
|
* <code>true</code> and the mouse rolls over the button.
|
|
*
|
|
* @param rolloverIcon The new rollover icon
|
|
*/
|
|
public void setRolloverIcon(Icon r)
|
|
{
|
|
if (rolloverIcon == r)
|
|
return;
|
|
|
|
Icon old = rolloverIcon;
|
|
rolloverIcon = r;
|
|
firePropertyChange(ROLLOVER_ICON_CHANGED_PROPERTY, old, rolloverIcon);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's rollover selected icon. The look and feel class
|
|
* should paint this icon when the "rolloverEnabled" property of the button
|
|
* is <code>true</code>, the "selected" property of the button's model is
|
|
* <code>true</code>, and the mouse rolls over the button.
|
|
*
|
|
* @return The current rollover selected icon
|
|
*/
|
|
public Icon getRolloverSelectedIcon()
|
|
{
|
|
return rolloverSelectedIcon;
|
|
}
|
|
|
|
/**
|
|
* Set the button's rollover selected icon. The look and feel class
|
|
* should paint this icon when the "rolloverEnabled" property of the button
|
|
* is <code>true</code>, the "selected" property of the button's model is
|
|
* <code>true</code>, and the mouse rolls over the button.
|
|
*
|
|
* @param rolloverSelectedIcon The new rollover selected icon
|
|
*/
|
|
public void setRolloverSelectedIcon(Icon r)
|
|
{
|
|
if (rolloverSelectedIcon == r)
|
|
return;
|
|
|
|
Icon old = rolloverSelectedIcon;
|
|
rolloverSelectedIcon = r;
|
|
firePropertyChange(ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY, old, r);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Return the button's selected icon. The look and feel class should
|
|
* paint this icon when the "selected" property of the button's model is
|
|
* <code>true</code>, and either the "rolloverEnabled" property of the
|
|
* button is <code>false</code> or the mouse is not currently rolled
|
|
* over the button.
|
|
*
|
|
* @return The current selected icon
|
|
*/
|
|
public Icon getSelectedIcon()
|
|
{
|
|
return selectedIcon;
|
|
}
|
|
|
|
/**
|
|
* Set the button's selected icon. The look and feel class should
|
|
* paint this icon when the "selected" property of the button's model is
|
|
* <code>true</code>, and either the "rolloverEnabled" property of the
|
|
* button is <code>false</code> or the mouse is not currently rolled
|
|
* over the button.
|
|
*
|
|
* @param selectedIcon The new selected icon
|
|
*/
|
|
public void setSelectedIcon(Icon s)
|
|
{
|
|
if (selectedIcon == s)
|
|
return;
|
|
|
|
Icon old = selectedIcon;
|
|
selectedIcon = s;
|
|
firePropertyChange(SELECTED_ICON_CHANGED_PROPERTY, old, s);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Returns an single-element array containing the "text" property of the
|
|
* button if the "selected" property of the button's model is
|
|
* <code>true</code>, otherwise returns <code>null</code>.
|
|
*
|
|
* @return The button's "selected object" array
|
|
*/
|
|
public Object[] getSelectedObjects()
|
|
{
|
|
if (isSelected())
|
|
{
|
|
Object[] objs = new Object[1];
|
|
objs[0] = getText();
|
|
return objs;
|
|
}
|
|
else
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Called when image data becomes available for one of the button's icons.
|
|
*
|
|
* @param img The image being updated
|
|
* @param infoflags One of the constant codes in {@link ImageObserver} used to describe
|
|
* updated portions of an image.
|
|
* @param x X coordinate of the region being updated
|
|
* @param y Y coordinate of the region being updated
|
|
* @param w Width of the region beign updated
|
|
* @param h Height of the region being updated
|
|
*
|
|
* @return <code>true</code> if img is equal to the button's current
|
|
* icon, otherwise <code>false</code>
|
|
*/
|
|
public boolean imageUpdate(Image img, int infoflags, int x, int y, int w,
|
|
int h)
|
|
{
|
|
return current_icon == img;
|
|
}
|
|
|
|
/**
|
|
* Returns the value of the button's "contentAreaFilled" property. This
|
|
* property indicates whether the area surrounding the text and icon of
|
|
* the button should be filled by the look and feel class. If this
|
|
* property is <code>false</code>, the look and feel class should leave
|
|
* the content area transparent.
|
|
*
|
|
* @return The current value of the "contentAreaFilled" property
|
|
*/
|
|
public boolean isContentAreaFilled()
|
|
{
|
|
return contentAreaFilled;
|
|
}
|
|
|
|
/**
|
|
* Sets the value of the button's "contentAreaFilled" property. This
|
|
* property indicates whether the area surrounding the text and icon of
|
|
* the button should be filled by the look and feel class. If this
|
|
* property is <code>false</code>, the look and feel class should leave
|
|
* the content area transparent.
|
|
*
|
|
* @param b The new value of the "contentAreaFilled" property
|
|
*/
|
|
public void setContentAreaFilled(boolean b)
|
|
{
|
|
if (contentAreaFilled == b)
|
|
return;
|
|
|
|
boolean old = contentAreaFilled;
|
|
contentAreaFilled = b;
|
|
firePropertyChange(CONTENT_AREA_FILLED_CHANGED_PROPERTY, old, b);
|
|
revalidate();
|
|
repaint();
|
|
}
|
|
|
|
/**
|
|
* Paints the button's border, if the button's "borderPainted" property is
|
|
* <code>true</code>, by out calling to the button's look and feel class.
|
|
*
|
|
* @param g The graphics context used to paint the border
|
|
*/
|
|
protected void paintBorder(Graphics g)
|
|
{
|
|
if (isBorderPainted())
|
|
super.paintBorder(g);
|
|
}
|
|
|
|
/**
|
|
* Returns a string, used only for debugging, which identifies or somehow
|
|
* represents this button. The exact value is implementation-defined.
|
|
*
|
|
* @return A string representation of the button
|
|
*/
|
|
protected String paramString()
|
|
{
|
|
return "AbstractButton";
|
|
}
|
|
|
|
/**
|
|
* Set the "UI" property of the button, which is a look and feel class
|
|
* responsible for handling the button's input events and painting it.
|
|
*
|
|
* @param ui The new "UI" property
|
|
*/
|
|
public void setUI(ButtonUI ui)
|
|
{
|
|
super.setUI(ui);
|
|
}
|
|
|
|
/**
|
|
* Set the "UI" property of the button, which is a look and feel class
|
|
* responsible for handling the button's input events and painting it.
|
|
*
|
|
* @return The current "UI" property
|
|
*/
|
|
public ButtonUI getUI()
|
|
{
|
|
return (ButtonUI) ui;
|
|
}
|
|
|
|
/**
|
|
* Set the "UI" property to a class constructed, via the {@link
|
|
* UIManager}, from the current look and feel. This should be overridden
|
|
* for each subclass of AbstractButton, to retrieve a suitable {@link
|
|
* ButtonUI} look and feel class.
|
|
*/
|
|
public void updateUI()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Returns the current time in milliseconds in which clicks gets coalesced
|
|
* into a single <code>ActionEvent</code>.
|
|
*
|
|
* @return the time in milliseconds
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public long getMultiClickThreshhold()
|
|
{
|
|
return multiClickThreshhold;
|
|
}
|
|
|
|
/**
|
|
* Sets the time in milliseconds in which clicks gets coalesced into a single
|
|
* <code>ActionEvent</code>.
|
|
*
|
|
* @param threshhold the time in milliseconds
|
|
*
|
|
* @since 1.4
|
|
*/
|
|
public void setMultiClickThreshhold(long threshhold)
|
|
{
|
|
if (threshhold < 0)
|
|
throw new IllegalArgumentException();
|
|
|
|
multiClickThreshhold = threshhold;
|
|
}
|
|
}
|