
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
1740 lines
41 KiB
Java
1740 lines
41 KiB
Java
/* KeyEvent.java -- event for key presses
|
||
Copyright (C) 1999, 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 java.awt.event;
|
||
|
||
import gnu.java.awt.EventModifier;
|
||
|
||
import java.awt.Component;
|
||
import java.io.IOException;
|
||
import java.io.ObjectInputStream;
|
||
|
||
/**
|
||
* This event is generated when a key is pressed or released. There are two
|
||
* categories of key events:
|
||
*
|
||
* <p><em>"Key typed" events</em> are higher-level, and have already
|
||
* compensated for modifiers and keyboard layout to generate a single Unicode
|
||
* character. It may take several key press events to generate one key typed.
|
||
* The <code>getKeyCode</code> method will return <code>VK_UNDEFINED</code>,
|
||
* and <code>getKeyChar</code> will return a valid Unicode character or
|
||
* <code>CHAR_UNDEFINED</code>.
|
||
*
|
||
* <p><em>"Key pressed" and "key released" events</em> are lower-level, and
|
||
* are platform and keyboard dependent. They correspond to the actaul motion
|
||
* on a keyboard, and return a virtual key code which labels the key that was
|
||
* pressed. The <code>getKeyCode</code> method will return one of the
|
||
* <code>VK_*</code> constants (except VK_UNDEFINED), and the
|
||
* <code>getKeyChar</code> method is undefined.
|
||
*
|
||
* <p>Some keys do not generate key typed events, such as the F1 or HELP keys.
|
||
* Not all keyboards can generate all virtual keys, and no attempt is made to
|
||
* simulate the ones that can't be typed. Virtual keys correspond to the
|
||
* keyboard layout, so for example, VK_Q in English is VK_A in French. Also,
|
||
* there are some additional virtual keys to ease handling of actions, such
|
||
* as VK_ALL_CANDIDATES in place of ALT+VK_CONVERT. Do not rely on the value
|
||
* of the VK_* constants, except for VK_ENTER, VK_BACK_SPACE, and VK_TAB.
|
||
*
|
||
* @author Aaron M. Renn <arenn@urbanophile.com>
|
||
* @author Eric Blake <ebb9@email.byu.edu>
|
||
* @see KeyAdapter
|
||
* @see KeyListener
|
||
* @since 1.1
|
||
* @status updated to 1.4
|
||
*/
|
||
public class KeyEvent extends InputEvent
|
||
{
|
||
/**
|
||
* Compatible with JDK 1.1+.
|
||
*/
|
||
private static final long serialVersionUID = -2352130953028126954L;
|
||
|
||
/** This is the first id in the range of event ids used by this class. */
|
||
public static final int KEY_FIRST = 400;
|
||
|
||
/** This is the last id in the range of event ids used by this class. */
|
||
public static final int KEY_LAST = 402;
|
||
|
||
/**
|
||
* This event id indicates a key was typed, which is a key press followed
|
||
* by a key release to generate an actual Unicode character. It may take
|
||
* several key presses to generate one key typed event, and some action
|
||
* keys have no corresponding key typed.
|
||
*/
|
||
public static final int KEY_TYPED = 400;
|
||
|
||
/** This event id indicates a key was pressed. */
|
||
public static final int KEY_PRESSED = 401;
|
||
|
||
/** This event it indicates a key was released. */
|
||
public static final int KEY_RELEASED = 402;
|
||
|
||
/** The virtual key Enter, which will always map to '\n'. */
|
||
public static final int VK_ENTER = '\n';
|
||
|
||
/** The virtual key Backspace, which will always map to '\b'. */
|
||
public static final int VK_BACK_SPACE = '\b';
|
||
|
||
/** The virtual key Tab, which will always map to '\t'. */
|
||
public static final int VK_TAB = '\t';
|
||
|
||
/** The virtual key Cancel. */
|
||
public static final int VK_CANCEL = 3;
|
||
|
||
/** The virtual key VK_CLEAR. */
|
||
public static final int VK_CLEAR = 12;
|
||
|
||
/** The virtual key VK_SHIFT. */
|
||
public static final int VK_SHIFT = 16;
|
||
|
||
/** The virtual key VK_CONTROL. */
|
||
public static final int VK_CONTROL = 17;
|
||
|
||
/** The virtual key VK_ALT. */
|
||
public static final int VK_ALT = 18;
|
||
|
||
/** The virtual key VK_PAUSE. */
|
||
public static final int VK_PAUSE = 19;
|
||
|
||
/** The virtual key VK_CAPS_LOCK. */
|
||
public static final int VK_CAPS_LOCK = 20;
|
||
|
||
/** The virtual key VK_ESCAPE. */
|
||
public static final int VK_ESCAPE = 27;
|
||
|
||
/** The virtual key VK_SPACE. */
|
||
public static final int VK_SPACE = ' ';
|
||
|
||
/** The virtual key VK_PAGE_UP. */
|
||
public static final int VK_PAGE_UP = 33;
|
||
|
||
/** The virtual key VK_PAGE_DOWN. */
|
||
public static final int VK_PAGE_DOWN = 34;
|
||
|
||
/** The virtual key VK_END. */
|
||
public static final int VK_END = 35;
|
||
|
||
/** The virtual key VK_HOME. */
|
||
public static final int VK_HOME = 36;
|
||
|
||
/**
|
||
* The virtual key for the non-numpad VK_LEFT.
|
||
*
|
||
* @see #VK_KP_LEFT
|
||
*/
|
||
public static final int VK_LEFT = 37;
|
||
|
||
/**
|
||
* The virtual key for the non-numpad VK_UP.
|
||
*
|
||
* @see #VK_KP_UP
|
||
*/
|
||
public static final int VK_UP = 38;
|
||
|
||
/**
|
||
* The virtual key for the non-numpad VK_RIGHT.
|
||
*
|
||
* @see #VK_KP_RIGHT
|
||
*/
|
||
public static final int VK_RIGHT = 39;
|
||
|
||
/**
|
||
* The virtual key for the non-numpad VK_DOWN.
|
||
*
|
||
* @see #VK_KP_DOWN
|
||
*/
|
||
public static final int VK_DOWN = 40;
|
||
|
||
/** The virtual key VK_COMMA. */
|
||
public static final int VK_COMMA = ',';
|
||
|
||
/**
|
||
* The virtual key VK_MINUS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_MINUS = '-';
|
||
|
||
/** The virtual key VK_PERIOD. */
|
||
public static final int VK_PERIOD = '.';
|
||
|
||
/** The virtual key VK_SLASH. */
|
||
public static final int VK_SLASH = '/';
|
||
|
||
/** The virtual key VK_0. */
|
||
public static final int VK_0 = '0';
|
||
|
||
/** The virtual key VK_1. */
|
||
public static final int VK_1 = '1';
|
||
|
||
/** The virtual key VK_2. */
|
||
public static final int VK_2 = '2';
|
||
|
||
/** The virtual key VK_3. */
|
||
public static final int VK_3 = '3';
|
||
|
||
/** The virtual key VK_4. */
|
||
public static final int VK_4 = '4';
|
||
|
||
/** The virtual key VK_5. */
|
||
public static final int VK_5 = '5';
|
||
|
||
/** The virtual key VK_6. */
|
||
public static final int VK_6 = '6';
|
||
|
||
/** The virtual key VK_7. */
|
||
public static final int VK_7 = '7';
|
||
|
||
/** The virtual key VK_8. */
|
||
public static final int VK_8 = '8';
|
||
|
||
/** The virtual key VK_9. */
|
||
public static final int VK_9 = '9';
|
||
|
||
/** The virtual key VK_SEMICOLON. */
|
||
public static final int VK_SEMICOLON = ';';
|
||
|
||
/** The virtual key VK_EQUALS. */
|
||
public static final int VK_EQUALS = '=';
|
||
|
||
/** The virtual key VK_A. */
|
||
public static final int VK_A = 'A';
|
||
|
||
/** The virtual key VK_B. */
|
||
public static final int VK_B = 'B';
|
||
|
||
/** The virtual key VK_C. */
|
||
public static final int VK_C = 'C';
|
||
|
||
/** The virtual key VK_D. */
|
||
public static final int VK_D = 'D';
|
||
|
||
/** The virtual key VK_E. */
|
||
public static final int VK_E = 'E';
|
||
|
||
/** The virtual key VK_F. */
|
||
public static final int VK_F = 'F';
|
||
|
||
/** The virtual key VK_G. */
|
||
public static final int VK_G = 'G';
|
||
|
||
/** The virtual key VK_H. */
|
||
public static final int VK_H = 'H';
|
||
|
||
/** The virtual key VK_I. */
|
||
public static final int VK_I = 'I';
|
||
|
||
/** The virtual key VK_J. */
|
||
public static final int VK_J = 'J';
|
||
|
||
/** The virtual key VK_K. */
|
||
public static final int VK_K = 'K';
|
||
|
||
/** The virtual key VK_L. */
|
||
public static final int VK_L = 'L';
|
||
|
||
/** The virtual key VK_M. */
|
||
public static final int VK_M = 'M';
|
||
|
||
/** The virtual key VK_N. */
|
||
public static final int VK_N = 'N';
|
||
|
||
/** The virtual key VK_O. */
|
||
public static final int VK_O = 'O';
|
||
|
||
/** The virtual key VK_P. */
|
||
public static final int VK_P = 'P';
|
||
|
||
/** The virtual key VK_Q. */
|
||
public static final int VK_Q = 'Q';
|
||
|
||
/** The virtual key VK_R. */
|
||
public static final int VK_R = 'R';
|
||
|
||
/** The virtual key VK_S. */
|
||
public static final int VK_S = 'S';
|
||
|
||
/** The virtual key VK_T. */
|
||
public static final int VK_T = 'T';
|
||
|
||
/** The virtual key VK_U. */
|
||
public static final int VK_U = 'U';
|
||
|
||
/** The virtual key VK_V. */
|
||
public static final int VK_V = 'V';
|
||
|
||
/** The virtual key VK_W. */
|
||
public static final int VK_W = 'W';
|
||
|
||
/** The virtual key VK_X. */
|
||
public static final int VK_X = 'X';
|
||
|
||
/** The virtual key VK_Y. */
|
||
public static final int VK_Y = 'Y';
|
||
|
||
/** The virtual key VK_Z. */
|
||
public static final int VK_Z = 'Z';
|
||
|
||
/** The virtual key VK_OPEN_BRACKET. */
|
||
public static final int VK_OPEN_BRACKET = '[';
|
||
|
||
/** The virtual key VK_BACK_SLASH. */
|
||
public static final int VK_BACK_SLASH = '\\';
|
||
|
||
/** The virtual key VK_CLOSE_BRACKET. */
|
||
public static final int VK_CLOSE_BRACKET = ']';
|
||
|
||
/** The virtual key VK_NUMPAD0. */
|
||
public static final int VK_NUMPAD0 = 96;
|
||
|
||
/** The virtual key VK_NUMPAD1. */
|
||
public static final int VK_NUMPAD1 = 97;
|
||
|
||
/** The virtual key VK_NUMPAD2. */
|
||
public static final int VK_NUMPAD2 = 98;
|
||
|
||
/** The virtual key VK_NUMPAD3. */
|
||
public static final int VK_NUMPAD3 = 99;
|
||
|
||
/** The virtual key VK_NUMPAD4. */
|
||
public static final int VK_NUMPAD4 = 100;
|
||
|
||
/** The virtual key VK_NUMPAD5. */
|
||
public static final int VK_NUMPAD5 = 101;
|
||
|
||
/** The virtual key VK_NUMPAD6. */
|
||
public static final int VK_NUMPAD6 = 102;
|
||
|
||
/** The virtual key VK_NUMPAD7. */
|
||
public static final int VK_NUMPAD7 = 103;
|
||
|
||
/** The virtual key VK_NUMPAD8. */
|
||
public static final int VK_NUMPAD8 = 104;
|
||
|
||
/** The virtual key VK_NUMPAD9. */
|
||
public static final int VK_NUMPAD9 = 105;
|
||
|
||
/** The virtual key VK_MULTIPLY. */
|
||
public static final int VK_MULTIPLY = 106;
|
||
|
||
/** The virtual key VK_ADD. */
|
||
public static final int VK_ADD = 107;
|
||
|
||
/**
|
||
* The virtual key VK_SEPARATOR, handily mispelled for those who can't
|
||
* figure it out.
|
||
*
|
||
* @deprecated use {@link #VK_SEPARATOR}
|
||
*/
|
||
public static final int VK_SEPARATER = 108;
|
||
|
||
/**
|
||
* The virtual key VK_SEPARATOR.
|
||
*
|
||
* @since 1.4
|
||
*/
|
||
public static final int VK_SEPARATOR = 108;
|
||
|
||
/** The virtual key VK_SUBTRACT. */
|
||
public static final int VK_SUBTRACT = 109;
|
||
|
||
/** The virtual key VK_DECIMAL. */
|
||
public static final int VK_DECIMAL = 110;
|
||
|
||
/** The virtual key VK_DIVIDE. */
|
||
public static final int VK_DIVIDE = 111;
|
||
|
||
/** The virtual key VK_DELETE. */
|
||
public static final int VK_DELETE = 127;
|
||
|
||
/** The virtual key VK_NUM_LOCK. */
|
||
public static final int VK_NUM_LOCK = 144;
|
||
|
||
/** The virtual key VK_SCROLL_LOCK. */
|
||
public static final int VK_SCROLL_LOCK = 145;
|
||
|
||
/** The virtual key VK_F1. */
|
||
public static final int VK_F1 = 112;
|
||
|
||
/** The virtual key VK_F2. */
|
||
public static final int VK_F2 = 113;
|
||
|
||
/** The virtual key VK_F3. */
|
||
public static final int VK_F3 = 114;
|
||
|
||
/** The virtual key VK_F4. */
|
||
public static final int VK_F4 = 115;
|
||
|
||
/** The virtual key VK_F5. */
|
||
public static final int VK_F5 = 116;
|
||
|
||
/** The virtual key VK_F6. */
|
||
public static final int VK_F6 = 117;
|
||
|
||
/** The virtual key VK_F7. */
|
||
public static final int VK_F7 = 118;
|
||
|
||
/** The virtual key VK_F8. */
|
||
public static final int VK_F8 = 119;
|
||
|
||
/** The virtual key VK_F9. */
|
||
public static final int VK_F9 = 120;
|
||
|
||
/** The virtual key VK_F10. */
|
||
public static final int VK_F10 = 121;
|
||
|
||
/** The virtual key VK_F11. */
|
||
public static final int VK_F11 = 122;
|
||
|
||
/** The virtual key VK_F12. */
|
||
public static final int VK_F12 = 123;
|
||
|
||
/**
|
||
* The virtual key VK_F13.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F13 = 61440;
|
||
|
||
/**
|
||
* The virtual key VK_F14.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F14 = 61441;
|
||
|
||
/**
|
||
* The virtual key VK_F15.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F15 = 61442;
|
||
|
||
/**
|
||
* The virtual key VK_F16.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F16 = 61443;
|
||
|
||
/**
|
||
* The virtual key VK_F17.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F17 = 61444;
|
||
|
||
/**
|
||
* The virtual key VK_F18.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F18 = 61445;
|
||
|
||
/**
|
||
* The virtual key VK_F19.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F19 = 61446;
|
||
|
||
/**
|
||
* The virtual key VK_F20.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F20 = 61447;
|
||
|
||
/**
|
||
* The virtual key VK_F21.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F21 = 61448;
|
||
|
||
/**
|
||
* The virtual key VK_F22.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F22 = 61449;
|
||
|
||
/**
|
||
* The virtual key VK_F23.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F23 = 61450;
|
||
|
||
/**
|
||
* The virtual key VK_F24.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_F24 = 61451;
|
||
|
||
/** The virtual key VK_PRINTSCREEN. */
|
||
public static final int VK_PRINTSCREEN = 154;
|
||
|
||
/** The virtual key VK_INSERT. */
|
||
public static final int VK_INSERT = 155;
|
||
|
||
/** The virtual key VK_HELP. */
|
||
public static final int VK_HELP = 156;
|
||
|
||
/** The virtual key VK_META. */
|
||
public static final int VK_META = 157;
|
||
|
||
/** The virtual key VK_BACK_QUOTE. */
|
||
public static final int VK_BACK_QUOTE = 192;
|
||
|
||
/** The virtual key VK_QUOTE. */
|
||
public static final int VK_QUOTE = 222;
|
||
|
||
/**
|
||
* The virtual key for the numpad VK_KP_UP.
|
||
*
|
||
* @see #VK_UP
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_KP_UP = 224;
|
||
|
||
/**
|
||
* The virtual key for the numpad VK_KP_DOWN.
|
||
*
|
||
* @see #VK_DOWN
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_KP_DOWN = 225;
|
||
|
||
/**
|
||
* The virtual key for the numpad VK_KP_LEFT.
|
||
*
|
||
* @see #VK_LEFT
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_KP_LEFT = 226;
|
||
|
||
/**
|
||
* The virtual key for the numpad VK_KP_RIGHT.
|
||
*
|
||
* @see #VK_RIGHT
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_KP_RIGHT = 227;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_GRAVE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_GRAVE = 128;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_ACUTE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_ACUTE = 129;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_CIRCUMFLEX.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_CIRCUMFLEX = 130;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_TILDE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_TILDE = 131;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_MACRON.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_MACRON = 132;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_BREVE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_BREVE = 133;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_ABOVEDOT.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_ABOVEDOT = 134;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_DIAERESIS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_DIAERESIS = 135;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_ABOVERING.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_ABOVERING = 136;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_DOUBLEACUTE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_DOUBLEACUTE = 137;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_CARON.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_CARON = 138;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_CEDILLA.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_CEDILLA = 139;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_OGONEK.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_OGONEK = 140;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_IOTA.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_IOTA = 141;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_VOICED_SOUND.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_VOICED_SOUND = 142;
|
||
|
||
/**
|
||
* The virtual key VK_DEAD_SEMIVOICED_SOUND.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DEAD_SEMIVOICED_SOUND = 143;
|
||
|
||
/**
|
||
* The virtual key VK_AMPERSAND.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_AMPERSAND = 150;
|
||
|
||
/**
|
||
* The virtual key VK_ASTERISK.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_ASTERISK = 151;
|
||
|
||
/**
|
||
* The virtual key VK_QUOTEDBL.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_QUOTEDBL = 152;
|
||
|
||
/**
|
||
* The virtual key VK_LESS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_LESS = 153;
|
||
|
||
/**
|
||
* The virtual key VK_GREATER.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_GREATER = 160;
|
||
|
||
/**
|
||
* The virtual key VK_BRACELEFT.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_BRACELEFT = 161;
|
||
|
||
/**
|
||
* The virtual key VK_BRACERIGHT.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_BRACERIGHT = 162;
|
||
|
||
/**
|
||
* The virtual key VK_AT.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_AT = 512;
|
||
|
||
/**
|
||
* The virtual key VK_COLON.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_COLON = 513;
|
||
|
||
/**
|
||
* The virtual key VK_CIRCUMFLEX.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_CIRCUMFLEX = 514;
|
||
|
||
/**
|
||
* The virtual key VK_DOLLAR.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_DOLLAR = 515;
|
||
|
||
/**
|
||
* The virtual key VK_EURO_SIGN.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_EURO_SIGN = 516;
|
||
|
||
/**
|
||
* The virtual key VK_EXCLAMATION_MARK.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_EXCLAMATION_MARK = 517;
|
||
|
||
/**
|
||
* The virtual key VK_INVERTED_EXCLAMATION_MARK.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_INVERTED_EXCLAMATION_MARK = 518;
|
||
|
||
/**
|
||
* The virtual key VK_LEFT_PARENTHESIS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_LEFT_PARENTHESIS = 519;
|
||
|
||
/**
|
||
* The virtual key VK_NUMBER_SIGN.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_NUMBER_SIGN = 520;
|
||
|
||
/**
|
||
* The virtual key VK_PLUS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_PLUS = 521;
|
||
|
||
/**
|
||
* The virtual key VK_RIGHT_PARENTHESIS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_RIGHT_PARENTHESIS = 522;
|
||
|
||
/**
|
||
* The virtual key VK_UNDERSCORE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_UNDERSCORE = 523;
|
||
|
||
/** The virtual key VK_FINAL. */
|
||
public static final int VK_FINAL = 24;
|
||
|
||
/** The virtual key VK_CONVERT. */
|
||
public static final int VK_CONVERT = 28;
|
||
|
||
/** The virtual key VK_NONCONVERT. */
|
||
public static final int VK_NONCONVERT = 29;
|
||
|
||
/** The virtual key VK_ACCEPT. */
|
||
public static final int VK_ACCEPT = 30;
|
||
|
||
/** The virtual key VK_MODECHANGE. */
|
||
public static final int VK_MODECHANGE = 31;
|
||
|
||
/** The virtual key VK_KANA. */
|
||
public static final int VK_KANA = 21;
|
||
|
||
/** The virtual key VK_KANJI. */
|
||
public static final int VK_KANJI = 25;
|
||
|
||
/**
|
||
* The virtual key VK_ALPHANUMERIC.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_ALPHANUMERIC = 240;
|
||
|
||
/**
|
||
* The virtual key VK_KATAKANA.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_KATAKANA = 241;
|
||
|
||
/**
|
||
* The virtual key VK_HIRAGANA.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_HIRAGANA = 242;
|
||
|
||
/**
|
||
* The virtual key VK_FULL_WIDTH.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_FULL_WIDTH = 243;
|
||
|
||
/**
|
||
* The virtual key VK_HALF_WIDTH.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_HALF_WIDTH = 244;
|
||
|
||
/**
|
||
* The virtual key VK_ROMAN_CHARACTERS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_ROMAN_CHARACTERS = 245;
|
||
|
||
/**
|
||
* The virtual key VK_ALL_CANDIDATES.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_ALL_CANDIDATES = 256;
|
||
|
||
/**
|
||
* The virtual key VK_PREVIOUS_CANDIDATE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_PREVIOUS_CANDIDATE = 257;
|
||
|
||
/**
|
||
* The virtual key VK_CODE_INPUT.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_CODE_INPUT = 258;
|
||
|
||
/**
|
||
* The virtual key VK_JAPANESE_KATAKANA.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_JAPANESE_KATAKANA = 259;
|
||
|
||
/**
|
||
* The virtual key VK_JAPANESE_HIRAGANA.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_JAPANESE_HIRAGANA = 260;
|
||
|
||
/**
|
||
* The virtual key VK_JAPANESE_ROMAN.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_JAPANESE_ROMAN = 261;
|
||
|
||
/**
|
||
* The virtual key VK_KANA_LOCK.
|
||
*
|
||
* @since 1.3
|
||
*/
|
||
public static final int VK_KANA_LOCK = 262;
|
||
|
||
/**
|
||
* The virtual key VK_INPUT_METHOD_ON_OFF.
|
||
*
|
||
* @since 1.3
|
||
*/
|
||
public static final int VK_INPUT_METHOD_ON_OFF = 263;
|
||
|
||
/**
|
||
* The virtual key VK_CUT.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_CUT = 65489;
|
||
|
||
/**
|
||
* The virtual key VK_COPY.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_COPY = 65485;
|
||
|
||
/**
|
||
* The virtual key VK_PASTE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_PASTE = 65487;
|
||
|
||
/**
|
||
* The virtual key VK_UNDO.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_UNDO = 65483;
|
||
|
||
/**
|
||
* The virtual key VK_AGAIN.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_AGAIN = 65481;
|
||
|
||
/**
|
||
* The virtual key VK_FIND.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_FIND = 65488;
|
||
|
||
/**
|
||
* The virtual key VK_PROPS.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_PROPS = 65482;
|
||
|
||
/**
|
||
* The virtual key VK_STOP.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_STOP = 65480;
|
||
|
||
/**
|
||
* The virtual key VK_COMPOSE.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_COMPOSE = 65312;
|
||
|
||
/**
|
||
* The virtual key VK_ALT_GRAPH.
|
||
*
|
||
* @since 1.2
|
||
*/
|
||
public static final int VK_ALT_GRAPH = 65406;
|
||
|
||
/**
|
||
* The virtual key VK_UNDEFINED. This is used for key typed events, which
|
||
* do not have a virtual key.
|
||
*/
|
||
public static final int VK_UNDEFINED = 0;
|
||
|
||
/**
|
||
* The only char with no valid Unicode interpretation. This is used for
|
||
* key pressed and key released events which do not have a valid keyChar.
|
||
*/
|
||
public static final char CHAR_UNDEFINED = '\uffff';
|
||
|
||
/**
|
||
* Indicates unknown or irrelavent key location. This is also used for
|
||
* key typed events, which do not need a location.
|
||
*
|
||
* @since 1.4
|
||
*/
|
||
public static final int KEY_LOCATION_UNKNOWN = 0;
|
||
|
||
/**
|
||
* Indicates a standard key location, with no left/right variants and not
|
||
* on the numeric pad.
|
||
*
|
||
* @since 1.4
|
||
*/
|
||
public static final int KEY_LOCATION_STANDARD = 1;
|
||
|
||
/**
|
||
* Indicates the key is on the left side of the keyboard, such as the left
|
||
* shift.
|
||
*
|
||
* @since 1.4
|
||
*/
|
||
public static final int KEY_LOCATION_LEFT = 2;
|
||
|
||
/**
|
||
* Indicates the key is on the right side of the keyboard, such as the right
|
||
* shift.
|
||
*
|
||
* @since 1.4
|
||
*/
|
||
public static final int KEY_LOCATION_RIGHT = 3;
|
||
|
||
/**
|
||
* Indicates the key is on the numeric pad, such as the numpad 0.
|
||
*
|
||
* @since 1.4
|
||
*/
|
||
public static final int KEY_LOCATION_NUMPAD = 4;
|
||
|
||
/**
|
||
* The code assigned to the physical keyboard location (as adjusted by the
|
||
* keyboard layout). Use the symbolic VK_* names instead of numbers.
|
||
*
|
||
* @see #getKeyCode()
|
||
* @serial the VK_ code for this key
|
||
*/
|
||
private int keyCode;
|
||
|
||
/**
|
||
* The Unicode character produced by the key type event. This has no meaning
|
||
* for key pressed and key released events.
|
||
*
|
||
* @see #getKeyChar()
|
||
* @serial the Unicode value for this key
|
||
*/
|
||
private char keyChar;
|
||
|
||
/**
|
||
* The keyboard location of the key. One of {@link #KEY_LOCATION_UNKNOWN},
|
||
* {@link #KEY_LOCATION_STANDARD}, {@link #KEY_LOCATION_LEFT},
|
||
* {@link #KEY_LOCATION_RIGHT}, or {@link #KEY_LOCATION_NUMPAD}.
|
||
*
|
||
* @see #getKeyLocation()
|
||
* @serial the key location
|
||
* @since 1.4
|
||
*/
|
||
private final int keyLocation;
|
||
|
||
/**
|
||
* Stores the state of the native event dispatching system, to correctly
|
||
* dispatch in Component#dispatchEventImpl when a proxy is active.
|
||
*
|
||
* XXX Does this matter in Classpath?
|
||
*
|
||
* @serial whether the proxy is active
|
||
*/
|
||
private boolean isProxyActive;
|
||
|
||
|
||
/**
|
||
* Initializes a new instance of <code>KeyEvent</code> with the specified
|
||
* information. Note that an invalid id leads to unspecified results.
|
||
*
|
||
* @param source the component that generated this event
|
||
* @param id the event id
|
||
* @param when the timestamp when the even occurred
|
||
* @param modifiers the modifier keys during the event, in old or new style
|
||
* @param keyCode the integer constant for the virtual key type
|
||
* @param keyChar the Unicode value of the key
|
||
* @param keyLocation the location of the key
|
||
* @throws IllegalArgumentException if source is null, if keyLocation is
|
||
* invalid, or if (id == KEY_TYPED && (keyCode != VK_UNDEFINED
|
||
* || keyChar == CHAR_UNDEFINED))
|
||
*/
|
||
public KeyEvent(Component source, int id, long when, int modifiers,
|
||
int keyCode, char keyChar, int keyLocation)
|
||
{
|
||
super(source, id, when, modifiers);
|
||
this.keyCode = keyCode;
|
||
this.keyChar = keyChar;
|
||
this.keyLocation = keyLocation;
|
||
if ((id == KEY_TYPED && (keyCode != VK_UNDEFINED
|
||
|| keyChar == CHAR_UNDEFINED))
|
||
|| keyLocation < KEY_LOCATION_UNKNOWN
|
||
|| keyLocation > KEY_LOCATION_NUMPAD)
|
||
throw new IllegalArgumentException();
|
||
}
|
||
|
||
/**
|
||
* Initializes a new instance of <code>KeyEvent</code> with the specified
|
||
* information. Note that an invalid id leads to unspecified results.
|
||
*
|
||
* @param source the component that generated this event
|
||
* @param id the event id
|
||
* @param when the timestamp when the even occurred
|
||
* @param modifiers the modifier keys during the event, in old or new style
|
||
* @param keyCode the integer constant for the virtual key type
|
||
* @param keyChar the Unicode value of the key
|
||
* @throws IllegalArgumentException if source is null, or if
|
||
* (id == KEY_TYPED && (keyCode != VK_UNDEFINED
|
||
* || keyChar == CHAR_UNDEFINED))
|
||
*/
|
||
public KeyEvent(Component source, int id, long when, int modifiers,
|
||
int keyCode, char keyChar)
|
||
{
|
||
this(source, id, when, modifiers, keyCode, keyChar, KEY_LOCATION_UNKNOWN);
|
||
}
|
||
|
||
/**
|
||
* Initializes a new instance of <code>KeyEvent</code> with the specified
|
||
* information. Note that an invalid id leads to unspecified results.
|
||
*
|
||
* @param source the component that generated this event
|
||
* @param id the event id
|
||
* @param when the timestamp when the even occurred
|
||
* @param modifiers the modifier keys during the event, in old or new style
|
||
* @param keyCode the integer constant for the virtual key type
|
||
* @throws IllegalArgumentException if source is null, or if
|
||
* id == KEY_TYPED but keyCode != VK_UNDEFINED
|
||
*
|
||
* @deprecated
|
||
*/
|
||
public KeyEvent(Component source, int id, long when, int modifiers,
|
||
int keyCode)
|
||
{
|
||
this(source, id, when, modifiers, keyCode, '\0', KEY_LOCATION_UNKNOWN);
|
||
}
|
||
|
||
/**
|
||
* Returns the key code for the event key. This will be one of the
|
||
* <code>VK_*</code> constants defined in this class. If the event type is
|
||
* KEY_TYPED, the result will be VK_UNDEFINED.
|
||
*
|
||
* @return the key code for this event
|
||
*/
|
||
public int getKeyCode()
|
||
{
|
||
return keyCode;
|
||
}
|
||
|
||
/**
|
||
* Sets the key code for this event. This must be one of the
|
||
* <code>VK_*</code> constants defined in this class.
|
||
*
|
||
* @param keyCode the new key code for this event
|
||
*/
|
||
public void setKeyCode(int keyCode)
|
||
{
|
||
this.keyCode = keyCode;
|
||
}
|
||
|
||
/**
|
||
* Returns the Unicode value for the event key. This will be
|
||
* <code>CHAR_UNDEFINED</code> if there is no Unicode equivalent for
|
||
* this key, usually when this is a KEY_PRESSED or KEY_RELEASED event.
|
||
*
|
||
* @return the Unicode character for this event
|
||
*/
|
||
public char getKeyChar()
|
||
{
|
||
return keyChar;
|
||
}
|
||
|
||
/**
|
||
* Sets the Unicode character for this event to the specified value.
|
||
*
|
||
* @param keyChar the new Unicode character for this event
|
||
*/
|
||
public void setKeyChar(char keyChar)
|
||
{
|
||
this.keyChar = keyChar;
|
||
}
|
||
|
||
/**
|
||
* Sets the modifier keys to the specified value. This should be a union
|
||
* of the bit mask constants from <code>InputEvent</code>. The use of this
|
||
* method is not recommended, particularly for KEY_TYPED events, which do
|
||
* not check if the modifiers were changed.
|
||
*
|
||
* @param modifiers the new modifier value, in either old or new style
|
||
* @see InputEvent
|
||
*
|
||
* @deprecated
|
||
*/
|
||
public void setModifiers(int modifiers)
|
||
{
|
||
this.modifiers = EventModifier.extend(modifiers);
|
||
}
|
||
|
||
/**
|
||
* Returns the keyboard location of the key that generated this event. This
|
||
* provides a way to distinguish between keys like left and right shift
|
||
* which share a common key code. The result will be one of
|
||
* {@link #KEY_LOCATION_UNKNOWN}, {@link #KEY_LOCATION_STANDARD},
|
||
* {@link #KEY_LOCATION_LEFT}, {@link #KEY_LOCATION_RIGHT}, or
|
||
* {@link #KEY_LOCATION_NUMPAD}.
|
||
*
|
||
* @return the key location
|
||
* @since 1.4
|
||
*/
|
||
public int getKeyLocation()
|
||
{
|
||
return keyLocation;
|
||
}
|
||
|
||
/**
|
||
* Returns the text name of key code, such as "HOME", "F1", or "A".
|
||
*
|
||
* XXX Sun claims this can be localized via the awt.properties file - how
|
||
* do we implement that?
|
||
*
|
||
* @return the text name of the key code
|
||
*/
|
||
public static String getKeyText(int keyCode)
|
||
{
|
||
switch (keyCode)
|
||
{
|
||
case VK_CANCEL:
|
||
return "Cancel";
|
||
case VK_BACK_SPACE:
|
||
return "Backspace";
|
||
case VK_TAB:
|
||
return "Tab";
|
||
case VK_ENTER:
|
||
return "Enter";
|
||
case VK_CLEAR:
|
||
return "Clear";
|
||
case VK_SHIFT:
|
||
return "Shift";
|
||
case VK_CONTROL:
|
||
return "Ctrl";
|
||
case VK_ALT:
|
||
return "Alt";
|
||
case VK_PAUSE:
|
||
return "Pause";
|
||
case VK_CAPS_LOCK:
|
||
return "Caps Lock";
|
||
case VK_KANA:
|
||
return "Kana";
|
||
case VK_FINAL:
|
||
return "Final";
|
||
case VK_KANJI:
|
||
return "Kanji";
|
||
case VK_ESCAPE:
|
||
return "Escape";
|
||
case VK_CONVERT:
|
||
return "Convert";
|
||
case VK_NONCONVERT:
|
||
return "No Convert";
|
||
case VK_ACCEPT:
|
||
return "Accept";
|
||
case VK_MODECHANGE:
|
||
return "Mode Change";
|
||
case VK_SPACE:
|
||
return "Space";
|
||
case VK_PAGE_UP:
|
||
return "Page Up";
|
||
case VK_PAGE_DOWN:
|
||
return "Page Down";
|
||
case VK_END:
|
||
return "End";
|
||
case VK_HOME:
|
||
return "Home";
|
||
case VK_LEFT:
|
||
case VK_KP_LEFT:
|
||
return "Left";
|
||
case VK_UP:
|
||
case VK_KP_UP:
|
||
return "Up";
|
||
case VK_RIGHT:
|
||
case VK_KP_RIGHT:
|
||
return "Right";
|
||
case VK_DOWN:
|
||
case VK_KP_DOWN:
|
||
return "Down";
|
||
case VK_MINUS:
|
||
return "Minus";
|
||
case VK_MULTIPLY:
|
||
return "NumPad *";
|
||
case VK_ADD:
|
||
return "NumPad +";
|
||
case VK_SEPARATOR:
|
||
return "NumPad ,";
|
||
case VK_SUBTRACT:
|
||
return "NumPad -";
|
||
case VK_DECIMAL:
|
||
return "NumPad .";
|
||
case VK_DIVIDE:
|
||
return "NumPad /";
|
||
case VK_DELETE:
|
||
return "Delete";
|
||
case VK_DEAD_GRAVE:
|
||
return "Dead Grave";
|
||
case VK_DEAD_ACUTE:
|
||
return "Dead Acute";
|
||
case VK_DEAD_CIRCUMFLEX:
|
||
return "Dead Circumflex";
|
||
case VK_DEAD_TILDE:
|
||
return "Dead Tilde";
|
||
case VK_DEAD_MACRON:
|
||
return "Dead Macron";
|
||
case VK_DEAD_BREVE:
|
||
return "Dead Breve";
|
||
case VK_DEAD_ABOVEDOT:
|
||
return "Dead Above Dot";
|
||
case VK_DEAD_DIAERESIS:
|
||
return "Dead Diaeresis";
|
||
case VK_DEAD_ABOVERING:
|
||
return "Dead Above Ring";
|
||
case VK_DEAD_DOUBLEACUTE:
|
||
return "Dead Double Acute";
|
||
case VK_DEAD_CARON:
|
||
return "Dead Caron";
|
||
case VK_DEAD_CEDILLA:
|
||
return "Dead Cedilla";
|
||
case VK_DEAD_OGONEK:
|
||
return "Dead Ogonek";
|
||
case VK_DEAD_IOTA:
|
||
return "Dead Iota";
|
||
case VK_DEAD_VOICED_SOUND:
|
||
return "Dead Voiced Sound";
|
||
case VK_DEAD_SEMIVOICED_SOUND:
|
||
return "Dead Semivoiced Sound";
|
||
case VK_NUM_LOCK:
|
||
return "Num Lock";
|
||
case VK_SCROLL_LOCK:
|
||
return "Scroll Lock";
|
||
case VK_AMPERSAND:
|
||
return "Ampersand";
|
||
case VK_ASTERISK:
|
||
return "Asterisk";
|
||
case VK_QUOTEDBL:
|
||
return "Double Quote";
|
||
case VK_LESS:
|
||
return "Less";
|
||
case VK_PRINTSCREEN:
|
||
return "Print Screen";
|
||
case VK_INSERT:
|
||
return "Insert";
|
||
case VK_HELP:
|
||
return "Help";
|
||
case VK_META:
|
||
return "Meta";
|
||
case VK_GREATER:
|
||
return "Greater";
|
||
case VK_BRACELEFT:
|
||
return "Left Brace";
|
||
case VK_BRACERIGHT:
|
||
return "Right Brace";
|
||
case VK_BACK_QUOTE:
|
||
return "Back Quote";
|
||
case VK_QUOTE:
|
||
return "Quote";
|
||
case VK_ALPHANUMERIC:
|
||
return "Alphanumeric";
|
||
case VK_KATAKANA:
|
||
return "Katakana";
|
||
case VK_HIRAGANA:
|
||
return "Hiragana";
|
||
case VK_FULL_WIDTH:
|
||
return "Full-Width";
|
||
case VK_HALF_WIDTH:
|
||
return "Half-Width";
|
||
case VK_ROMAN_CHARACTERS:
|
||
return "Roman Characters";
|
||
case VK_ALL_CANDIDATES:
|
||
return "All Candidates";
|
||
case VK_PREVIOUS_CANDIDATE:
|
||
return "Previous Candidate";
|
||
case VK_CODE_INPUT:
|
||
return "Code Input";
|
||
case VK_JAPANESE_KATAKANA:
|
||
return "Japanese Katakana";
|
||
case VK_JAPANESE_HIRAGANA:
|
||
return "Japanese Hiragana";
|
||
case VK_JAPANESE_ROMAN:
|
||
return "Japanese Roman";
|
||
case VK_KANA_LOCK:
|
||
return "Kana Lock";
|
||
case VK_INPUT_METHOD_ON_OFF:
|
||
return "Input Method On/Off";
|
||
case VK_AT:
|
||
return "At";
|
||
case VK_COLON:
|
||
return "Colon";
|
||
case VK_CIRCUMFLEX:
|
||
return "Circumflex";
|
||
case VK_DOLLAR:
|
||
return "Dollar";
|
||
case VK_EURO_SIGN:
|
||
return "Euro";
|
||
case VK_EXCLAMATION_MARK:
|
||
return "Exclamation Mark";
|
||
case VK_INVERTED_EXCLAMATION_MARK:
|
||
return "Inverted Exclamation Mark";
|
||
case VK_LEFT_PARENTHESIS:
|
||
return "Left Parenthesis";
|
||
case VK_NUMBER_SIGN:
|
||
return "Number Sign";
|
||
case VK_PLUS:
|
||
return "Plus";
|
||
case VK_RIGHT_PARENTHESIS:
|
||
return "Right Parenthesis";
|
||
case VK_UNDERSCORE:
|
||
return "Underscore";
|
||
case VK_COMPOSE:
|
||
return "Compose";
|
||
case VK_ALT_GRAPH:
|
||
return "Alt Graph";
|
||
case VK_STOP:
|
||
return "Stop";
|
||
case VK_AGAIN:
|
||
return "Again";
|
||
case VK_PROPS:
|
||
return "Props";
|
||
case VK_UNDO:
|
||
return "Undo";
|
||
case VK_COPY:
|
||
return "Copy";
|
||
case VK_PASTE:
|
||
return "Paste";
|
||
case VK_FIND:
|
||
return "Find";
|
||
case VK_CUT:
|
||
return "Cut";
|
||
case VK_COMMA:
|
||
case VK_PERIOD:
|
||
case VK_SLASH:
|
||
case VK_0:
|
||
case VK_1:
|
||
case VK_2:
|
||
case VK_3:
|
||
case VK_4:
|
||
case VK_5:
|
||
case VK_6:
|
||
case VK_7:
|
||
case VK_8:
|
||
case VK_9:
|
||
case VK_SEMICOLON:
|
||
case VK_EQUALS:
|
||
case VK_A:
|
||
case VK_B:
|
||
case VK_C:
|
||
case VK_D:
|
||
case VK_E:
|
||
case VK_F:
|
||
case VK_G:
|
||
case VK_H:
|
||
case VK_I:
|
||
case VK_J:
|
||
case VK_K:
|
||
case VK_L:
|
||
case VK_M:
|
||
case VK_N:
|
||
case VK_O:
|
||
case VK_P:
|
||
case VK_Q:
|
||
case VK_R:
|
||
case VK_S:
|
||
case VK_T:
|
||
case VK_U:
|
||
case VK_V:
|
||
case VK_W:
|
||
case VK_X:
|
||
case VK_Y:
|
||
case VK_Z:
|
||
case VK_OPEN_BRACKET:
|
||
case VK_BACK_SLASH:
|
||
case VK_CLOSE_BRACKET:
|
||
return "" + (char) keyCode;
|
||
case VK_NUMPAD0:
|
||
case VK_NUMPAD1:
|
||
case VK_NUMPAD2:
|
||
case VK_NUMPAD3:
|
||
case VK_NUMPAD4:
|
||
case VK_NUMPAD5:
|
||
case VK_NUMPAD6:
|
||
case VK_NUMPAD7:
|
||
case VK_NUMPAD8:
|
||
case VK_NUMPAD9:
|
||
return "NumPad-" + (keyCode - VK_NUMPAD0);
|
||
case VK_F1:
|
||
case VK_F2:
|
||
case VK_F3:
|
||
case VK_F4:
|
||
case VK_F5:
|
||
case VK_F6:
|
||
case VK_F7:
|
||
case VK_F8:
|
||
case VK_F9:
|
||
case VK_F10:
|
||
case VK_F11:
|
||
case VK_F12:
|
||
return "F" + (keyCode - (VK_F1 - 1));
|
||
case VK_F13:
|
||
case VK_F14:
|
||
case VK_F15:
|
||
case VK_F16:
|
||
case VK_F17:
|
||
case VK_F18:
|
||
case VK_F19:
|
||
case VK_F20:
|
||
case VK_F21:
|
||
case VK_F22:
|
||
case VK_F23:
|
||
case VK_F24:
|
||
return "F" + (keyCode - (VK_F13 - 13));
|
||
default:
|
||
// This is funky on negative numbers, but that's Sun's fault.
|
||
return "Unknown keyCode: 0x" + (keyCode < 0 ? "-" : "")
|
||
+ Integer.toHexString(Math.abs(keyCode));
|
||
}
|
||
}
|
||
|
||
/**
|
||
* Returns a string describing the modifiers, such as "Shift" or
|
||
* "Ctrl+Button1".
|
||
*
|
||
* XXX Sun claims this can be localized via the awt.properties file - how
|
||
* do we implement that?
|
||
*
|
||
* @param modifiers the old-style modifiers to convert to text
|
||
* @return a string representation of the modifiers in this bitmask
|
||
*/
|
||
public static String getKeyModifiersText(int modifiers)
|
||
{
|
||
return getModifiersExText(EventModifier.extend(modifiers
|
||
& EventModifier.OLD_MASK));
|
||
}
|
||
|
||
/**
|
||
* Tests whether or not this key is an action key. An action key typically
|
||
* does not fire a KEY_TYPED event, and is not a modifier.
|
||
*
|
||
* @return true if this is an action key
|
||
*/
|
||
public boolean isActionKey()
|
||
{
|
||
switch (keyCode)
|
||
{
|
||
case VK_PAUSE:
|
||
case VK_CAPS_LOCK:
|
||
case VK_KANA:
|
||
case VK_FINAL:
|
||
case VK_KANJI:
|
||
case VK_CONVERT:
|
||
case VK_NONCONVERT:
|
||
case VK_ACCEPT:
|
||
case VK_MODECHANGE:
|
||
case VK_PAGE_UP:
|
||
case VK_PAGE_DOWN:
|
||
case VK_END:
|
||
case VK_HOME:
|
||
case VK_LEFT:
|
||
case VK_UP:
|
||
case VK_RIGHT:
|
||
case VK_DOWN:
|
||
case VK_F1:
|
||
case VK_F2:
|
||
case VK_F3:
|
||
case VK_F4:
|
||
case VK_F5:
|
||
case VK_F6:
|
||
case VK_F7:
|
||
case VK_F8:
|
||
case VK_F9:
|
||
case VK_F10:
|
||
case VK_F11:
|
||
case VK_F12:
|
||
case VK_NUM_LOCK:
|
||
case VK_SCROLL_LOCK:
|
||
case VK_PRINTSCREEN:
|
||
case VK_INSERT:
|
||
case VK_HELP:
|
||
case VK_KP_UP:
|
||
case VK_KP_DOWN:
|
||
case VK_KP_LEFT:
|
||
case VK_KP_RIGHT:
|
||
case VK_ALPHANUMERIC:
|
||
case VK_KATAKANA:
|
||
case VK_HIRAGANA:
|
||
case VK_FULL_WIDTH:
|
||
case VK_HALF_WIDTH:
|
||
case VK_ROMAN_CHARACTERS:
|
||
case VK_ALL_CANDIDATES:
|
||
case VK_PREVIOUS_CANDIDATE:
|
||
case VK_CODE_INPUT:
|
||
case VK_JAPANESE_KATAKANA:
|
||
case VK_JAPANESE_HIRAGANA:
|
||
case VK_JAPANESE_ROMAN:
|
||
case VK_KANA_LOCK:
|
||
case VK_INPUT_METHOD_ON_OFF:
|
||
case VK_F13:
|
||
case VK_F14:
|
||
case VK_F15:
|
||
case VK_F16:
|
||
case VK_F17:
|
||
case VK_F18:
|
||
case VK_F19:
|
||
case VK_F20:
|
||
case VK_F21:
|
||
case VK_F22:
|
||
case VK_F23:
|
||
case VK_F24:
|
||
case VK_STOP:
|
||
case VK_AGAIN:
|
||
case VK_PROPS:
|
||
case VK_UNDO:
|
||
case VK_COPY:
|
||
case VK_PASTE:
|
||
case VK_FIND:
|
||
case VK_CUT:
|
||
return true;
|
||
default:
|
||
return false;
|
||
}
|
||
}
|
||
|
||
/**
|
||
* Returns a string identifying the event. This is formatted as the
|
||
* field name of the id type, followed by the keyCode, then the
|
||
* keyChar, modifiers (if any), extModifiers (if any), and
|
||
* keyLocation.
|
||
*
|
||
* @return a string identifying the event
|
||
*/
|
||
public String paramString()
|
||
{
|
||
StringBuffer s = new StringBuffer();
|
||
|
||
switch (id)
|
||
{
|
||
case KEY_PRESSED:
|
||
s.append("KEY_PRESSED");
|
||
break;
|
||
case KEY_RELEASED:
|
||
s.append("KEY_RELEASED");
|
||
break;
|
||
case KEY_TYPED:
|
||
s.append("KEY_TYPED");
|
||
break;
|
||
default:
|
||
s.append("unknown type");
|
||
}
|
||
|
||
s.append(",keyCode=").append(keyCode);
|
||
|
||
s.append(",keyText=").append(getKeyText(keyCode));
|
||
|
||
s.append(",keyChar=");
|
||
if (isActionKey()
|
||
|| keyCode == VK_SHIFT
|
||
|| keyCode == VK_CONTROL
|
||
|| keyCode == VK_ALT)
|
||
s.append("Undefined keyChar");
|
||
else
|
||
{
|
||
/* This output string must be selected by examining keyChar
|
||
* rather than keyCode, because key code information is not
|
||
* included in KEY_TYPED events.
|
||
*/
|
||
if (keyChar == VK_BACK_SPACE
|
||
|| keyChar == VK_TAB
|
||
|| keyChar == VK_ENTER
|
||
|| keyChar == VK_ESCAPE
|
||
|| keyChar == VK_DELETE)
|
||
s.append(getKeyText(keyChar));
|
||
else
|
||
s.append("'").append(keyChar).append("'");
|
||
}
|
||
|
||
if ((modifiers & CONVERT_MASK) != 0)
|
||
s.append(",modifiers=").append(getModifiersExText(modifiers
|
||
& CONVERT_MASK));
|
||
if (modifiers != 0)
|
||
s.append(",extModifiers=").append(getModifiersExText(modifiers));
|
||
|
||
s.append(",keyLocation=KEY_LOCATION_");
|
||
switch (keyLocation)
|
||
{
|
||
case KEY_LOCATION_UNKNOWN:
|
||
s.append("UNKNOWN");
|
||
break;
|
||
case KEY_LOCATION_STANDARD:
|
||
s.append("STANDARD");
|
||
break;
|
||
case KEY_LOCATION_LEFT:
|
||
s.append("LEFT");
|
||
break;
|
||
case KEY_LOCATION_RIGHT:
|
||
s.append("RIGHT");
|
||
break;
|
||
case KEY_LOCATION_NUMPAD:
|
||
s.append("NUMPAD");
|
||
}
|
||
|
||
return s.toString();
|
||
}
|
||
|
||
/**
|
||
* Reads in the object from a serial stream.
|
||
*
|
||
* @param s the stream to read from
|
||
* @throws IOException if deserialization fails
|
||
* @throws ClassNotFoundException if deserialization fails
|
||
* @serialData default, except that the modifiers are converted to new style
|
||
*/
|
||
private void readObject(ObjectInputStream s)
|
||
throws IOException, ClassNotFoundException
|
||
{
|
||
s.defaultReadObject();
|
||
modifiers = EventModifier.extend(modifiers);
|
||
}
|
||
} // class KeyEvent
|