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
|
|
@ -1,5 +1,5 @@
|
|||
/* BasicComboBoxUI.java --
|
||||
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
||||
Copyright (C) 2004, 2005, 2006, Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
|
@ -66,12 +66,14 @@ import javax.swing.CellRendererPane;
|
|||
import javax.swing.ComboBoxEditor;
|
||||
import javax.swing.ComboBoxModel;
|
||||
import javax.swing.DefaultListCellRenderer;
|
||||
import javax.swing.InputMap;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JComboBox;
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JList;
|
||||
import javax.swing.ListCellRenderer;
|
||||
import javax.swing.LookAndFeel;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.UIManager;
|
||||
import javax.swing.event.ListDataEvent;
|
||||
import javax.swing.event.ListDataListener;
|
||||
|
|
@ -546,7 +548,7 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
}
|
||||
|
||||
/**
|
||||
* Unconfigures the editor for this combo nox. This method is not implemented.
|
||||
* Unconfigures the editor for this combo box.
|
||||
*/
|
||||
protected void unconfigureEditor()
|
||||
{
|
||||
|
|
@ -711,12 +713,14 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
}
|
||||
|
||||
public int getAccessibleChildrenCount(JComponent c)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Need to implement
|
||||
return 0;
|
||||
}
|
||||
|
||||
public Accessible getAccessibleChild(JComponent c, int i)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Need to implement
|
||||
return null;
|
||||
|
|
@ -731,7 +735,9 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
* @return true if the specified key is a navigation key and false otherwis
|
||||
*/
|
||||
protected boolean isNavigationKey(int keyCode)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Need to implement
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -780,9 +786,7 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
Insets i = comboBox.getInsets();
|
||||
int arrowSize = h - (i.top + i.bottom);
|
||||
if (arrowButton != null)
|
||||
{
|
||||
arrowSize = arrowButton.getWidth();
|
||||
}
|
||||
arrowSize = arrowButton.getWidth();
|
||||
return new Rectangle(i.left, i.top, w - (i.left + i.right + arrowSize),
|
||||
h - (i.top + i.left));
|
||||
}
|
||||
|
|
@ -822,14 +826,12 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
if (hasFocus && ! isPopupVisible(comboBox))
|
||||
{
|
||||
comp = renderer.getListCellRendererComponent(listBox,
|
||||
comboBox.getSelectedItem(),
|
||||
-1, true, false);
|
||||
comboBox.getSelectedItem(), -1, true, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
comp = renderer.getListCellRendererComponent(listBox,
|
||||
comboBox.getSelectedItem(),
|
||||
-1, false, false);
|
||||
comboBox.getSelectedItem(), -1, false, false);
|
||||
Color bg = UIManager.getColor("ComboBox.disabledForeground");
|
||||
comp.setBackground(bg);
|
||||
}
|
||||
|
|
@ -871,13 +873,9 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
{
|
||||
Color saved = g.getColor();
|
||||
if (comboBox.isEnabled())
|
||||
{
|
||||
g.setColor(UIManager.getColor("UIManager.background"));
|
||||
}
|
||||
g.setColor(UIManager.getColor("UIManager.background"));
|
||||
else
|
||||
{
|
||||
g.setColor(UIManager.getColor("UIManager.disabledBackground"));
|
||||
}
|
||||
g.setColor(UIManager.getColor("UIManager.disabledBackground"));
|
||||
g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);
|
||||
g.setColor(saved);
|
||||
}
|
||||
|
|
@ -897,9 +895,7 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
protected Dimension getDefaultSize()
|
||||
{
|
||||
Component comp = DEFAULT_RENDERER.getListCellRendererComponent(listBox,
|
||||
" ", -1,
|
||||
false,
|
||||
false);
|
||||
" ", -1, false, false);
|
||||
currentValuePane.add(comp);
|
||||
comp.setFont(comboBox.getFont());
|
||||
Dimension d = comp.getPreferredSize();
|
||||
|
|
@ -974,19 +970,22 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
* by the look and feel.
|
||||
*/
|
||||
protected void installKeyboardActions()
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Need to implement.
|
||||
SwingUtilities.replaceUIInputMap(comboBox,
|
||||
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,
|
||||
(InputMap) UIManager.get("ComboBox.ancestorInputMap"));
|
||||
// Install any action maps here.
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Uninstalls the keyboard actions for the {@link JComboBox} there were
|
||||
* installed by in {@link #installListeners}.
|
||||
*/
|
||||
protected void uninstallKeyboardActions()
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: Need to implement.
|
||||
SwingUtilities.replaceUIInputMap(comboBox,
|
||||
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
|
||||
// Uninstall any action maps here.
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1145,9 +1144,7 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
ComboBoxModel model = comboBox.getModel();
|
||||
Object v = model.getSelectedItem();
|
||||
if (editor != null)
|
||||
{
|
||||
comboBox.configureEditor(comboBox.getEditor(), v);
|
||||
}
|
||||
comboBox.configureEditor(comboBox.getEditor(), v);
|
||||
comboBox.repaint();
|
||||
}
|
||||
}
|
||||
|
|
@ -1166,9 +1163,10 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
* Invoked whenever key is pressed while JComboBox is in focus.
|
||||
*/
|
||||
public void keyPressed(KeyEvent e)
|
||||
throws NotImplementedException
|
||||
{
|
||||
// FIXME: This method calls JComboBox.selectWithKeyChar if the key that was
|
||||
// pressed is not a navigation key.
|
||||
// FIXME: This method calls JComboBox.selectWithKeyChar if the key that
|
||||
// was pressed is not a navigation key.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1198,10 +1196,8 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
comboBox.revalidate();
|
||||
}
|
||||
if (editor != null)
|
||||
{
|
||||
comboBox.configureEditor(comboBox.getEditor(),
|
||||
comboBox.getSelectedItem());
|
||||
}
|
||||
comboBox.configureEditor(comboBox.getEditor(),
|
||||
comboBox.getSelectedItem());
|
||||
comboBox.repaint();
|
||||
}
|
||||
|
||||
|
|
@ -1215,9 +1211,7 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
int start = e.getIndex0();
|
||||
int end = e.getIndex1();
|
||||
if (start == 0 && comboBox.getItemCount() - (end - start + 1) == 0)
|
||||
{
|
||||
contentsChanged(e);
|
||||
}
|
||||
contentsChanged(e);
|
||||
else if (start != -1 || end != -1)
|
||||
{
|
||||
ListCellRenderer renderer = comboBox.getRenderer();
|
||||
|
|
@ -1227,10 +1221,8 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
// TODO: Optimize using prototype here.
|
||||
for (int i = start; i <= end; ++i)
|
||||
{
|
||||
Component comp =
|
||||
renderer.getListCellRendererComponent(listBox,
|
||||
model.getElementAt(i),
|
||||
-1, false, false);
|
||||
Component comp = renderer.getListCellRendererComponent(listBox,
|
||||
model.getElementAt(i), -1, false, false);
|
||||
currentValuePane.add(comp);
|
||||
comp.setFont(comboBox.getFont());
|
||||
Dimension dim = comp.getPreferredSize();
|
||||
|
|
@ -1241,13 +1233,9 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
if (displaySize.width < w || displaySize.height < h)
|
||||
{
|
||||
if (displaySize.width < w)
|
||||
{
|
||||
displaySize.width = w;
|
||||
}
|
||||
displaySize.width = w;
|
||||
if (displaySize.height < h)
|
||||
{
|
||||
displaySize.height = h;
|
||||
}
|
||||
displaySize.height = h;
|
||||
comboBox.revalidate();
|
||||
if (editor != null)
|
||||
{
|
||||
|
|
@ -1297,37 +1285,37 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
|
||||
if (e.getPropertyName().equals("enabled"))
|
||||
{
|
||||
arrowButton.setEnabled(comboBox.isEnabled());
|
||||
arrowButton.setEnabled(comboBox.isEnabled());
|
||||
|
||||
if (comboBox.isEditable())
|
||||
comboBox.getEditor().getEditorComponent().setEnabled(comboBox
|
||||
.isEnabled());
|
||||
if (comboBox.isEditable())
|
||||
comboBox.getEditor().getEditorComponent().setEnabled(
|
||||
comboBox.isEnabled());
|
||||
}
|
||||
else if (e.getPropertyName().equals("editable"))
|
||||
{
|
||||
if (comboBox.isEditable())
|
||||
{
|
||||
configureEditor();
|
||||
addEditor();
|
||||
}
|
||||
else
|
||||
{
|
||||
unconfigureEditor();
|
||||
removeEditor();
|
||||
}
|
||||
if (comboBox.isEditable())
|
||||
{
|
||||
configureEditor();
|
||||
addEditor();
|
||||
}
|
||||
else
|
||||
{
|
||||
unconfigureEditor();
|
||||
removeEditor();
|
||||
}
|
||||
|
||||
comboBox.revalidate();
|
||||
comboBox.repaint();
|
||||
comboBox.revalidate();
|
||||
comboBox.repaint();
|
||||
}
|
||||
else if (e.getPropertyName().equals("dataModel"))
|
||||
{
|
||||
// remove ListDataListener from old model and add it to new model
|
||||
ComboBoxModel oldModel = (ComboBoxModel) e.getOldValue();
|
||||
if (oldModel != null)
|
||||
oldModel.removeListDataListener(listDataListener);
|
||||
// remove ListDataListener from old model and add it to new model
|
||||
ComboBoxModel oldModel = (ComboBoxModel) e.getOldValue();
|
||||
if (oldModel != null)
|
||||
oldModel.removeListDataListener(listDataListener);
|
||||
|
||||
if ((ComboBoxModel) e.getNewValue() != null)
|
||||
comboBox.getModel().addListDataListener(listDataListener);
|
||||
if ((ComboBoxModel) e.getNewValue() != null)
|
||||
comboBox.getModel().addListDataListener(listDataListener);
|
||||
}
|
||||
else if (e.getPropertyName().equals("font"))
|
||||
{
|
||||
|
|
@ -1339,7 +1327,7 @@ public class BasicComboBoxUI extends ComboBoxUI
|
|||
comboBox.repaint();
|
||||
}
|
||||
|
||||
// FIXME: Need to handle changes in other bound properties.
|
||||
// FIXME: Need to handle changes in other bound properties.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue