diff options
| author | Graydon Hoare <graydon@gcc.gnu.org> | 2004-09-02 05:10:34 +0000 |
|---|---|---|
| committer | Graydon Hoare <graydon@gcc.gnu.org> | 2004-09-02 05:10:34 +0000 |
| commit | 57579172585eae4fd6f57c0dbd55ea998ddfb63f (patch) | |
| tree | a420c1005dbef38d790847b62b0d57eb9bc758cb /libjava/javax/swing/JComboBox.java | |
| parent | 1e8964cf94aa8b0e7176434d7b31fbf040416764 (diff) | |
| download | gcc-57579172585eae4fd6f57c0dbd55ea998ddfb63f.zip gcc-57579172585eae4fd6f57c0dbd55ea998ddfb63f.tar.gz gcc-57579172585eae4fd6f57c0dbd55ea998ddfb63f.tar.bz2 | |
[multiple changes]
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextAreaUI.java
(create): New method.
* javax/swing/text/DefaultHighlighter.java
(DefaultHighlightPainter.debugRect): Removed.
* javax/swing/text/StyleContext.java
(DEFAULT_STYLE): New field.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initComponentDefaults): Add keybindings for selection.backward and
selection-forward for text components.
* javax/swing/plaf/basic/BasicTextUI.java
(paintSafely): Paint highlight only when something is actually
selected.
* javax/swing/text/DefaultCaret.java
(handleHighlight): New method.
(setSelectionVisible): Don't do anything when nothing changes.
Handle highlight.
(moveDot): Reimplemented. Handle highlight.
(setDot): Set mark too. Handle highlight.
(getSelectionPainter): New method.
* javax/swing/text/DefaultEditorKit.java
(defaultActions): Added new actions for text selection.
* javax/swing/text/DefaultHighlighter.java
(DefaultHighlightPainter): New inner class.
(DefaultPainter): New field.
(paint): Implemented.
* javax/swing/text/PlainView.java
(paint): Don't draw background here again.
* javax/swing/text/Utilities.java
(getTabbedTextWidth): Use width of ' ' instead of 'm' for tabsize.
(drawTabbedText): Likewise.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/JComponent.java
(resetKeyboardActions): Add null checks.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/DefaultButtonModel.java:
Skip group notification when no group is set.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/JColorChooser.java:
Make a couple inner classes static, for jikes.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(RottView.modelToView): New method.
(UpdateHandler): Renamed from EventHandler.
(updateHandler): Renamed from eventHandler.
(modelToView): Implemented.
* javax/swing/text/AbstractDocument.java
(BranchElement.getElement): Return null for non-existing indeces.
(BranchElement.getElementIndex): Return 0 in some corner cases.
* javax/swing/text/FieldView.java
(modelToView): New method.
* javax/swing/text/PlainView.java
(modelToView): Made public.
2004-08-31 Kim Ho <kho@redhat.com>
* Makefile.am: New files.
* Makefile.in: Regenerate.
* gcj/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* java/awt/Color.java: Fix documentation.
(RGBtoHSB): Use floats for conversions.
* javax/swing/ButtonGroup.java: Run Jalopy.
(setSelected): Reimplement.
* javax/swing/DefaultButtonModel.java: Run Jalopy.
(changeState): Let ButtonGroup know that the button
is changing state.
* javax/swing/JColorChooser.java: Implement.
* javax/swing/JLabel.java: Run Jalopy.
* javax/swing/JSpinner.java: Run Jalopy.
(setValue): New method.
* javax/swing/JTabbedPane.java: Run Jalopy.
(removeTabAt): Call correct remove method.
* javax/swing/SpinnerNumberModel.java: Run Jalopy.
(getPreviousValue): Compare minimum value.
* javax/swing/Timer.java: Run Jalopy.
(run): Comment out println.
* javax/swing/ToolTipManager.java:
(mouseMoved): Get new tooltip text for location.
* javax/swing/colorchooser/AbstractColorChooserPanel.java:
Jalopy and Javadoc.
* javax/swing/colorchooser/ColorChooserComponentFactory.java:
Implement.
* javax/swing/colorchooser/DefaultColorSelectionModel.java:
Run Jalopy.
(setSelectedColor): Fire ChangeEvent.
* javax/swing/colorchooser/DefaultHSBChooserPanel.java:
New file. Implement.
* javax/swing/colorchooser/DefaultPreviewPanel.java:
Ditto.
* javax/swing/colorchooser/DefaultRGBChooserPanel.java:
Ditto.
* javax/swing/colorchooser/DefaultSwatchChooserPanel.java:
Ditto.
* javax/swing/plaf/basic/BasicArrowButton.java:
(getArrow): Fix size of upward pointing button.
* javax/swing/plaf/basic/BasicColorChooserUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(getWidthOfWidestLabel): Use preferred dimensions.
(getHeightOfTallestLabel): Ditto.
* javax/swing/plaf/basic/BasicSpinnerUI.java:
Run Jalopy.
(mousePressed): Disable changes to spinner if it is not enabled.
* testsuite/Makefile.in: Regenerate.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTableHeaderUI.java,
javax/swing/plaf/basic/BasicTableUI.java:
Added copyright notice.
2004-08-31 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added new files.
* Makefile.in: Regenerate.
* javax/swing/ComboBoxEditor.java: Added javadocs.
* javax/swing/ComboBoxModel.java: Likewise.
* javax/swing/DefaultComboBoxModel.java: Implemented.
* javax/swing/DefaultListCellRenderer.java: Added javadocs
and ran through jalopy to fix formatting style.
(getListCellRendererComponent): Use appropriate border
if renderer has focus and use noFocusBorder when it doesn't.
* javax/swing/JComboBox.java: Implemented.
* javax/swing/JList.java:
(locationToIndex): New Method. Implemented.
(indexToLocation): New Method.
* javax/swing/JPopupMenu.java:
(visible): New field.
(isVisible): Changed to use new field above.
(setVisible): Likewise.
* javax/swing/MutableComboBoxModel.java: Added javadocs.
* javax/swing/plaf/basic/BasicArrowButton.java:
(shadow): Changed default color to Color.gray.
* javax/swing/plaf/basic/BasicComboBoxUI.java: New File.
UI delegate for JComboBox.
* javax/swing/plaf/basic/BasicComboPopup.java: New File.
Popup menu containing list of JComboBox's items.
* javax/swing/plaf/basic/BasicComboBoxEditor.java: New File.
* javax/swing/plaf/basic/BasicComboBoxRenderer.java: New File.
* javax/swing/plaf/basic/BasicComboBoxUI.java: New File.
* javax/swing/plaf/basic/BasicComboPopup.java: New File.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
(popupMenuWillBecomeVisible): Set selected path to the first
element only if it is of type MenuElement. Also fix formatting
style.
* javax/swing/plaf/basic/ComboPopup.java: Added javadocs and missing
methods signatures.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(createBranchElement): Use new constructor of BranchElement.
(createLeafElement): Renamed arguments.
(getRootElements): Implemented.
(BranchElement.start): Removed.
(BranchElement.end): Likewise.
(BranchElement.BranchElement): Fixed arguments.
(BranchElement.getEndOffset): Reimplemented.
(BranchElement.getStartOffset): Likewis.
* javax/swing/text/DefaultCaret.java
(paint): Draw simple vertical line as caret instead of a rectangle.
* javax/swing/text/JTextComponent.java
(setText): Use doc directly.
* javax/swing/text/PlainView.java
(nextTabStop): Implemented.
* javax/swing/text/Utilities.java
(drawTabbedText): nextTabStop() returns an absolute x position.
(getTabbedTextWidth): Likewise.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* java/awt/Component.java
(isFocusTraversable): Predicate on isLightweight()
(setFocusable): Set isFocusTraversableOverridden.
(requestFocus): Predicate peer dispatch on !isLightweight()
(requestFocusInWindow): Likewise.
(dispatchEventImpl): Coordinate with KeyboardFocusManager.
* java/awt/Container.java
(dispatchEventImpl): Predicate on event mask.
(LightweightDispatcher): Remove focus machinery.
* java/awt/DefaultFocusTraversalPolicy.java
(accept): Expand predicate to include isFocusable().
* java/awt/DefaultKeyboardFocusManager.java:
Globally change c.dispatchEvent(e) to redispatchEvent(c,e)
* java/awt/KeyboardFocusManager.java
(redispatchEvent): Synchronize on event to prevent feedback.
* javax/swing/AbstractButton.java
(ButtonFocusListener): Remove class.
(init): Set focusPainted, focusable.
* javax/swing/ActionMap.java (get): Check parent for null.
* javax/swing/InputMap.java (get): Likewise.
* javax/swing/JComponent.java
(inputMap_whenFocused): New InputMap.
(inputMap_whenAncestorOfFocused): Likewise.
(inputMap_whenInFocusedWindow): Likewise.
(getActionForKeyStroke): Rewrite.
(getConditionForKeystroke): Likewise.
(ActionListenerProxy): New private class.
(setInputMap): Implement.
(getInputMap): Likewise.
(setActionMap): Likewise.
(getActionMap): Likewise.
(processComponentKeyEvent): New empty method.
(processKeyEvent): Implement.
(processKeyBinding): Likewise.
(resetKeyboardActions): Rewrite.
* javax/swing/KeyStroke.java: Rewrite.
* javax/swing/SwingUtilities.java
(notifyAction): Implement.
(replaceUIActionMap): Likewise.
(replaceUIInputMap): Likewise.
* javax/swing/plaf/basic/BasicButtonListener.java
(focusGained): Implement.
(focusLost): Repaint if focusPainted().
(installKeyboardActions): Install pressed / released actions.
(uninstallKeyboardActions): Implement.
* javax/swing/plaf/basic/BasicButtonUI.java
(focusColor): New field.
(installDefaults): Load focus color, install input map.
(installKeyboardActions): Implement.
(uninstallKeyboardActions): Likewise.
(paintFocus): Rewrite.
* javax/swing/plaf/basic/BasicLookAndFeel.java
(Button.focus): New default, midPurple.
* javax/swing/plaf/basic/BasicTextUI.java
(kit): Make static.
(installUI): Get doc from kit, load defaults.
(getKeymapName): Implement.
(createKeymap): Likewise.
(installKeyboardActions): Likewise.
(getInputMap): Likewise.
(getActionMap): Likewise.
(createActionMap): Likewise.
* javax/swing/text/AbstractDocument.java
(getStartPosition): Implement.
(getEndPosition): Likewise.
* javax/swing/text/DefaultEditorKit.java
(CopyAction): New class.
(CutAction): Likewise.
(DefaultKeyTypedAction): Likewise.
(InsertBreakAction): Likewise.
(InsertContentAction): Likewise.
(InsertTabAction): Likewise.
(PasteAction): Likewise.
(defaultActions): New static table.
(createCaret): Implement.
(getActions): Likewise.
* javax/swing/text/JTextComponent.java
(KeymapWrapper): New private class.
(KeymapActionMap): Likewise.
(DefaultKeymap): New class.
(keymaps): New static table.
(keymap): New field.
(getKeymap): Implement.
(removeKeymap): Likewise.
(addKeymap): Likewise.
(setKeymap): Likewise.
(loadKeymap): Likewise.
(getActions): Likewise.
(margin): New field.
(JTextComponent): Build and install default keymap.
* javax/swing/text/TextAction.java
(textAction): Call super properly.
(getTextComponent): Implement.
* javax/swing/text/Utilities.java
(drawTabbedText): Adjust position by ascent.
2004-08-31 David Jee <djee@redhat.com>
PR AWT/17156
* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
(setEnabled): Make it a native method.
* java/awt/DefaultKeyboardFocusManager.java
(postProcessKeyEvent): Only post event if the menu item
is active.
* java/awt/MenuItem.java:
Private field 'enabled' should be true by default.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
(setEnabled): New function.
2004-08-31 David Jee <djee@redhat.com>
PR AWT/17059
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
(nativeSetHelpMenu): New native method declaration.
(addHelpMenu): Call nativeSetHelpMenu().
(addMenu): Remove.
* java/awt/MenuBar.java
(setHelpMenu): Call addNotify() on the new help menu.
(add): Call addNotify() on the new menu.
(addNotify): Set the help menu if one exists.
* java/awt/peer/MenuBarPeer.java
(addMenu): Remove.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
(nativeSetHelpMenu): New method.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Regenerate.
* javax/swing/Box.java: Fix setting of layout in ctor.
* javax/swing/JScrollPane.java: Scroll headers as well.
* javax/swing/JTable.java: Reimplement.
* javax/swing/JViewPort.java: Only add non-null children.
* javax/swing/ScrollPaneLayout.java: Correct header calculations.
* javax/swing/Timer.java: Fix stopping null waker.
* javax/swing/plaf/basic/BasicTableHeaderUI.java: New file.
* javax/swing/plaf/basic/BasicTableUI.java: New file.
* javax/swing/table/DefaultTableCellRenderer.java: Configure.
* javax/swing/table/DefaultTableColumnModel.java: Flesh out.
* javax/swing/table/DefaultTableModel.java: Clean up.
* javax/swing/table/JTableHeader.java: Implement.
2004-08-31 Mark Wielaard <mark@klomp.org>
* javax/swing/JSpinner.java (getChangeListeners): Remove double
semi-colon.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Declare variables at top of functions/block.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise.
2004-08-31 Mark Wielaard <mark@klomp.org>
* java/lang/Rectangle.java (intersects): Check r.width and r.height
first.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/PlainView.java
(selectedColor): New field.
(unselectedColor): Likewise.
(font): Likewise.
(updateMetrics): New method.
(lineToRect): Likewise.
(modelToView): Likewise.
(drawSelectedText): Use color from JTextComponent ad draw with
Utilities class.
(drawUnselectedText): Likewise.
(paint): Initialize helper fields.
* javax/swing/text/View.java
(getChildAllocation): New method.
(getViewIndex): Likewise.
(getToolTipText): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Utilities.java
(drawTabbedText): Reimplemented.
(getTabbedTextWidth): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(installDefaults): Install caret and highlighter.
(modelToView): Use Bias.Forward when calling sibling.
* javax/swing/text/AbstractDocument.java
(ElementEdit): Implements DocumentEvent.ElementChange.
(ElementEdit.ElementEdit): New method.
(ElementEdit.getChildrenAdded): Likewise.
(ElementEdit.getChildrenRemoved): Likewise.
(ElementEdit.getElement): Likewise.
(ElementEdit.getIndex): Likewise.
* javax/swing/text/DefaultCaret.java
(color): Removed.
(textComponent): Renamed from parent, made private.
(selectionVisible): Renamed from vis_sel, made private.
(blinkRate): Renamed from blink, made private.
(magicCaretPosition): Renamed from magic, made private.
(visible): Renamed from vis, made private.
(dot): Made private.
(mark): Likewise.
(deinstall): Remove as MouseMotionListener.
(install): Initialize textComponent first. Add as MouseMotionListener.
(paint): Reimplemented.
* javax/swing/text/JTextComponent.java
(setCaret): Deinstall old caret, install new one and fire property
change after setting property.
(setHighlighter): Deinstall old highlighter, install new one and fire
property change after setting property.
(setCaretColor): Fire property change after setting property.
(setDisabledTextColor): Likewise.
(setSelectedTextColor): Likewise.
(setSelectionColor): Likewise.
(modelToView): New method.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(getText): Simplified.
* javax/swing/text/Segment.java
(current): New field.
(current): Reimplemented.
(first): Likewise.
(getIndex): Likewise.
(last): Likewise.
(next): Likewise.
(previous): Likewise.
(setIndex): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicButtonUI.java
(defaultTextIconGap): Made protected.
(defaultTextShiftOffset): Likewise.
(textShiftOffset): New field.
(clearTextShiftOffset): New method.
(getTextShiftOffset): Likewise.
(setTextShiftOffset): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(installUI): Add eventHandler as property listener.
(uninstallUI): remove eventHandler as propert listener.
(installDefaults): Added comment.
(installListeners): Likewise.
(installKeyboardActions): Likewise.
(uninstallDefaults): Likewise.
(uninstallListeners): Likewise.
(uninstallKeyboardActions): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java:
Fixed some typos in comments.
(insertString): Reimplemented.
(remove): Likewise.
(replace): New method.
(children): Dont use fully qualified class name.
(DefaultDocumentEvent.offset): Renamed from off.
(DefaultDocumentEvent.length): Renamed from len.
(DefaultDocumentEvent.type): New field.
(DefaultDocumentEvent.DefaultDocumentEvent): New constructor.
(DefaultDocumentEvent.getType): Implemented.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(RootView.textComponent): Removed.
(RootView.RootView): Don't initialize textComponent.
(RootView.getViewFactory): New method.
(EventHandler): New inner class.
(rootView): Initialize at instance creation.
(eventHandler): New field.
(installUI): Don't create view hierarchy directly,
call modelChanged() instead.
(modelChanged): New method.
* javax/swing/text/JTextComponent.java
(setDocument): Fire property change event.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(RootView.paint): Removed debug output.
(paintSafely): Draw highlighter before text.
(paintBackground): Use background color of text component.
* javax/swing/plaf/basic/BasicToggleButtonUI.java:
Reformatted.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicToolBarUI.java
(BasicToolBarUI): Fixed arguments for constructor.
(createUI): Fixed creation of object.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/DefaultListSelectionModel.java
(fireValueChanged): Renamed from fireSelectionValueChanged,
made protected.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/TabSet.java
(TabSet): Implements java.io.Serializable.
* javax/swing/text/TabStop.java
(TabStop): Implements java.io.Serializable.
(TabStop): Made public.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/JComponent.java
(setUI): Fire PropertyChange.
* javax/swing/JLabel.java
(text): Renamed from labelText.
(horizontalAlignment): New default vlaue.
(icon): Renamed from activeIcon.
(displayedMnemonic): Renamed from mnemonicKey, added default value.
(displayedMnemonicIndex): Renamed from underlineChar.
(setDisplayedMnemonic): Reimplemented.
* javax/swing/JRadioButton.java
(JRadioButton): New constructors.
* javax/swing/JTextField.java
(JTextField): Throw exception if colums < 0, initialitialz
this.columns directly and initialize document with text conditionally.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicFormattedTextFieldUI.java,
javax/swing/plaf/basic/BasicPasswordFieldUI.java,
javax/swing/plaf/basic/BasicTextAreaUI.java: New files.
* javax/swing/text/FieldView.java
(paint): Just call super method for now.
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-08-31 Ka-Hing Cheung <kahing@javabsp.org>
* javax/swing/AbstractSpinnerModel.java,
javax/swing/JSpinner.java,
javax/swing/SpinnerNumberModel.java,
javax/swing/plaf/basic/BasicSpinnerUI.java:
New files.
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initClassDefaults): Added defaults for BasicSpinnerUI.
2004-08-31 Michael Koch <konqueror@gmx.de>
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/TransferHandler.java,
javax/swing/plaf/basic/ComboPopup.java: New files
* Makefile.am: Added javax/swing/TransferHandler.java and
javax/swing/plaf/basic/ComboPopup.java
* Makefile.in: Regenerated.
2004-08-31 Roman Kennke <roman@ontographics.com>
* javax/swing/text/Utilities.java: New file.
2004-08-31 Michael Koch <konqueror@gmx.de>
* Makefile.am: Added javax/swing/text/Utilities.java.
* Makefile.in: Regenerated.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/text/SimpleAttributeSet.java: New file.
* javax/swing/text/StyleConstants.java: New file.
* javax/swing/text/StyleContext.java: New file.
* javax/swing/text/TabSet.java: New file.
* javax/swing/text/TabStop.java: New file.
* javax/swing/text/AbstactDocument.java:
(AbstractElement): Implement attribute support.
* javax/swing/text/AttributeSet.java
(NameAttribute): New static field.
(ResolveAttribute): New static field.
* Makefile.am: Update for new files.
* Makefile.in: Regenerate.
2004-08-31 Craig Black <craig.black@aonix.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(drawImage): Add support for scaling pixmaps.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(copyAndScalePixmap): New native method.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
PR AWT/16121
* jni/gtk-peer/gthread-jni.c: Include stdio.h. Eliminate
type-punning compiler warnings using unions.
(throw): Replace bzero with memset.
2004-08-31 Andreas Tobler <a.tobler@schweiz.ch>
Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: Move
NSA_PB macros to gtkpeer.h. Include gtkpeer.h.
* jni/gtk-peer/gtkpeer.h: Move NSA_PB macros here.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(nativeSetIconImageFromDecoder): Use NSA_GET_PB_PTR macro.
2004-08-31 Mark Wielaard <mark@klomp.org>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:
#include gdk.h, not gtk.h. #include jni.h, native_state.h, string.h
and stdlib.h, not gtkpeer.h.
(*vm): New static variable.
(areaPreparedID): Make static.
(areaUpdatedID): Likewise.
(area_prepared): Get and use JNIEnv through stored JavaVM *vm.
(area_prepared): Likewise.
(area_updated): Likewise.
(closed): Likewise.
(initStaticState): Initialize *vm javaVM.
(pumpBytes): Use given env, not global gdk_env.
2004-08-31 Mark Wielaard <mark@klomp.org>
* java/awt/geom/CubicCurve2D.java (solveCubic): Removed duplicate
comments.
2004-08-31 Sven de Marothy <sven@physto.se>
* java/awt/geom/CubicCurve2D.java: Reindent.
(contains): Implemented.
(intersects): Implemented.
* java/awt/geom/QuadCurve2D.java: Likewise.
* java/awt/geom/GeneralPath.java: Reindent and document.
Fully (re)implemented using separate xpoints and ypoints
float[] coords.
* java/awt/geom/RoundRectangle2D.java: Several bugfixes (Bug #6007).
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/JMenuItem.java
(getMenuDragMouseListeners): New method.
(getMenuKeyListeners): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java
(model): Made protected.
(actionListener): Likewise.
(changeListener): Likewise.
(itemListener): Likewise.
(multiClickThreshhold): New field.
(getActionListeners): New method.
(getChangeListeners): Likewise.
(getItemListeners): Likewise.
(fireItemStateChanged): Simplified implementation.
(fireActionPerformed): Likewise.
(fireStateChanged): Likewise.
(getMultiClickThreshhold): New method.
(setMultiClickThreshhold): Likewise.
2004-08-31 Tom Tromey <tromey@redhat.com>
* java/awt/image/Kernel.java (clone): Use super.clone().
2004-08-31 David Jee <djee@redhat.com>
PR AWT/16682
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(nativeSetIconImage): Rename to nativeSetIconImageFromDecoder.
(nativeSetIconImageFromData): New native method declaration.
(setIconImage): Handle images not produced from GdkPixbufDecoder.
* gnu/java/awt/peer/gtk/GtkImage.java
(getPixelCache): New method.
(getColorModel): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(nativeSetIconImage): Rename to nativeSetIconImageFromDecoder.
(free_pixbuf_data): New helper function.
(nativeSetIconImageFromData): New function.
2004-08-31 Graydon Hoare <graydon@redhat.com>
PR SWING/16576
* javax/swing/JLayeredPane.java
(setLayer): Permit changing layer after addition.
(setPosition): Permit over-length positions.
(layerToRange): Compare intValue()s.
* javax/swing/Box.java (createHorizontalBox): Implement.
(createRigidArea): Likewise.
(createVerticalBox): Likewise.
2004-08-31 Kim Ho <kho@redhat.com>
* java/awt/Component.java:
(processMouseEvent): Consume event after
listeners process it.
(processMouseMotionEvent): ditto.
(processMouseWheelEvent): ditto.
* java/awt/Container.java:
(acquireComponentForMouseEvent):
Do not dispatch to events that have been
removed from the Container.
(handleEvent): Consume the MouseEvents.
* javax/swing/RepaintManager.java:
(paintDirtyRegions): Do not add to list of
damaged areas if the component has no root.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicMenuItemUI.java: Clean ip imports.
2004-08-31 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Don't return
null when a MissingResourceException is thrown. Should never happen.
2004-08-31 Mark Wielaard <mark@klomp.org>
* java/awt/EventQueue.java (postEvent): Throw NullPointerException
when argument is null.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter):
Define hid at start of function.
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter):
Likewise.
2004-08-31 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/EmbeddedWindow.java: Reindent.
* javax/swing/JButton.java: Reindent.
* javax/swing/JCheckBox.java: Reindent.
2004-08-31 Mark Wielaard <mark@klomp.org>
* Makefile.am (gtk_c_source_files): Added
jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c.
(gtk_awt_peer_sources): Added
gnu/java/awt/peer/gtk/GThreadMutex.java and
gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java.
* Makefile.in: Regenerated.
2004-08-31 Archie Cobbs <archie@dellroad.org>
* jni/gtk-peer/gthread-jni.c: don't #include nonexistent files
2004-08-31 Steven Augart <augart@watson.ibm.com>
* jni/gtk-peer/gthread-jni.c (c-font-lock-extra-types):
Added jfieldID, jmethodID.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): Initialize
gdk_env before calling any gdk or gtk function.
* gnu/java/awt/peer/gtk/GtkMainThread.java (gtkInitCalled): New field.
(GtkMainThread): Call wait() in while loop waiting for gtkInitCalled.
(run): Set gtkInitCalled.
2004-08-31 Steven Augart <augart@watson.ibm.com>
* gnu/java/awt/peer/gtk/GtkMainThread.java (run): Pass the value of
the gnu.classpath.awt.gtk.portable.native.sync system property to C.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): New argument,
portableNativeSync. Delegate PORTABLE_NATIVE_SYNC work to
init_glib_threads.
(init_glib_threads): New function.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_
PRIORITY when not already defined in header file.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gthread-jni.c (setup_cache): Call
ExceptionOccurred, not ExceptionCheck, when we don't have JNI 1.2.
2004-08-31 Steven Augart <augart@watson.ibm.com>
* gnu/native/jni/gtk-peer/gthread-jni.c: Indentation fixes.
Implemented missing functions for GTK2.
Added error handling.
Renamed static functions out of the g_ namespace.
Added TRACE_API_CALLS, EXPLAIN_TROUBLE, EXPLAIN_BROKEN,
EXPLAIN_BADLY_BROKEN, and DELETE_LOCAL_REFS options.
Rewrote global-reference code.
Eliminated cascading errors.
(mutex_trylock_jni_impl) Fully implemented.
(cond_timed_wait_jni_impl) Went from millisecond to microsecond
resolution.
(setup_cache) New function.
(mutex_cond_wait_jni_impl, mutex_cond_timed_wait_jni_impl) Fixed
bug where they were not unlocking the GMutex associated with the
condition variable during the wait on that condition variable.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
native/jni/gtk-peer/gthread-jni.c,
native/jni/gtk-peer/gthread-jni.h
(g_thread_jni_functions): Renamed to ...
(portable_native_sync_jni_functions): this name.
(gdk_vm): Renamed to...
(the_vm): this name.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(gdk_vm): Removed duplicate definition.
(gtkInit): Removed stray message to stdout.
(gtkInit): Use g_malloc and g_free instead of malloc and free.
(gtkInit): Fix a const assignment bug.
(gtkInit): Simplified code.
* gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h,
gnu/java/awt/peer/gtk/GThreadMutex.java:
New files.
2004-08-31 Mark Wielaard <mark@klomp.org>
* javax/swing/Box.java: Put FIXME comment above class declaration.
* javax/swing/JButton.java: Remove illegal L&F HTML from comments.
* javax/swing/JCheckBox.java: Likewise.
* javax/swing/JDialog.java: Likewise.
* javax/swing/JRadioButton.java: Likewise.
* javax/swing/JToggleButton.java: Likewise.
* javax/swing/UIManager.java: Likewise.
* javax/swing/border/TitledBorder.java: Likewise.
* javax/swing/plaf/basic/BasicLabelUI.java: Likewise.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise.
* javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: Likewise.
* javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise.
* javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise.
* javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise.
* javax/swing/text/JTextComponent.java: Likewise.
2004-08-31 David Jee <djee@redhat.com>
PR AWT/16682
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(setIconImage): Add a FIXME for unhandled cases.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
PR AWT/16040
* gnu/awt/LightweightRedirector.java: Call getModifiersEx, not
getModifiers. Replace old button masks with new ones.
* gnu/awt/xlib/XEventLoop.java: Likewise.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
* gnu/java/awt/peer/gtk/GtkListPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise.
* java/awt/AWTKeyStroke.java: Remove old modifier masks.
* java/awt/Component.java: Replace old modifier masks with new
ones.
* java/awt/Container.java: Call getModifiersEx, not
getModifiers.
* java/awt/DefaultKeyboardFocusManager.java: Likewise. Remove
old modifier masks.
* javax/swing/JMenuItem.java: Replace old button masks with new
ones.
* javax/swing/KeyStroke.java: Call getModifiersEx, not
getModifiers.
* javax/swing/SwingUtilities.java: Likewise.
* javax/swing/plaf/basic/BasicButtonListener.java: Likewise.
* javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Replace old
mask macros with new ones.
* jni/gtk-peer/gtkpeer.h: Replace old button and modifier mask
macros with new ones representing new masks.
2004-08-31 Craig Black <craig.black@aonix.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(drawRoundRect): Implemented.
(fillRoundRect): Implemented.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRoundRect): Reimplemented to match GdkGraphics.
(fillRoundRect): Reimplemented to match GdkGraphics.
2004-08-31 Mark Wielaard <mark@klomp.org>
* Makefile.in: Regenerated.
2004-08-31 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/EmbeddedWindow.java
(addNotify): Use AccessController to allow execution of privileged
code.
2004-08-31 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/EmbeddedWindow.java
(static): Removed.
(addNotify): Set peer via reflection.
(setWindowPeer): Removed.
* gnu/java/awt/natEmbeddedWindow.cc: Removed.
* Makefile.am (nat_source_files):
Removed gnu/java/awt/natEmbeddedWindow.cc.
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* Makefile.am: Add gnu/java/security/action/GetPropertyAction.java
and gnu/java/security/action/SetAccessibleAction.java.
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* gnu/java/security/action/GetPropertyAction.java (setParameters):
Renamed from 'setName'. New 2-argument form with default value.
(run): Pass default 'value' parameter to System.getProperty().
* gnu/java/security/action/SetAccessibleAction.java: Fix javadoc
typos.
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* gnu/java/security/action/GetPropertyAction.java: New class.
* gnu/java/security/action/SetAccessibleAction.java: New class.
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(setIconImage): Check if image is null.
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(create): Set the icon image.
(nativeSetIconImage): New native method declaration.
(setIconImage): Implement.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(nativeSetIconImage): New function.
2004-08-31 Dalibor Topic <robilad@kaffe.org>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(filenameFilterCallback): Declare local variable accepted before use.
2004-08-31 Dalibor Topic <robilad@kaffe.org>
* gnu/java/awt/ComponentDataBlitOp.java:
Cleaned up imports.
2004-08-31 Tom Tromey <tromey@redhat.com>
* gnu/java/awt/peer/GLightweightPeer.java,
gnu/java/awt/peer/gtk/GdkGraphics2D.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
javax/swing/JScrollPane.java: Removed
redundant imports.
2004-08-31 David Jee <djee@redhat.com>
* java/awt/DefaultKeyboardFocusManager.java
(postProcessKeyEvent): Only activate MenuShortcuts on KEY_PRESSED
event. Fix shift modifier checking.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
(accel_attach): Remove.
(setupAccelGroup): Remove calls to accel_attach.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkArg.java: Remove file.
* gnu/java/awt/peer/gtk/GtkArgList.java: Remove file.
* Makefile.am (gtk_awt_peer_sources): Remove GtkArg.java and
GtkArgList.java.
(gtk_c_files): Use CAIRO_CFLAGS and PANGOFT2_CFLAGS, not _LIBS.
* Makefile.in: Regenerate.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
(create(String)): New method.
(create): Call new create method.
(getArgs): Remove method.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(nativeCreate): Rename to create.
(gtkSetLabel): Rename to gtkButtonSetLabel.
(gtkToggleButtonSetActive): New method.
(create): Call gtkToggleButtonSetActive and gtkButtonSetLabel.
(setState): Replace set call with gtkToggleButtonSetActive.
(setLabel): Replace gtkSetLabel call with gtkButtonSetLabel.
(getArgs): Remove method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(gtkWidgetSetSensitive): New method.
(gtkWidgetSetParent): Likewise.
(GtkComponentPeer): Call setParent, setComponentBounds and
setVisibleAndEnabled.
(setParent): New method.
(setComponentBounds): New method.
(setVisibleAndEnabled): New method.
(setEnabled): Call gtkWidgetSetSensitive.
(getArgs): Remove method.
Remove all set methods.
* gnu/java/awt/peer/gtk/GtkDialogPeer.java (create): Call
gtkWindowSetModal, setTitle and setResizable.
(getArgs): Remove method.
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
(setComponentBounds): New method.
* gnu/java/awt/peer/gtk/GtkFramePeer.java (setResizable):
Replace set call with gtkWindowSetResizable.
(getArgs): Remove method.
(create): Call setTitle and setResizable.
* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(gtkWindowSetTitle): New method.
(gtkWindowSetResizable): New method.
(gtkWindowSetModal): New method.
(setParent): New method.
(setVisibleAndEnabled): New method.
(getArgs): Remove method.
(setTitle): Call gtkWindowSetTitle.
(setResizable): Call gtkWindowSetResizable.
* jni/gtk-peer/gtkpeer.h [DEBUG_LOCKING]: New define to turn on
and off locking instrumentation.
2004-08-31 Kim Ho <kho@redhat.com>
* Makefile.am: Add new file.
* Makefile.in: Regenerate.
* gcj/Makefile.in: Regenerate
* include/Makefile.in:
* java/awt/Container.java:
(acquireComponentForMouseEvent): Respect
the event mask when looking for candidate.
* javax/swing/JComponent.java:
Remove toolTip field.
(createToolTip): Create a tooltip on demand.
(setToolTipText): Register with the ToolTipManager.
(getToolTipText(MouseEvent)): Return getToolTipText().
* javax/swing/JToolTip.java: Implement.
* javax/swing/Timer.java: Jalopy.
(restart): Call stop, then start.
(stop): Interrupt the timer rather than wait for
the timer to come to a stop naturally.
* javax/swing/ToolTipManager.java: Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Change ToolTip.background color.
* javax/swing/plaf/basic/BasicToolTipUI.java:
Implement.
* testsuite/Makefile.in: Regenerate
2004-08-31 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/DirectColorModel.java (DirectColorModel): Fix
constructor param comments.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java: Document AWT 1.0 event handler
methods.
2004-08-31 Roman Kennke <roman@ontographics.com>
* javax/swing/Box.java:
(createGlue): Implemented
(createHorizontalGlue): Implemented
(createHorizontalStrut): Implemented
(createVerticalGlue): Implemented
(createVerticalStrut): Implemented
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkChoicePeer.java
(GtkChoicePeer): Do not automatically select first item.
(getHistory): Remove.
(nativeGetSelected): New method.
(nativeRemoveAll): New method.
(add): Use nativeGetSelected() instead of getHistory().
(remove): Likewise.
(removeAll): Call nativeRemoveAll().
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
(create): Migrate to GtkComboBox.
(append): Likewise.
(nativeAdd): Likewise.
(nativeRemove): Likewise.
(select): Likewise.
(nativeRemoveAll): New method.
(nativeGetSelected): New method.
(selection_changed): New method.
(getHistory): Remove.
(item_activate): Remove.
(item_removed): Remove.
(connect_choice_item_selectable_hook): Remove.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Use tf
variable in setEditable call.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
(gtkWidgetSetBackground): New method.
(gtkWidgetSetForeground): Likewise.
(create): Set peer's editable state based on awtComponent's.
* java/awt/Button.java (Button()): Use empty string rather than
null in no-label constructor.
2004-08-31 Roman Kennke <roman@ontographics.com>
* javax/swing/BoxLayout.java: Reimplement.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu_java_awt_peer_gtk_GdkGraphics.c
(initState(GtkComponentPeer)): Don't return array of colour
values.
(GdkGraphics(int,int)): Set default font to size 12.
(GdkGraphics(GtkComponentPeer)): Set graphics colour to
component's foreground colour.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java,
gnu_java_awt_peer_gtk_GdkGraphics2D.c
(initState(GtkComponentPeer)): Don't return array of colour
values.
(GdkGraphics2D(GtkComponentPeer)): Set foreground and background
colours to component's colours.
(current_colors_of_widget): Remove function.
* gnu/java/awt/peer/gtk/GtkOffScreenImage.java (getGraphics):
Return a new graphics object.
* java/awt/Font.java (toString): Fix format.
* java/awt/Graphics.java (toString): Likewise.
2004-08-31 Craig Black <craig.black@aonix.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
(addTearOff): New function.
* gnu/java/awt/peer/gtk/GtkMenuPeer.java (addTearOff):
New native method.
(init): Call addTearOff() when menu.isTearOff().
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* gnu/java/awt/ClasspathToolkit.java (createImageProducer): New.
Default implementation.
* gnu/java/awt/peer/gtk/GtkToolkit.java (createImageProducer): New.
Implement using GdkPixbufDecoder.
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(GtkComponentPeer): Use gtkWidgetGetPreferredDimensions() for
setting the size of GtkFileDialogPeers.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(gtkWidgetGetPreferredDimensions): For widgets extending GtkWindow,
use their default sizes rather than their natural requisitions.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/JFormattedTextField.java
(JFormattedTextField): Implemented.
* javax/swing/text/DefaultEditorKit.java
(BeepAction): New inner class.
* javax/swing/text/Segment.java
(partialReturn): New field.
(setPartialReturn): New method.
(isPartialReturn): Likewise.
* javax/swing/text/View.java
(createFragment): Fixed typo.
(getStartOffset): New method.
(getEndOffset): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/table/DefaultTableColumnModel.java
(serialVersionUID): Made private.
(listenerList): Initialize.
(changeEvent): Initialize.
* javax/swing/table/JTableHeader.java
(JTableHeader): New constructors.
(createDefaultColumnModel): New method.
* javax/swing/table/TableColumn.java
(setHeaderRenderer): Simplified code.
(setCellRenderer): Likewise.
(setWidth): Likewise.
From-SVN: r86956
Diffstat (limited to 'libjava/javax/swing/JComboBox.java')
| -rw-r--r-- | libjava/javax/swing/JComboBox.java | 1791 |
1 files changed, 1047 insertions, 744 deletions
diff --git a/libjava/javax/swing/JComboBox.java b/libjava/javax/swing/JComboBox.java index b66dcb3..9d480dc 100644 --- a/libjava/javax/swing/JComboBox.java +++ b/libjava/javax/swing/JComboBox.java @@ -35,761 +35,958 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - package javax.swing; +import java.awt.Component; +import java.awt.Dimension; import java.awt.ItemSelectable; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.KeyEvent; +import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.IOException; import java.io.ObjectOutputStream; import java.util.Vector; - import javax.accessibility.Accessible; import javax.accessibility.AccessibleAction; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleSelection; +import javax.swing.JComponent; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.event.PopupMenuListener; import javax.swing.plaf.ComboBoxUI; + /** - * JComboBox - * @author Andrew Selkirk - * @version 1.0 + * JComboBox. JComboBox is a container, that keeps track of elements added to + * it by the user. JComboBox allows user to select any item in its list and + * displays the selected item to the user. JComboBox also can show/hide popup + * menu containing its list of item whenever the mouse is pressed over it. + * + * @author Andrew Selkirk + * @author Olga Rodimina */ -public class JComboBox extends JComponent - implements ItemSelectable, ListDataListener, ActionListener, Accessible +public class JComboBox extends JComponent implements ItemSelectable, + ListDataListener, + ActionListener, + Accessible { private static final long serialVersionUID = 5654585963292734470L; /** - * AccessibleJComboBox + * KeySelectionManager interface. Class implementing this interface are + * responsible for matching key characters typed by the user with combo + * box's items. */ - protected class AccessibleJComboBox extends AccessibleJComponent - implements AccessibleAction, AccessibleSelection + public static interface KeySelectionManager { - private static final long serialVersionUID = 8217828307256675666L; + int selectionForKey(char aKey, ComboBoxModel aModel); + } + + /** + * Maximum number of rows that should be visible by default in the + * JComboBox's popup + */ + public static final int DEFAULT_MAXIMUM_ROW_COUNT = 8; + + /** + * Fired in a PropertyChangeEvent when the 'editable' property changes. + */ + public static final String EDITABLE_CHANGED_PROPERTY = "editable"; + + /** + * Fired in a PropertyChangeEvent when the 'maximumRowCount' property + * changes. + */ + public static final String MAXIMUM_ROW_COUNT_CHANGED_PROPERTY = "maximumRowCount"; + + /** + * Fired in a PropertyChangeEvent when the 'enabled' property changes. + */ + public static final String ENABLED_CHANGED_PROPERTY = "enabled"; + + /** + * Fired in a PropertyChangeEvent when the 'renderer' property changes. + */ + public static final String RENDERER_CHANGED_PROPERTY = "renderer"; + + /** + * Fired in a PropertyChangeEvent when the 'editor' property changes. + */ + public static final String EDITOR_CHANGED_PROPERTY = "editor"; + + /** + * Fired in a PropertyChangeEvent when the 'dataModel' property changes. + */ + public static final String MODEL_CHANGED_PROPERTY = "dataModel"; + + /** + * name for the UI delegate for this combo box. + */ + private static final String uiClassID = "ComboBoxUI"; + + /** + * dataModel used by JComboBox to keep track of its list data and currently + * selected element in the list. + */ + protected ComboBoxModel dataModel; + + /** + * Renderer renders(paints) every object in the combo box list in its + * associated list cell. This ListCellRenderer is used only when this + * JComboBox is uneditable. + */ + protected ListCellRenderer renderer; + + /** + * editor that is responsible for editting an object in a combo box list + */ + protected ComboBoxEditor editor; + + /** + * Number of rows that will be visible in the JComboBox's popup. + */ + protected int maximumRowCount; + + /** + * This field indicates if textfield of this JComboBox is editable or not. + */ + protected boolean isEditable; + + /** + * This field is reference to the current selection of the combo box. + */ + protected Object selectedItemReminder; + + /** + * keySelectionManager + */ + protected KeySelectionManager keySelectionManager; + + /** + * This actionCommand is used in ActionEvent that is fired to JComboBox's + * ActionListeneres. + */ + protected String actionCommand; + + /** + * This property indicates if heavyweight popup or lightweight popup will be + * used to diplay JComboBox's elements. + */ + protected boolean lightWeightPopupEnabled; + + /** + * The action taken when new item is selected in the JComboBox + */ + private Action action; + + /** + * since 1.4 If this field is set then comboBox's display area for the + * selected item will be set by default to this value. + */ + private Object prototypeDisplayValue; + + /** + * Constructs JComboBox object with specified data model for it. The first + * item in the specified data model is selected by default. + * + * @param model Data model that will be used by this JComboBox to keep track + * of its list of items. + */ + public JComboBox(ComboBoxModel model) + { + setEditable(false); + setEnabled(true); + setMaximumRowCount(DEFAULT_MAXIMUM_ROW_COUNT); + setModel(model); + setActionCommand("comboBoxChanged"); + + // by default set selected item to the first element in the combo box + if (getItemCount() != 0) + setSelectedItem(getItemAt(0)); + + lightWeightPopupEnabled = true; + isEditable = false; + + updateUI(); + } + + /** + * Constructs JComboBox with specified list of items. + * + * @param itemArray array containing list of items for this JComboBox + */ + public JComboBox(Object[] itemArray) + { + this(new DefaultComboBoxModel(itemArray)); + } + + /** + * Constructs JComboBox object with specified list of items. + * + * @param itemVector vector containing list of items for this JComboBox. + */ + public JComboBox(Vector itemVector) + { + this(new DefaultComboBoxModel(itemVector)); + } + + /** + * Constructor. Creates new empty JComboBox. ComboBox's data model is set to + * DefaultComboBoxModel. + */ + public JComboBox() + { + this(new DefaultComboBoxModel()); + } + + private void writeObject(ObjectOutputStream stream) throws IOException + { + } + + /** + * This method returns true JComboBox is editable and false otherwise + * + * @return boolean true if JComboBox is editable and false otherwise + */ + public boolean isEditable() + { + return isEditable; + } - /** - * Constructor AccessibleJComboBox - * @param component TODO + /* + * This method adds ancestor listener to this JComboBox. + */ + protected void installAncestorListener() + { + /* FIXME: Need to implement. + * + * Need to add ancestor listener to this JComboBox. This listener + * should close combo box's popup list of items whenever it + * receives an AncestorEvent. */ - protected AccessibleJComboBox() - { - } + } + + /** + * Set the "UI" property of the combo box, which is a look and feel class + * responsible for handling comboBox's input events and painting it. + * + * @param ui The new "UI" property + */ + public void setUI(ComboBoxUI ui) + { + super.setUI(ui); + } + + /** + * This method sets this comboBox's UI to the UIManager's default for the + * current look and feel. + */ + public void updateUI() + { + setUI((ComboBoxUI) UIManager.getUI(this)); + invalidate(); + } + + /** + * This method returns the String identifier for the UI class to the used + * with the JComboBox. + * + * @return The String identifier for the UI class. + */ + public String getUIClassID() + { + return uiClassID; + } + + /** + * This method returns the UI used to display the JComboBox. + * + * @return The UI used to display the JComboBox. + */ + public ComboBoxUI getUI() + { + return (ComboBoxUI) ui; + } + + /** + * Set the data model for this JComboBox. This un-registers all listeners + * associated with the current model, and re-registers them with the new + * model. + * + * @param newDataModel The new data model for this JComboBox + */ + public void setModel(ComboBoxModel newDataModel) + { + if (this.dataModel == newDataModel) + return; + + if (this.dataModel != null) + // remove all listeners currently registered with the model. + dataModel.removeListDataListener(this); + + ComboBoxModel oldDataModel = this.dataModel; + this.dataModel = newDataModel; + + if (this.dataModel != null) + // register all listeners with the new data model + dataModel.addListDataListener(this); + + firePropertyChange(MODEL_CHANGED_PROPERTY, oldDataModel, this.dataModel); + } + + /** + * This method returns data model for this comboBox. + * + * @return ComboBoxModel containing items for this combo box. + */ + public ComboBoxModel getModel() + { + return dataModel; + } + + /** + * This method sets JComboBox's popup to be either lightweight or + * heavyweight. If 'enabled' is true then lightweight popup is used and + * heavyweight otherwise. By default lightweight popup is used to display + * this JComboBox's elements. + * + * @param enabled indicates if lightweight popup or heavyweight popup should + * be used to display JComboBox's elements. + */ + public void setLightWeightPopupEnabled(boolean enabled) + { + this.lightWeightPopupEnabled = enabled; + } + + /** + * This method returns whether popup menu that is used to display list of + * combo box's item is lightWeight or not. + * + * @return boolean true if popup menu is lightweight and false otherwise. + */ + public boolean isLightWeightPopupEnabled() + { + return lightWeightPopupEnabled; + } + + /** + * This method sets editability of the combo box. If combo box is editable + * the user can choose component from the combo box list by typing + * component's name in the editor(JTextfield by default). Otherwise if not + * editable, the user should use the list to choose the component. This + * method fires PropertyChangeEvents to JComboBox's registered + * PropertyChangeListeners to indicate that 'editable' property of the + * JComboBox has changed. + * + * @param editable indicates if the JComboBox's textfield should be editable + * or not. + */ + public void setEditable(boolean editable) + { + if (this.isEditable != editable) + { + this.isEditable = editable; + firePropertyChange(EDITABLE_CHANGED_PROPERTY, ! isEditable, isEditable); + } + } + + /** + * Sets number of rows that should be visible in this JComboBox's popup. If + * this JComboBox's popup has more elements that maximum number or rows + * then popup will have a scroll pane to allow users to view other + * elements. + * + * @param rowCount number of rows that will be visible in JComboBox's popup. + */ + public void setMaximumRowCount(int rowCount) + { + if (maximumRowCount != rowCount) + { + int oldMaximumRowCount = this.maximumRowCount; + this.maximumRowCount = rowCount; + firePropertyChange(MAXIMUM_ROW_COUNT_CHANGED_PROPERTY, + oldMaximumRowCount, this.maximumRowCount); + } + } + + /** + * This method returns number of rows visible in the JComboBox's list of + * items. + * + * @return int maximun number of visible rows in the JComboBox's list. + */ + public int getMaximumRowCount() + { + return maximumRowCount; + } + + /** + * This method sets cell renderer for this JComboBox that will be used to + * paint combo box's items. The Renderer should only be used only when + * JComboBox is not editable. In the case when JComboBox is editable the + * editor must be used. This method also fires PropertyChangeEvent when + * cellRendered for this JComboBox has changed. + * + * @param aRenderer cell renderer that will be used by this JComboBox to + * paint its elements. + */ + public void setRenderer(ListCellRenderer aRenderer) + { + if (this.renderer != aRenderer) + { + ListCellRenderer oldRenderer = this.renderer; + this.renderer = aRenderer; + firePropertyChange(RENDERER_CHANGED_PROPERTY, oldRenderer, + this.renderer); + } + } + + /** + * This method returns renderer responsible for rendering selected item in + * the combo box + * + * @return ListCellRenderer + */ + public ListCellRenderer getRenderer() + { + return renderer; + } + + /** + * Sets editor for this JComboBox + * + * @param newEditor ComboBoxEditor for this JComboBox. This method fires + * PropertyChangeEvent when 'editor' property is changed. + */ + public void setEditor(ComboBoxEditor newEditor) + { + if (editor == newEditor) + return; + + if (editor != null) + editor.removeActionListener(this); + + ComboBoxEditor oldEditor = editor; + editor = newEditor; + + if (editor != null) + editor.addActionListener(this); + + firePropertyChange(EDITOR_CHANGED_PROPERTY, oldEditor, editor); + } + + /** + * Returns editor component that is responsible for displaying/editting + * selected item in the combo box. + * + * @return ComboBoxEditor + */ + public ComboBoxEditor getEditor() + { + return editor; + } + + /** + * Forces combo box to select given item + * + * @param item element in the combo box to select. + */ + public void setSelectedItem(Object item) + { + dataModel.setSelectedItem(item); + } + + /** + * Returns currently selected item in the combo box. + * + * @return element that is currently selected in this combo box. + */ + public Object getSelectedItem() + { + Object item = dataModel.getSelectedItem(); + + if (item == null && getItemCount() != 0) + item = getItemAt(0); + + return item; + } - /** - * getAccessibleChildrenCount - * @returns int - */ - public int getAccessibleChildrenCount() { - return 0; // TODO - } // getAccessibleChildrenCount() - - /** - * getAccessibleChild - * @param value0 TODO - * @returns Accessible - */ - public Accessible getAccessibleChild(int value0) { - return null; // TODO - } // getAccessibleChild() - - /** - * getAccessibleSelection - * @returns AccessibleSelection - */ - public AccessibleSelection getAccessibleSelection() { - return null; // TODO - } // getAccessibleSelection() - - /** - * getAccessibleSelection - * @param value0 TODO - * @returns Accessible - */ - public Accessible getAccessibleSelection(int value0) { - return null; // TODO - } // getAccessibleSelection() - - /** - * isAccessibleChildSelected - * @param value0 TODO - * @returns boolean - */ - public boolean isAccessibleChildSelected(int value0) { - return false; // TODO - } // isAccessibleChildSelected() - - /** - * getAccessibleRole - * @returns AccessibleRole - */ - public AccessibleRole getAccessibleRole() { - return AccessibleRole.COMBO_BOX; - } // getAccessibleRole() - - /** - * getAccessibleAction - * @returns AccessibleAction - */ - public AccessibleAction getAccessibleAction() { - return null; // TODO - } // getAccessibleAction() - - /** - * getAccessibleActionDescription - * @param value0 TODO - * @returns String - */ - public String getAccessibleActionDescription(int value0) { - return null; // TODO - } // getAccessibleActionDescription() - - /** - * getAccessibleActionCount - * @returns int - */ - public int getAccessibleActionCount() { - return 0; // TODO - } // getAccessibleActionCount() - - /** - * doAccessibleAction - * @param value0 TODO - * @returns boolean - */ - public boolean doAccessibleAction(int value0) { - return false; // TODO - } // doAccessibleAction() - - /** - * getAccessibleSelectionCount - * @returns int - */ - public int getAccessibleSelectionCount() { - return 0; // TODO - } // getAccessibleSelectionCount() - - /** - * addAccessibleSelection - * @param value0 TODO - */ - public void addAccessibleSelection(int value0) { - // TODO - } // addAccessibleSelection() - - /** - * removeAccessibleSelection - * @param value0 TODO - */ - public void removeAccessibleSelection(int value0) { - // TODO - } // removeAccessibleSelection() - - /** - * clearAccessibleSelection - */ - public void clearAccessibleSelection() { - // TODO - } // clearAccessibleSelection() - - /** - * selectAllAccessibleSelection - */ - public void selectAllAccessibleSelection() { - // TODO - } // selectAllAccessibleSelection() - - - } // AccessibleJComboBox - - /** - * KeySelectionManager - */ - public static interface KeySelectionManager { - - //------------------------------------------------------------- - // Methods ---------------------------------------------------- - //------------------------------------------------------------- - - /** - * selectionForKey - * @param value0 TODO - * @param value1 TODO - * @returns int - */ - int selectionForKey(char value0, ComboBoxModel value1); - - - } // KeySelectionManager - - - //------------------------------------------------------------- - // Variables -------------------------------------------------- - //------------------------------------------------------------- - - /** - * uiClassID - */ - private static final String uiClassID = "ComboBoxUI"; - - /** - * dataModel - */ - protected ComboBoxModel dataModel; - - /** - * renderer - */ - protected ListCellRenderer renderer; - - /** - * editor - */ - protected ComboBoxEditor editor; - - /** - * maximumRowCount - */ - protected int maximumRowCount; - - /** - * isEditable - */ - protected boolean isEditable; - - /** - * selectedItemReminder - */ - protected Object selectedItemReminder; - - /** - * keySelectionManager - */ - protected JComboBox.KeySelectionManager keySelectionManager; - - /** - * actionCommand - */ - protected String actionCommand; - - /** - * lightWeightPopupEnabled - */ - protected boolean lightWeightPopupEnabled; - - - //------------------------------------------------------------- - // Initialization --------------------------------------------- - //------------------------------------------------------------- - - /** - * Constructor JComboBox - * @param value0 TODO - */ - public JComboBox(ComboBoxModel value0) { - // TODO - } // JComboBox() - - /** - * Constructor JComboBox - * @param value0 TODO - */ - public JComboBox(Object[] value0) { - // TODO - } // JComboBox() - - /** - * Constructor JComboBox - * @param value0 TODO - */ - public JComboBox(Vector value0) { - // TODO - } // JComboBox() - - /** - * Constructor JComboBox - */ - public JComboBox() { - // TODO - } // JComboBox() - - - //------------------------------------------------------------- - // Methods ---------------------------------------------------- - //------------------------------------------------------------- - - /** - * writeObject - * @param stream TODO - * @exception IOException TODO - */ - private void writeObject(ObjectOutputStream stream) throws IOException { - // TODO - } // writeObject() - - /** - * isEditable - * @returns boolean - */ - public boolean isEditable() { - return false; // TODO - } // isEditable() - - /** - * installAncestorListener - */ - protected void installAncestorListener() { - // TODO - } // installAncestorListener() - - /** - * setUI - * @param ui TODO - */ - public void setUI(ComboBoxUI ui) { - super.setUI(ui); - } // setUI() - - /** - * updateUI - */ - public void updateUI() { - setUI((ComboBoxUI) UIManager.get(this)); - invalidate(); - } // updateUI() - - /** - * getUIClassID - * @returns String - */ - public String getUIClassID() { - return uiClassID; - } // getUIClassID() - - /** - * getUI - * @returns ComboBoxUI - */ - public ComboBoxUI getUI() { - return (ComboBoxUI) ui; - } // getUI() - - /** - * setModel - * @param value0 TODO - */ - public void setModel(ComboBoxModel value0) { - // TODO - } // setModel() - - /** - * getModel - * @returns ComboBoxModel - */ - public ComboBoxModel getModel() { - return null; // TODO - } // getModel() - - /** - * setLightWeightPopupEnabled - * @param value0 TODO - */ - public void setLightWeightPopupEnabled(boolean value0) { - // TODO - } // setLightWeightPopupEnabled() - - /** - * isLightWeightPopupEnabled - * @returns boolean - */ - public boolean isLightWeightPopupEnabled() { - return false; // TODO - } // isLightWeightPopupEnabled() - - /** - * setEditable - * @param value0 TODO - */ - public void setEditable(boolean value0) { - // TODO - } // setEditable() - - /** - * setMaximumRowCount - * @param value0 TODO - */ - public void setMaximumRowCount(int value0) { - // TODO - } // setMaximumRowCount() - - /** - * getMaximumRowCount - * @returns int - */ - public int getMaximumRowCount() { - return 0; // TODO - } // getMaximumRowCount() - - /** - * setRenderer - * @param value0 TODO - */ - public void setRenderer(ListCellRenderer value0) { - // TODO - } // setRenderer() - - /** - * getRenderer - * @returns ListCellRenderer - */ - public ListCellRenderer getRenderer() { - return null; // TODO - } // getRenderer() - - /** - * setEditor - * @param value0 TODO - */ - public void setEditor(ComboBoxEditor value0) { - // TODO - } // setEditor() - - /** - * getEditor - * @returns ComboBoxEditor - */ - public ComboBoxEditor getEditor() { - return null; // TODO - } // getEditor() - - /** - * setSelectedItem - * @param value0 TODO - */ - public void setSelectedItem(Object value0) { - // TODO - } // setSelectedItem() - - /** - * getSelectedItem - * @returns Object - */ - public Object getSelectedItem() { - return null; // TODO - } // getSelectedItem() - - /** - * setSelectedIndex - * @param value0 TODO - */ - public void setSelectedIndex(int value0) { - // TODO - } // setSelectedIndex() - - /** - * getSelectedIndex - * @returns int - */ - public int getSelectedIndex() { - return 0; // TODO - } // getSelectedIndex() - - /** - * addItem - * @param value0 TODO - */ - public void addItem(Object value0) { - // TODO - } // addItem() - - /** - * insertItemAt - * @param value0 TODO - * @param value1 TODO - */ - public void insertItemAt(Object value0, int value1) { - // TODO - } // insertItemAt() - - /** - * removeItem - * @param value0 TODO - */ - public void removeItem(Object value0) { - // TODO - } // removeItem() - - /** - * removeItemAt - * @param value0 TODO - */ - public void removeItemAt(int value0) { - // TODO - } // removeItemAt() - - /** - * removeAllItems - */ - public void removeAllItems() { - // TODO - } // removeAllItems() - - /** - * showPopup - */ - public void showPopup() { - // TODO - } // showPopup() - - /** - * hidePopup - */ - public void hidePopup() { - // TODO - } // hidePopup() - - /** - * setPopupVisible - * @param value0 TODO - */ - public void setPopupVisible(boolean value0) { - // TODO - } // setPopupVisible() - - /** - * isPopupVisible - * @returns boolean - */ - public boolean isPopupVisible() { - return false; // TODO - } // isPopupVisible() - - /** - * setActionCommand - * @param value0 TODO - */ - public void setActionCommand(String value0) { - // TODO - } // setActionCommand() - - /** - * getActionCommand - * @returns String - */ - public String getActionCommand() { - return null; // TODO - } // getActionCommand() - - /** - * setAction - * @param value0 TODO - */ - public void setAction(Action value0) { - // TODO - } // setAction() - - /** - * isListener - * @param value0 TODO - * @param value1 TODO - * @returns boolean - */ - private boolean isListener(Class value0, ActionListener value1) { - return false; // TODO - } // isListener() - - /** - * getAction - * @returns Action - */ - public Action getAction() { - return null; // TODO - } // getAction() - - /** - * configurePropertiesFromAction - * @param value0 TODO - */ - protected void configurePropertiesFromAction(Action value0) { - // TODO - } // configurePropertiesFromAction() - - /** - * createActionPropertyChangeListener - * @param value0 TODO - * @returns PropertyChangeListener - */ - protected PropertyChangeListener createActionPropertyChangeListener(Action value0) { - return null; // TODO - } // createActionPropertyChangeListener() - - /** - * fireItemStateChanged - * @param value0 TODO - */ - protected void fireItemStateChanged(ItemEvent value0) { - // TODO - } // fireItemStateChanged() - - /** - * fireActionEvent - */ - protected void fireActionEvent() { - // TODO - } // fireActionEvent() - - /** - * selectedItemChanged - */ - protected void selectedItemChanged() { - // TODO - } // selectedItemChanged() - - /** - * getSelectedObjects - * @returns Object[] - */ - public Object[] getSelectedObjects() { - return null; // TODO - } // getSelectedObjects() - - /** - * actionPerformed - * @param value0 TODO - */ - public void actionPerformed(ActionEvent value0) { - // TODO - } // actionPerformed() - - /** - * contentsChanged - * @param value0 TODO - */ - public void contentsChanged(ListDataEvent value0) { - // TODO - } // contentsChanged() - - /** - * selectWithKeyChar - * @param value0 TODO - * @returns boolean - */ - public boolean selectWithKeyChar(char value0) { - return false; // TODO - } // selectWithKeyChar() - - /** - * intervalAdded - * @param value0 TODO - */ - public void intervalAdded(ListDataEvent value0) { - // TODO - } // intervalAdded() - - /** - * intervalRemoved - * @param value0 TODO - */ - public void intervalRemoved(ListDataEvent value0) { - // TODO - } // intervalRemoved() - - /** - * setEnabled - * @param value0 TODO - */ - public void setEnabled(boolean value0) { - // TODO - } // setEnabled() - - /** - * configureEditor - * @param value0 TODO - * @param value1 TODO - */ - public void configureEditor(ComboBoxEditor value0, Object value1) { - // TODO - } // configureEditor() - - /** - * processKeyEvent - * @param value0 TODO - */ - public void processKeyEvent(KeyEvent value0) { - // TODO - } // processKeyEvent() - - /** - * isFocusTraversable - * @returns boolean - * @deprecated - */ - public boolean isFocusTraversable() { - return false; // TODO - } // isFocusTraversable() - - /** - * setKeySelectionManager - * @param value0 TODO - */ - public void setKeySelectionManager(KeySelectionManager value0) { - // TODO - } // setKeySelectionManager() - - /** - * getKeySelectionManager - * @returns JComboBox.KeySelectionManager - */ - public JComboBox.KeySelectionManager getKeySelectionManager() { - return null; // TODO - } // getKeySelectionManager() - - /** - * getItemCount - * @returns int - */ - public int getItemCount() { - return 0; // TODO - } // getItemCount() - - /** - * getItemAt - * @param value0 TODO - * @returns Object - */ - public Object getItemAt(int value0) { - return null; // TODO - } // getItemAt() - - /** - * createDefaultKeySelectionManager - * @returns KeySelectionManager - */ - protected KeySelectionManager createDefaultKeySelectionManager() { - return null; // TODO - } // createDefaultKeySelectionManager() - - /** - * paramString - * @returns String - */ - protected String paramString() { - return null; // TODO - } // paramString() - - /** - * getAccessibleContext - * @returns AccessibleContext + /** + * Forces JComboBox to select component located in the given index in the + * combo box. + * + * @param index index specifying location of the component that should be + * selected. + */ + public void setSelectedIndex(int index) + { + // FIXME: if index == -1 then nothing should be selected + setSelectedItem(dataModel.getElementAt(index)); + } + + /** + * Returns index of the item that is currently selected in the combo box. + * If no item is currently selected, then -1 is returned. + * + * @return int index specifying location of the currently selected item in + * the combo box or -1 if nothing is selected in the combo box. + */ + public int getSelectedIndex() + { + Object selectedItem = getSelectedItem(); + if (selectedItem != null && (dataModel instanceof DefaultComboBoxModel)) + return ((DefaultComboBoxModel) dataModel).getIndexOf(selectedItem); + + return -1; + } + + public Object getPrototypeDisplayValue() + { + return prototypeDisplayValue; + } + + public void setPrototypeDisplayValue(Object prototypeDisplayValue) + { + this.prototypeDisplayValue = prototypeDisplayValue; + } + + /** + * This method adds given element to this JComboBox. + * + * @param element element to add + */ + public void addItem(Object element) + { + ((MutableComboBoxModel) dataModel).addElement(element); + } + + /** + * Inserts given element at the specified index to this JComboBox + * + * @param element element to insert + * @param index position where to insert the element + */ + public void insertItemAt(Object element, int index) + { + ((MutableComboBoxModel) dataModel).insertElementAt(element, index); + } + + /** + * This method removes given element from this JComboBox. + * + * @param element element to remove */ + public void removeItem(Object element) + { + ((MutableComboBoxModel) dataModel).removeElement(element); + } + + /** + * This method remove element location in the specified index in the + * JComboBox. + * + * @param index index specifying position of the element to remove + */ + public void removeItemAt(int index) + { + ((MutableComboBoxModel) dataModel).removeElementAt(index); + } + + /** + * This method removes all elements from this JComboBox. + */ + public void removeAllItems() + { + if (dataModel instanceof DefaultComboBoxModel) + ((DefaultComboBoxModel) dataModel).removeAllElements(); + } + + /** + * This method displays popup with list of combo box's items on the screen + */ + public void showPopup() + { + setPopupVisible(true); + } + + /** + * This method hides popup containing list of combo box's items + */ + public void hidePopup() + { + setPopupVisible(false); + } + + /** + * This method either displayes or hides the popup containing list of combo + * box's items. + * + * @param visible show popup if 'visible' is true and hide it otherwise + */ + public void setPopupVisible(boolean visible) + { + getUI().setPopupVisible(this, visible); + } + + /** + * Checks if popup is currently visible on the screen. + * + * @return boolean true if popup is visible and false otherwise + */ + public boolean isPopupVisible() + { + return getUI().isPopupVisible(this); + } + + /** + * This method sets actionCommand to the specified string. ActionEvent fired + * to this JComboBox registered ActionListeners will contain this + * actionCommand. + * + * @param aCommand new action command for the JComboBox's ActionEvent + */ + public void setActionCommand(String aCommand) + { + actionCommand = aCommand; + } + + /** + * Returns actionCommand associated with the ActionEvent fired by the + * JComboBox to its registered ActionListeners. + * + * @return String actionCommand for the ActionEvent + */ + public String getActionCommand() + { + return actionCommand; + } + + /** + * setAction + * + * @param a action to set + */ + public void setAction(Action a) + { + Action old = action; + action = a; + configurePropertiesFromAction(action); + if (action != null) + // FIXME: remove from old action and add to new action + // PropertyChangeListener to listen to changes in the action + addActionListener(action); + } + + /** + * This method returns Action that is invoked when selected item is changed + * in the JComboBox. + * + * @return Action + */ + public Action getAction() + { + return action; + } + + /** + * Configure properties of the JComboBox by reading properties of specified + * action. This method always sets the comboBox's "enabled" property to the + * value of the Action's "enabled" property. + * + * @param a An Action to configure the combo box from + */ + protected void configurePropertiesFromAction(Action a) + { + if (a == null) + { + setEnabled(true); + setToolTipText(null); + } + else + { + setEnabled(a.isEnabled()); + setToolTipText((String) (a.getValue(Action.SHORT_DESCRIPTION))); + } + } + + /** + * Creates PropertyChangeListener to listen for the changes in comboBox's + * action properties. + * + * @param action action to listen to for property changes + * + * @return $PropertyChangeListener$ Listener that listens to changes in + * action properties. + */ + protected PropertyChangeListener createActionPropertyChangeListener(Action action) + { + return new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent e) + { + Action act = (Action) (e.getSource()); + configurePropertiesFromAction(act); + } + }; + } + + /** + * This method fires ItemEvent to this JComboBox's registered ItemListeners. + * This method is invoked when currently selected item in this combo box + * has changed. + * + * @param e the ItemEvent describing the change in the combo box's + * selection. + */ + protected void fireItemStateChanged(ItemEvent e) + { + ItemListener[] ll = getItemListeners(); + + for (int i = 0; i < ll.length; i++) + ll[i].itemStateChanged(e); + } + + /** + * This method fires ActionEvent to this JComboBox's registered + * ActionListeners. This method is invoked when user explicitly changes + * currently selected item. + */ + protected void fireActionEvent() + { + ActionListener[] ll = getActionListeners(); + + for (int i = 0; i < ll.length; i++) + ll[i].actionPerformed(new ActionEvent(this, + ActionEvent.ACTION_PERFORMED, + actionCommand)); + } + + /** + * This method is invoked whenever selected item changes in the combo box's + * data model. It fires ItemEvent and ActionEvent to all registered + * ComboBox's ItemListeners and ActionListeners respectively, indicating + * the change. + */ + protected void selectedItemChanged() + { + // Fire ItemEvent to indicated that previously selected item is now + // deselected + if (selectedItemReminder != null) + fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED, + selectedItemReminder, + ItemEvent.DESELECTED)); + + // Fire ItemEvent to indicate that new item is selected + Object newSelection = getSelectedItem(); + fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED, + newSelection, ItemEvent.SELECTED)); + + // Fire Action Event to JComboBox's registered listeners + fireActionEvent(); + + selectedItemReminder = newSelection; + } + + /** + * Returns Object array of size 1 containing currently selected element in + * the JComboBox. + * + * @return Object[] Object array of size 1 containing currently selected + * element in the JComboBox. + */ + public Object[] getSelectedObjects() + { + Object selectedObject = getSelectedItem(); + return new Object[] { selectedObject }; + } + + /** + * This method handles actionEvents fired by the ComboBoxEditor. It changes + * this JComboBox's selection to the new value currently in the editor and + * hides list of combo box items. + * + * @param e the ActionEvent + */ + public void actionPerformed(ActionEvent e) + { + setSelectedItem(((ComboBoxEditor) e.getSource()).getItem()); + setPopupVisible(false); + } + + /** + * This method selects item in this combo box that matches specified + * specified keyChar and returns true if such item is found. Otherwise + * false is returned. + * + * @param keyChar character indicating which item in the combo box should be + * selected. + * + * @return boolean true if item corresponding to the specified keyChar + * exists in the combo box. Otherwise false is returned. + */ + public boolean selectWithKeyChar(char keyChar) + { + // FIXME: Need to implement + return false; + } + + /** + * The part of implementation of ListDataListener interface. This method is + * invoked when some items where added to the JComboBox's data model. + * + * @param event ListDataEvent describing the change + */ + public void intervalAdded(ListDataEvent event) + { + // FIXME: Need to implement + repaint(); + } + + /** + * The part of implementation of ListDataListener interface. This method is + * invoked when some items where removed from the JComboBox's data model. + * + * @param event ListDataEvent describing the change. + */ + public void intervalRemoved(ListDataEvent event) + { + // FIXME: Need to implement + repaint(); + } + + /** + * The part of implementation of ListDataListener interface. This method is + * invoked when contents of the JComboBox's data model changed. + * + * @param event ListDataEvent describing the change + */ + public void contentsChanged(ListDataEvent event) + { + // if first and last index of the given ListDataEvent are both -1, + // then it indicates that selected item in the combo box data model + // have changed. + if (event.getIndex0() == -1 && event.getIndex1() == -1) + selectedItemChanged(); + } + + /** + * This method disables or enables JComboBox. If the JComboBox is enabled, + * then user is able to make item choice, otherwise if JComboBox is + * disabled then user is not able to make a selection. + * + * @param enabled if 'enabled' is true then enable JComboBox and disable it + */ + public void setEnabled(boolean enabled) + { + boolean oldEnabled = super.isEnabled(); + if (enabled != oldEnabled) + { + super.setEnabled(enabled); + firePropertyChange(ENABLED_CHANGED_PROPERTY, oldEnabled, + (boolean) enabled); + } + } + + /** + * This method initializes specified ComboBoxEditor to display given item. + * + * @param anEditor ComboBoxEditor to initialize + * @param anItem Item that should displayed in the specified editor + */ + public void configureEditor(ComboBoxEditor anEditor, Object anItem) + { + anEditor.setItem(anItem); + } + + /** + * This method hides combo box's popup whenever TAB key is pressed. + * + * @param e The KeyEvent indicating which key was pressed. + */ + public void processKeyEvent(KeyEvent e) + { + } + + /** + * This method always returns false to indicate that JComboBox itself is + * not focus traversable. + * + * @return false to indicate that JComboBox itself is not focus traversable. + * + * @deprecated + */ + public boolean isFocusTraversable() + { + return false; + } + + /** + * setKeySelectionManager + * + * @param aManager + */ + public void setKeySelectionManager(KeySelectionManager aManager) + { + } + + /** + * getKeySelectionManager + * + * @return JComboBox.KeySelectionManager + */ + public KeySelectionManager getKeySelectionManager() + { + return null; + } + + /** + * This method returns number of elements in this JComboBox + * + * @return int number of elements in this JComboBox + */ + public int getItemCount() + { + return ((DefaultComboBoxModel) dataModel).getSize(); + } + + /** + * Returns elements located in the combo box at the given index. + * + * @param index index specifying location of the component to return. + * + * @return component in the combo box that is located in the given index. + */ + public Object getItemAt(int index) + { + return ((MutableComboBoxModel) dataModel).getElementAt(index); + } + + /** + * createDefaultKeySelectionManager + * + * @return KeySelectionManager + */ + protected KeySelectionManager createDefaultKeySelectionManager() + { + return null; + } + + /** + * A string that describes this JComboBox. Normally only used for debugging. + * + * @return A string describing this JComboBox + */ + protected String paramString() + { + return "JComboBox"; + } + public AccessibleContext getAccessibleContext() { if (accessibleContext == null) @@ -797,74 +994,180 @@ public class JComboBox extends JComponent return accessibleContext; } - + /** - * addActionListener - * @param listener TODO + * This methods adds specified ActionListener to this JComboBox. + * + * @param listener to add */ - public void addActionListener (ActionListener listener) + public void addActionListener(ActionListener listener) { - listenerList.add (ActionListener.class, listener); + listenerList.add(ActionListener.class, listener); } /** - * removeActionListener - * @param listener TODO + * This method removes specified ActionListener from this JComboBox. + * + * @param listener ActionListener */ - public void removeActionListener (ActionListener listener) + public void removeActionListener(ActionListener listener) { - listenerList.remove (ActionListener.class, listener); + listenerList.remove(ActionListener.class, listener); } /** + * This method returns array of ActionListeners that are registered with + * this JComboBox. + * * @since 1.4 */ public ActionListener[] getActionListeners() { - return (ActionListener[]) getListeners (ActionListener.class); + return (ActionListener[]) getListeners(ActionListener.class); } /** - * addItemListener - * @param listener TODO + * This method registers given ItemListener with this JComboBox + * + * @param listener to remove */ public void addItemListener(ItemListener listener) { - listenerList.add (ItemListener.class, listener); + listenerList.add(ItemListener.class, listener); } /** - * removeItemListener - * @param listener TODO + * This method unregisters given ItemListener from this JComboBox + * + * @param listener to remove */ public void removeItemListener(ItemListener listener) { - listenerList.remove (ItemListener.class, listener); + listenerList.remove(ItemListener.class, listener); } /** + * This method returns array of ItemListeners that are registered with this + * JComboBox. + * * @since 1.4 */ public ItemListener[] getItemListeners() { - return (ItemListener[]) getListeners (ItemListener.class); + return (ItemListener[]) getListeners(ItemListener.class); } - public void addPopupMenuListener (PopupMenuListener listener) + /** + * Adds PopupMenuListener to combo box to listen to the events fired by the + * combo box's popup menu containing its list of items + * + * @param listener to add + */ + public void addPopupMenuListener(PopupMenuListener listener) { - listenerList.add (PopupMenuListener.class, listener); + listenerList.add(PopupMenuListener.class, listener); } - public void removePopupMenuListener (PopupMenuListener listener) + /** + * Removes PopupMenuListener to combo box to listen to the events fired by + * the combo box's popup menu containing its list of items + * + * @param listener to add + */ + public void removePopupMenuListener(PopupMenuListener listener) { - listenerList.remove (PopupMenuListener.class, listener); + listenerList.remove(PopupMenuListener.class, listener); } /** - * @since 1.4 + * Returns array of PopupMenuListeners that are registered with combo box. */ public PopupMenuListener[] getPopupMenuListeners() { - return (PopupMenuListener[]) getListeners (PopupMenuListener.class); + return (PopupMenuListener[]) getListeners(PopupMenuListener.class); + } + + /** + * AccessibleJComboBox + */ + protected class AccessibleJComboBox extends AccessibleJComponent + implements AccessibleAction, AccessibleSelection + { + private static final long serialVersionUID = 8217828307256675666L; + + protected AccessibleJComboBox() + { + } + + public int getAccessibleChildrenCount() + { + return 0; + } + + public Accessible getAccessibleChild(int value0) + { + return null; + } + + public AccessibleSelection getAccessibleSelection() + { + return null; + } + + public Accessible getAccessibleSelection(int value0) + { + return null; + } + + public boolean isAccessibleChildSelected(int value0) + { + return false; + } + + public AccessibleRole getAccessibleRole() + { + return AccessibleRole.COMBO_BOX; + } + + public AccessibleAction getAccessibleAction() + { + return null; + } + + public String getAccessibleActionDescription(int value0) + { + return null; + } + + public int getAccessibleActionCount() + { + return 0; + } + + public boolean doAccessibleAction(int value0) + { + return false; + } + + public int getAccessibleSelectionCount() + { + return 0; + } + + public void addAccessibleSelection(int value0) + { + } + + public void removeAccessibleSelection(int value0) + { + } + + public void clearAccessibleSelection() + { + } + + public void selectAllAccessibleSelection() + { + } } } |