String.java, [...]: Merge from GNU Classpath HEAD.
2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com> * java/lang/String.java, classpath/native/jni/classpath/jcl.h, classpath/native/jni/qt-peer/eventmethods.h, classpath/native/jni/qt-peer/qtmenupeer.cpp, classpath/native/jni/qt-peer/.cvsignore, classpath/native/jni/gtk-peer/gdkdisplay.h, classpath/native/jni/gtk-peer/cairographics2d.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c, classpath/native/jni/gtk-peer/.cvsignore, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c, classpath/native/jni/gtk-peer/gtkpeer.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c, classpath/native/jni/gtk-peer/Makefile.am, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c, classpath/native/jawt/Makefile.am, classpath/native/jawt/.cvsignore, classpath/native/target/Linux/Makefile.in, classpath/native/plugin/gcjwebplugin.cc, classpath/native/plugin/Makefile.am, classpath/native/plugin/.cvsignore, classpath/resource/Makefile.in, classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java, classpath/gnu/java/awt/peer/gtk/CairoSurface.java, classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java, classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java, classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java, classpath/gnu/java/awt/peer/gtk/GdkGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkToolkit.java, classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java, classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java, classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java, classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkImage.java, classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java, classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java, classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java, classpath/gnu/java/awt/peer/swing/SwingComponent.java, classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java, classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java, classpath/gnu/java/awt/peer/swing/SwingFramePeer.java, classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java, classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java, classpath/gnu/java/awt/print/JavaPrinterJob.java, classpath/gnu/java/awt/print/PostScriptGraphics2D.java, classpath/gnu/java/awt/print/SpooledDocument.java, classpath/gnu/java/awt/print/JavaPrinterGraphics.java, classpath/gnu/java/awt/BitwiseXORComposite.java, classpath/gnu/java/awt/font/GNUGlyphVector.java, classpath/gnu/java/awt/font/opentype/NameDecoder.java, classpath/gnu/java/awt/java2d/RasterGraphics.java, classpath/gnu/java/awt/java2d/TexturePaintContext.java, classpath/gnu/java/awt/java2d/PolyEdge.java, classpath/gnu/java/awt/java2d/AbstractGraphics2D.java, classpath/gnu/java/awt/java2d/AlphaCompositeContext.java, classpath/gnu/java/awt/java2d/ImagePaint.java, classpath/gnu/java/awt/Buffers.java, classpath/gnu/classpath/Configuration.java.in, classpath/gnu/javax/swing/text/html/CombinedAttributes.java, classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java, classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java, classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java, classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java, classpath/tools/toolwrapper.c, classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java, classpath/tools/gnu/classpath/tools/native2ascii/Messages.java, classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java, classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java, classpath/tools/gnu/classpath/tools/getopt/OptionException.java, classpath/tools/gnu/classpath/tools/getopt/Messages.java, classpath/tools/gnu/classpath/tools/getopt/Option.java, classpath/tools/gnu/classpath/tools/getopt/Parser.java, classpath/tools/gnu/classpath/tools/getopt/ClasspathToolParser.java, classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java, classpath/tools/gnu/classpath/tools/jarsigner/Main.java, classpath/tools/gnu/classpath/tools/jarsigner/Messages.java, classpath/tools/gnu/classpath/tools/jarsigner/package.html, classpath/tools/gnu/classpath/tools/keytool/ListCmd.java, classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java, classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java, classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java, classpath/tools/gnu/classpath/tools/keytool/Messages.java, classpath/tools/gnu/classpath/tools/keytool/package.html, classpath/tools/gnu/classpath/tools/keytool/Command.java, classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java, classpath/tools/gnu/classpath/tools/keytool/Main.java, classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java, classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java, classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java, classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java, classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java, classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java, classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java, classpath/tools/gnu/classpath/tools/rmi/registry/package.html, classpath/tools/gnu/classpath/tools/rmi/RMIC.txt, classpath/tools/gnu/classpath/tools/rmi/RMIC.java, classpath/tools/gnu/classpath/tools/appletviewer/ErrorApplet.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletClassLoader.java, classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java, classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletContext.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java, classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletContext.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletWarning.java, classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java, classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java, classpath/tools/gnu/classpath/tools/appletviewer/ConsoleDialog.java, classpath/tools/gnu/classpath/tools/appletviewer/Main.java, classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java, classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java, classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java, classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java, classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java, classpath/tools/gnu/classpath/tools/serialver/Messages.java, classpath/tools/gnu/classpath/tools/serialver/SerialVer.java, classpath/tools/gnu/classpath/tools/jar/Creator.java, classpath/tools/gnu/classpath/tools/jar/Entry.java, classpath/tools/gnu/classpath/tools/jar/Lister.java, classpath/tools/gnu/classpath/tools/jar/Main.java, classpath/tools/gnu/classpath/tools/jar/Updater.java, classpath/tools/gnu/classpath/tools/jar/Messages.java, classpath/tools/gnu/classpath/tools/jar/Extractor.java, classpath/tools/gnu/classpath/tools/jar/Action.java, classpath/tools/gnu/classpath/tools/jar/Indexer.java, classpath/tools/gnu/classpath/tools/jar/WorkSet.java, classpath/tools/gnu/classpath/tools/giop/GRMIC.txt, classpath/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java, classpath/tools/gnu/classpath/tools/giop/GRMIC.java, classpath/tools/Makefile.am, classpath/tools/jarsigner.in, classpath/tools/keytool.in, classpath/tools/appletviewer.in, classpath/tools/.cvsignore, classpath/configure.ac, classpath/javax/swing/JTabbedPane.java, classpath/javax/swing/AbstractButton.java, classpath/javax/swing/JViewport.java, classpath/javax/swing/KeyboardManager.java, classpath/javax/swing/JMenuItem.java, classpath/javax/swing/JMenuBar.java, classpath/javax/swing/MenuSelectionManager.java, classpath/javax/swing/JOptionPane.java, classpath/javax/swing/JSpinner.java, classpath/javax/swing/JCheckBoxMenuItem.java, classpath/javax/swing/JEditorPane.java, classpath/javax/swing/JFormattedTextField.java, classpath/javax/swing/JTree.java, classpath/javax/swing/CellRendererPane.java, classpath/javax/swing/JScrollPane.java, classpath/javax/swing/tree/VariableHeightLayoutCache.java, classpath/javax/swing/tree/TreeNode.java, classpath/javax/swing/tree/FixedHeightLayoutCache.java, classpath/javax/swing/tree/DefaultTreeCellEditor.java, classpath/javax/swing/tree/TreePath.java, classpath/javax/swing/tree/RowMapper.java, classpath/javax/swing/tree/DefaultMutableTreeNode.java, classpath/javax/swing/tree/DefaultTreeModel.java, classpath/javax/swing/tree/AbstractLayoutCache.java, classpath/javax/swing/tree/TreeSelectionModel.java, classpath/javax/swing/tree/DefaultTreeSelectionModel.java, classpath/javax/swing/tree/DefaultTreeCellRenderer.java, classpath/javax/swing/tree/ExpandVetoException.java, classpath/javax/swing/JList.java, classpath/javax/swing/table/JTableHeader.java, classpath/javax/swing/table/AbstractTableModel.java, classpath/javax/swing/table/DefaultTableModel.java, classpath/javax/swing/table/TableCellEditor.java, classpath/javax/swing/table/TableCellRenderer.java, classpath/javax/swing/ProgressMonitor.java, classpath/javax/swing/JToolBar.java, classpath/javax/swing/TransferHandler.java, classpath/javax/swing/DefaultCellEditor.java, classpath/javax/swing/DefaultButtonModel.java, classpath/javax/swing/JLayeredPane.java, classpath/javax/swing/text/DefaultEditorKit.java, classpath/javax/swing/text/DefaultCaret.java, classpath/javax/swing/text/FieldView.java, classpath/javax/swing/text/JTextComponent.java, classpath/javax/swing/text/TextAction.java, classpath/javax/swing/text/StyleContext.java, classpath/javax/swing/text/html/HTMLDocument.java, classpath/javax/swing/text/html/MinimalHTMLWriter.java, classpath/javax/swing/text/html/ImageView.java, classpath/javax/swing/text/html/HTMLEditorKit.java, classpath/javax/swing/text/AbstractWriter.java, classpath/javax/swing/text/GapContent.java, classpath/javax/swing/text/Utilities.java, classpath/javax/swing/text/PlainView.java, classpath/javax/swing/UIManager.java, classpath/javax/swing/JSplitPane.java, classpath/javax/swing/JComponent.java, classpath/javax/swing/SwingUtilities.java, classpath/javax/swing/border/AbstractBorder.java, classpath/javax/swing/border/CompoundBorder.java, classpath/javax/swing/border/TitledBorder.java, classpath/javax/swing/border/MatteBorder.java, classpath/javax/swing/border/BevelBorder.java, classpath/javax/swing/RepaintManager.java, classpath/javax/swing/JTable.java, classpath/javax/swing/UIDefaults.java, classpath/javax/swing/DefaultDesktopManager.java, classpath/javax/swing/JMenu.java, classpath/javax/swing/JLabel.java, classpath/javax/swing/JSlider.java, classpath/javax/swing/plaf/basic/BasicToolBarUI.java, classpath/javax/swing/plaf/basic/BasicButtonUI.java, classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java, classpath/javax/swing/plaf/basic/BasicTextAreaUI.java, classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java, classpath/javax/swing/plaf/basic/BasicSpinnerUI.java, classpath/javax/swing/plaf/basic/BasicSliderUI.java, classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java, classpath/javax/swing/plaf/basic/BasicComboPopup.java, classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java, classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java, classpath/javax/swing/plaf/basic/BasicProgressBarUI.java, classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java, classpath/javax/swing/plaf/basic/BasicPanelUI.java, classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java, classpath/javax/swing/plaf/basic/BasicTreeUI.java, classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java, classpath/javax/swing/plaf/basic/BasicFileChooserUI.java, classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java, classpath/javax/swing/plaf/basic/BasicComboBoxUI.java, classpath/javax/swing/plaf/basic/BasicListUI.java, classpath/javax/swing/plaf/basic/BasicIconFactory.java, classpath/javax/swing/plaf/basic/BasicTextUI.java, classpath/javax/swing/plaf/basic/BasicLookAndFeel.java, classpath/javax/swing/plaf/basic/BasicDirectoryModel.java, classpath/javax/swing/plaf/basic/BasicRootPaneUI.java, classpath/javax/swing/plaf/basic/BasicTableUI.java, classpath/javax/swing/plaf/basic/SharedUIDefaults.java, classpath/javax/swing/plaf/multi/MultiComboBoxUI.java, classpath/javax/swing/plaf/multi/MultiListUI.java, classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java, classpath/javax/swing/plaf/multi/MultiFileChooserUI.java, classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java, classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java, classpath/javax/swing/plaf/multi/MultiLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalSliderUI.java, classpath/javax/swing/plaf/metal/MetalIconFactory.java, classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java, classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java, classpath/javax/swing/plaf/metal/MetalLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java, classpath/javax/swing/plaf/metal/MetalSeparatorUI.java, classpath/javax/swing/plaf/metal/MetalBorders.java, classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java, classpath/javax/swing/plaf/metal/MetalScrollBarUI.java, classpath/javax/swing/plaf/metal/MetalRootPaneUI.java, classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java, classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java, classpath/javax/swing/plaf/metal/MetalToolTipUI.java, classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java, classpath/javax/swing/plaf/metal/MetalFileChooserUI.java, classpath/javax/swing/plaf/metal/MetalUtils.java, classpath/javax/swing/plaf/metal/MetalComboBoxButton.java, classpath/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java, classpath/javax/swing/plaf/metal/MetalButtonUI.java, classpath/javax/swing/JPopupMenu.java, classpath/javax/swing/JProgressBar.java, classpath/javax/swing/WindowConstants.java, classpath/javax/swing/JFrame.java, classpath/javax/swing/JFileChooser.java, classpath/javax/swing/JComboBox.java, classpath/javax/swing/event/EventListenerList.java, classpath/javax/swing/ListSelectionModel.java, classpath/javax/swing/JScrollBar.java, classpath/java/text/SimpleDateFormat.java, classpath/java/text/NumberFormat.java, classpath/java/text/class-dependencies.conf, classpath/java/awt/image/ColorModel.java, classpath/java/awt/image/BufferedImage.java, classpath/java/awt/Window.java, classpath/java/awt/ContainerOrderFocusTraversalPolicy.java, classpath/java/awt/LightweightDispatcher.java, classpath/java/awt/EventDispatchThread.java, classpath/java/awt/BasicStroke.java, classpath/java/awt/ColorPaintContext.java, classpath/java/awt/Container.java, classpath/java/awt/TexturePaint.java, classpath/java/awt/Component.java, classpath/java/awt/Font.java, classpath/java/awt/GraphicsConfiguration.java, classpath/java/awt/DefaultKeyboardFocusManager.java, classpath/java/awt/print/PrinterJob.java, classpath/java/awt/im/InputContext.java, classpath/java/awt/dnd/DragGestureRecognizer.java, classpath/java/awt/Toolkit.java, classpath/java/awt/font/GraphicAttribute.java, classpath/java/awt/font/ImageGraphicAttribute.java, classpath/java/awt/font/GlyphVector.java, classpath/java/awt/font/GlyphMetrics.java, classpath/java/awt/font/ShapeGraphicAttribute.java, classpath/java/awt/Graphics2D.java, classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h, classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h, classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h, classpath/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h, classpath/include/config.h.in, classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h, classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h, classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h, classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h, classpath/include/gnu_java_awt_peer_gtk_GtkImage.h, classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h, classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h: Merge from GNU Classpath HEAD. From-SVN: r114510
This commit is contained in:
Thomas Fitzsimmons
Thomas Fitzsimmons
parent
6c65d7577c
commit
02440ca432
360 changed files with 34743 additions and 9337 deletions
|
|
@ -38,8 +38,6 @@ exception statement from your version. */
|
|||
|
||||
package javax.swing;
|
||||
|
||||
import gnu.classpath.NotImplementedException;
|
||||
|
||||
import java.awt.ItemSelectable;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
|
@ -60,6 +58,8 @@ import javax.swing.event.ListDataListener;
|
|||
import javax.swing.event.PopupMenuEvent;
|
||||
import javax.swing.event.PopupMenuListener;
|
||||
import javax.swing.plaf.ComboBoxUI;
|
||||
import javax.swing.plaf.ComponentUI;
|
||||
import javax.swing.plaf.basic.ComboPopup;
|
||||
|
||||
/**
|
||||
* A component that allows a user to select any item in its list and
|
||||
|
|
@ -675,7 +675,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
|
|||
}
|
||||
else
|
||||
throw new RuntimeException("Unable to remove the items because the data "
|
||||
+"model it is not an instance of "
|
||||
+ "model it is not an instance of "
|
||||
+ "MutableComboBoxModel.");
|
||||
}
|
||||
|
||||
|
|
@ -848,7 +848,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
|
|||
{
|
||||
PopupMenuListener[] listeners = getPopupMenuListeners();
|
||||
PopupMenuEvent e = new PopupMenuEvent(this);
|
||||
for(int i = 0; i < listeners.length; i++)
|
||||
for (int i = 0; i < listeners.length; i++)
|
||||
listeners[i].popupMenuCanceled(e);
|
||||
}
|
||||
|
||||
|
|
@ -862,7 +862,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
|
|||
{
|
||||
PopupMenuListener[] listeners = getPopupMenuListeners();
|
||||
PopupMenuEvent e = new PopupMenuEvent(this);
|
||||
for(int i = 0; i < listeners.length; i++)
|
||||
for (int i = 0; i < listeners.length; i++)
|
||||
listeners[i].popupMenuWillBecomeInvisible(e);
|
||||
}
|
||||
|
||||
|
|
@ -876,7 +876,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
|
|||
{
|
||||
PopupMenuListener[] listeners = getPopupMenuListeners();
|
||||
PopupMenuEvent e = new PopupMenuEvent(this);
|
||||
for(int i = 0; i < listeners.length; i++)
|
||||
for (int i = 0; i < listeners.length; i++)
|
||||
listeners[i].popupMenuWillBecomeVisible(e);
|
||||
}
|
||||
|
||||
|
|
@ -1246,34 +1246,102 @@ public class JComboBox extends JComponent implements ItemSelectable,
|
|||
// Nothing to do here.
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of accessible children of this object. The
|
||||
* implementation of AccessibleJComboBox delegates this call to the UI
|
||||
* of the associated JComboBox.
|
||||
*
|
||||
* @return the number of accessible children of this object
|
||||
*
|
||||
* @see ComponentUI#getAccessibleChildrenCount(JComponent)
|
||||
*/
|
||||
public int getAccessibleChildrenCount()
|
||||
throws NotImplementedException
|
||||
{
|
||||
return 0;
|
||||
ComponentUI ui = getUI();
|
||||
int count;
|
||||
if (ui != null)
|
||||
count = ui.getAccessibleChildrenCount(JComboBox.this);
|
||||
else
|
||||
count = super.getAccessibleChildrenCount();
|
||||
return count;
|
||||
}
|
||||
|
||||
public Accessible getAccessibleChild(int value0)
|
||||
throws NotImplementedException
|
||||
/**
|
||||
* Returns the number of accessible children of this object. The
|
||||
* implementation of AccessibleJComboBox delegates this call to the UI
|
||||
* of the associated JComboBox.
|
||||
*
|
||||
* @param index the index of the accessible child to fetch
|
||||
*
|
||||
* @return the number of accessible children of this object
|
||||
*
|
||||
* @see ComponentUI#getAccessibleChild(JComponent, int)
|
||||
*/
|
||||
public Accessible getAccessibleChild(int index)
|
||||
{
|
||||
return null;
|
||||
ComponentUI ui = getUI();
|
||||
Accessible child = null;
|
||||
if (ui != null)
|
||||
child = ui.getAccessibleChild(JComboBox.this, index);
|
||||
else
|
||||
child = super.getAccessibleChild(index);
|
||||
return child;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the AccessibleSelection object associated with this object.
|
||||
* AccessibleJComboBoxes handle their selection themselves, so this
|
||||
* always returns <code>this</code>.
|
||||
*
|
||||
* @return the AccessibleSelection object associated with this object
|
||||
*/
|
||||
public AccessibleSelection getAccessibleSelection()
|
||||
throws NotImplementedException
|
||||
{
|
||||
return null;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Accessible getAccessibleSelection(int value0)
|
||||
throws NotImplementedException
|
||||
/**
|
||||
* Returns the accessible selection from this AccssibleJComboBox.
|
||||
*
|
||||
* @param index the index of the selected child to fetch
|
||||
*
|
||||
* @return the accessible selection from this AccssibleJComboBox
|
||||
*/
|
||||
public Accessible getAccessibleSelection(int index)
|
||||
{
|
||||
return null;
|
||||
// Get hold of the actual popup.
|
||||
Accessible popup = getUI().getAccessibleChild(JComboBox.this, 0);
|
||||
Accessible selected = null;
|
||||
if (popup != null && popup instanceof ComboPopup)
|
||||
{
|
||||
ComboPopup cPopup = (ComboPopup) popup;
|
||||
// Query the list for the currently selected child.
|
||||
JList l = cPopup.getList();
|
||||
AccessibleContext listCtx = l.getAccessibleContext();
|
||||
if (listCtx != null)
|
||||
{
|
||||
AccessibleSelection s = listCtx.getAccessibleSelection();
|
||||
if (s != null)
|
||||
{
|
||||
selected = s.getAccessibleSelection(index);
|
||||
}
|
||||
}
|
||||
}
|
||||
return selected;
|
||||
}
|
||||
|
||||
public boolean isAccessibleChildSelected(int value0)
|
||||
throws NotImplementedException
|
||||
/**
|
||||
* Returns <code>true</code> if the accessible child with the specified
|
||||
* <code>index</code> is selected, <code>false</code> otherwise.
|
||||
*
|
||||
* @param index the index of the accessible child
|
||||
*
|
||||
* @return <code>true</code> if the accessible child with the specified
|
||||
* <code>index</code> is selected, <code>false</code> otherwise
|
||||
*/
|
||||
public boolean isAccessibleChildSelected(int index)
|
||||
{
|
||||
return false;
|
||||
return getSelectedIndex() == index;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1286,58 +1354,121 @@ public class JComboBox extends JComponent implements ItemSelectable,
|
|||
return AccessibleRole.COMBO_BOX;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the accessible action associated to this accessible object.
|
||||
* AccessibleJComboBox implements its own AccessibleAction, so this
|
||||
* method returns <code>this</code>.
|
||||
*
|
||||
* @return the accessible action associated to this accessible object
|
||||
*/
|
||||
public AccessibleAction getAccessibleAction()
|
||||
throws NotImplementedException
|
||||
{
|
||||
return null;
|
||||
return this;
|
||||
}
|
||||
|
||||
public String getAccessibleActionDescription(int value0)
|
||||
throws NotImplementedException
|
||||
/**
|
||||
* Returns the description of the specified action. AccessibleJComboBox
|
||||
* implements 1 action (toggle the popup menu) and thus returns
|
||||
* <code>UIManager.getString("ComboBox.togglePopupText")</code>
|
||||
*
|
||||
* @param actionIndex the index of the action for which to return the
|
||||
* description
|
||||
*
|
||||
* @return the description of the specified action
|
||||
*/
|
||||
public String getAccessibleActionDescription(int actionIndex)
|
||||
{
|
||||
return null;
|
||||
return UIManager.getString("ComboBox.togglePopupText");
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of accessible actions that can be performed by
|
||||
* this object. AccessibleJComboBox implement s one accessible action
|
||||
* (toggle the popup menu), so this method always returns <code>1</code>.
|
||||
*
|
||||
* @return the number of accessible actions that can be performed by
|
||||
* this object
|
||||
*/
|
||||
public int getAccessibleActionCount()
|
||||
throws NotImplementedException
|
||||
{
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
public boolean doAccessibleAction(int value0)
|
||||
throws NotImplementedException
|
||||
/**
|
||||
* Performs the accessible action with the specified index.
|
||||
* AccessibleJComboBox has 1 accessible action
|
||||
* (<code>actionIndex == 0</code>), which is to toggle the
|
||||
* popup menu. All other action indices have no effect and return
|
||||
* <code<>false</code>.
|
||||
*
|
||||
* @param actionIndex the index of the action to perform
|
||||
*
|
||||
* @return <code>true</code> if the action has been performed,
|
||||
* <code>false</code> otherwise
|
||||
*/
|
||||
public boolean doAccessibleAction(int actionIndex)
|
||||
{
|
||||
return false;
|
||||
boolean actionPerformed = false;
|
||||
if (actionIndex == 0)
|
||||
{
|
||||
setPopupVisible(! isPopupVisible());
|
||||
actionPerformed = true;
|
||||
}
|
||||
return actionPerformed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of selected accessible children of this object. This
|
||||
* returns <code>1</code> if the combobox has a selected entry,
|
||||
* <code>0</code> otherwise.
|
||||
*
|
||||
* @return the number of selected accessible children of this object
|
||||
*/
|
||||
public int getAccessibleSelectionCount()
|
||||
throws NotImplementedException
|
||||
{
|
||||
return 0;
|
||||
Object sel = getSelectedItem();
|
||||
int count = 0;
|
||||
if (sel != null)
|
||||
count = 1;
|
||||
return count;
|
||||
}
|
||||
|
||||
public void addAccessibleSelection(int value0)
|
||||
throws NotImplementedException
|
||||
/**
|
||||
* Sets the current selection to the specified <code>index</code>.
|
||||
*
|
||||
* @param index the index to set as selection
|
||||
*/
|
||||
public void addAccessibleSelection(int index)
|
||||
{
|
||||
// TODO: Implement this properly.
|
||||
setSelectedIndex(index);
|
||||
}
|
||||
|
||||
public void removeAccessibleSelection(int value0)
|
||||
throws NotImplementedException
|
||||
/**
|
||||
* Removes the specified index from the current selection.
|
||||
*
|
||||
* @param index the index to remove from the selection
|
||||
*/
|
||||
public void removeAccessibleSelection(int index)
|
||||
{
|
||||
// TODO: Implement this properly.
|
||||
if (getSelectedIndex() == index)
|
||||
clearAccessibleSelection();
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears the current selection.
|
||||
*/
|
||||
public void clearAccessibleSelection()
|
||||
throws NotImplementedException
|
||||
{
|
||||
// TODO: Implement this properly.
|
||||
setSelectedIndex(-1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Multiple selection is not supported by AccessibleJComboBox, so this
|
||||
* does nothing.
|
||||
*/
|
||||
public void selectAllAccessibleSelection()
|
||||
throws NotImplementedException
|
||||
{
|
||||
// TODO: Implement this properly.
|
||||
// Nothing to do here.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue