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 2006-06-09 16:07:07 +00:00 committed by Thomas Fitzsimmons
parent 6c65d7577c
commit 02440ca432
360 changed files with 34743 additions and 9337 deletions

View file

@ -1,5 +1,5 @@
/* DefaultTreeCellRenderer.java
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
Copyright (C) 2002, 2004, 2006, Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -47,16 +47,17 @@ import java.awt.Graphics;
import java.awt.Insets;
import java.awt.Rectangle;
import javax.swing.border.Border;
import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JTree;
import javax.swing.UIManager;
import javax.swing.LookAndFeel;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.border.Border;
import javax.swing.plaf.UIResource;
/**
* DefaultTreeCellRenderer
* A default implementation of the {@link TreeCellRenderer} interface.
*
* @author Andrew Selkirk
*/
@ -64,71 +65,81 @@ public class DefaultTreeCellRenderer
extends JLabel
implements TreeCellRenderer
{
// -------------------------------------------------------------
// Variables --------------------------------------------------
// -------------------------------------------------------------
/**
* selected
* A flag indicating the current selection status.
*/
protected boolean selected;
/**
* hasFocus
* A flag indicating the current focus status.
*/
protected boolean hasFocus;
/**
* drawsFocusBorderAroundIcon
* drawsFocusBorderAroundIcon // FIXME: is this used?
*/
private boolean drawsFocusBorderAroundIcon;
/**
* closedIcon
* The icon used to represent non-leaf nodes that are closed.
*
* @see #setClosedIcon(Icon)
*/
protected transient Icon closedIcon;
/**
* leafIcon
* The icon used to represent leaf nodes.
*
* @see #setLeafIcon(Icon)
*/
protected transient Icon leafIcon;
/**
* openIcon
* The icon used to represent non-leaf nodes that are open.
*
* @see #setOpenIcon(Icon)
*/
protected transient Icon openIcon;
/**
* textSelectionColor
* The color used for text in selected cells.
*
* @see #setTextSelectionColor(Color)
*/
protected Color textSelectionColor;
/**
* textNonSelectionColor
* The color used for text in non-selected cells.
*
* @see #setTextNonSelectionColor(Color)
*/
protected Color textNonSelectionColor;
/**
* backgroundSelectionColor
* The background color for selected cells.
*
* @see #setBackgroundSelectionColor(Color)
*/
protected Color backgroundSelectionColor;
/**
* backgroundNonSelectionColor
* The background color for non-selected cells.
*
* @see #setBackgroundNonSelectionColor(Color)
*/
protected Color backgroundNonSelectionColor;
/**
* borderSelectionColor
* The border color for selected tree cells.
*
* @see #setBorderSelectionColor(Color)
*/
protected Color borderSelectionColor;
// -------------------------------------------------------------
// Initialization ---------------------------------------------
// -------------------------------------------------------------
/**
* Constructor DefaultTreeCellRenderer
* Creates a new tree cell renderer with defaults appropriate for the
* current {@link LookAndFeel}.
*/
public DefaultTreeCellRenderer()
{
@ -138,19 +149,17 @@ public class DefaultTreeCellRenderer
setTextNonSelectionColor(UIManager.getColor("Tree.textForeground"));
setTextSelectionColor(UIManager.getColor("Tree.selectionForeground"));
setBackgroundNonSelectionColor(UIManager.getColor("Tree.nonSelectionBackground"));
setBackgroundNonSelectionColor(UIManager.getColor("Tree.textBackground"));
setBackgroundSelectionColor(UIManager.getColor("Tree.selectionBackground"));
setBorderSelectionColor(UIManager.getColor("Tree.selectionBorderColor"));
}
// -------------------------------------------------------------
// Methods ----------------------------------------------------
// -------------------------------------------------------------
/**
* getDefaultOpenIcon
* Returns the default icon for non-leaf tree cells that are open (expanded).
* The icon is fetched from the defaults table for the current
* {@link LookAndFeel} using the key <code>Tree.openIcon</code>.
*
* @returns Icon
* @return The default icon.
*/
public Icon getDefaultOpenIcon()
{
@ -158,9 +167,11 @@ public class DefaultTreeCellRenderer
}
/**
* getDefaultClosedIcon
* Returns the default icon for non-leaf tree cells that are closed (not
* expanded). The icon is fetched from the defaults table for the current
* {@link LookAndFeel} using the key <code>Tree.closedIcon</code>.
*
* @returns Icon
* @return The default icon.
*/
public Icon getDefaultClosedIcon()
{
@ -168,9 +179,11 @@ public class DefaultTreeCellRenderer
}
/**
* getDefaultLeafIcon
* Returns the default icon for leaf tree cells. The icon is fetched from
* the defaults table for the current {@link LookAndFeel} using the key
* <code>Tree.leafIcon</code>.
*
* @returns Icon
* @return The default icon.
*/
public Icon getDefaultLeafIcon()
{
@ -178,20 +191,25 @@ public class DefaultTreeCellRenderer
}
/**
* setOpenIcon
* Sets the icon to be displayed for non-leaf nodes that are open (expanded).
* Set this to <code>null</code> if no icon is required.
*
* @param i
* the icon.
* @param icon the icon (<code>null</code> permitted).
*
* @see #getOpenIcon()
*/
public void setOpenIcon(Icon i)
public void setOpenIcon(Icon icon)
{
openIcon = i;
openIcon = icon;
}
/**
* getOpenIcon
* Returns the icon displayed for non-leaf nodes that are open (expanded).
* The default value is initialised from the {@link LookAndFeel}.
*
* @returns Icon
* @return The open icon (possibly <code>null</code>).
*
* @see #setOpenIcon(Icon)
*/
public Icon getOpenIcon()
{
@ -199,20 +217,25 @@ public class DefaultTreeCellRenderer
}
/**
* setClosedIcon
* Sets the icon to be displayed for non-leaf nodes that are closed. Set
* this to <code>null</code> if no icon is required.
*
* @param i
* the icon.
* @param icon the icon (<code>null</code> permitted).
*
* @see #getClosedIcon()
*/
public void setClosedIcon(Icon i)
public void setClosedIcon(Icon icon)
{
closedIcon = i;
closedIcon = icon;
}
/**
* getClosedIcon
* Returns the icon displayed for non-leaf nodes that are closed. The
* default value is initialised from the {@link LookAndFeel}.
*
* @returns Icon
* @return The closed icon (possibly <code>null</code>).
*
* @see #setClosedIcon(Icon)
*/
public Icon getClosedIcon()
{
@ -220,20 +243,25 @@ public class DefaultTreeCellRenderer
}
/**
* setLeafIcon
* Sets the icon to be displayed for leaf nodes. Set this to
* <code>null</code> if no icon is required.
*
* @param i
* the icon.
* @param icon the icon (<code>null</code> permitted).
*
* @see #getLeafIcon()
*/
public void setLeafIcon(Icon i)
public void setLeafIcon(Icon icon)
{
leafIcon = i;
leafIcon = icon;
}
/**
* getLeafIcon
* Returns the icon displayed for leaf nodes. The default value is
* initialised from the {@link LookAndFeel}.
*
* @returns Icon
* @return The leaf icon (possibly <code>null</code>).
*
* @see #setLeafIcon(Icon)
*/
public Icon getLeafIcon()
{
@ -241,10 +269,11 @@ public class DefaultTreeCellRenderer
}
/**
* setTextSelectionColor
* Sets the text color for tree cells that are selected.
*
* @param c
* the color.
* @param c the color (<code>null</code> permitted).
*
* @see #getTextSelectionColor()
*/
public void setTextSelectionColor(Color c)
{
@ -252,9 +281,13 @@ public class DefaultTreeCellRenderer
}
/**
* getTextSelectionColor
* Returns the text color for tree cells that are selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionForeground</code>.
*
* @returns Color
* @return The text color for tree cells that are selected.
*
* @see #setTextSelectionColor(Color)
*/
public Color getTextSelectionColor()
{
@ -262,10 +295,11 @@ public class DefaultTreeCellRenderer
}
/**
* setTextNonSelectionColor
* Sets the text color for tree cells that are not selected.
*
* @param c
* the color.
* @param c the color (<code>null</code> permitted).
*
* @see #getTextNonSelectionColor()
*/
public void setTextNonSelectionColor(Color c)
{
@ -273,9 +307,13 @@ public class DefaultTreeCellRenderer
}
/**
* getTextNonSelectionColor
* Returns the text color for tree cells that are not selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionForeground</code>.
*
* @returns Color
* @return The background color for tree cells that are not selected.
*
* @see #setTextgroundNonSelectionColor(Color)
*/
public Color getTextNonSelectionColor()
{
@ -283,10 +321,11 @@ public class DefaultTreeCellRenderer
}
/**
* setBackgroundSelectionColor
* Sets the background color for tree cells that are selected.
*
* @param c
* the color.
* @param c the color (<code>null</code> permitted).
*
* @see #getBackgroundSelectionColor()
*/
public void setBackgroundSelectionColor(Color c)
{
@ -294,9 +333,13 @@ public class DefaultTreeCellRenderer
}
/**
* getBackgroundSelectionColor
* Returns the background color for tree cells that are selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionBackground</code>.
*
* @returns Color
* @return The background color for tree cells that are selected.
*
* @see #setBackgroundSelectionColor(Color)
*/
public Color getBackgroundSelectionColor()
{
@ -304,10 +347,11 @@ public class DefaultTreeCellRenderer
}
/**
* setBackgroundNonSelectionColor
* Sets the background color for tree cells that are not selected.
*
* @param c
* the color.
* @param c the color (<code>null</code> permitted).
*
* @see #getBackgroundNonSelectionColor()
*/
public void setBackgroundNonSelectionColor(Color c)
{
@ -315,9 +359,13 @@ public class DefaultTreeCellRenderer
}
/**
* getBackgroundNonSelectionColor
* Returns the background color for tree cells that are not selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.textBackground</code>.
*
* @returns Color
* @return The background color for tree cells that are not selected.
*
* @see #setBackgroundNonSelectionColor(Color)
*/
public Color getBackgroundNonSelectionColor()
{
@ -325,10 +373,11 @@ public class DefaultTreeCellRenderer
}
/**
* setBorderSelectionColor
* Sets the border color for tree cells that are selected.
*
* @param c
* the color.
* @param c the color (<code>null</code> permitted).
*
* @see #getBorderSelectionColor()
*/
public void setBorderSelectionColor(Color c)
{
@ -336,9 +385,13 @@ public class DefaultTreeCellRenderer
}
/**
* getBorderSelectionColor
* Returns the border color for tree cells that are selected.
* The default value is obtained from the {@link LookAndFeel} defaults
* table using the key <code>Tree.selectionBorderColor</code>.
*
* @returns Color
* @return The border color for tree cells that are selected.
*
* @see #setBorderSelectionColor(Color)
*/
public Color getBorderSelectionColor()
{
@ -346,10 +399,11 @@ public class DefaultTreeCellRenderer
}
/**
* setFont
* Sets the font.
*
* @param f
* the font.
* @param f the font.
*
* @see #getFont()
*/
public void setFont(Font f)
{
@ -359,10 +413,9 @@ public class DefaultTreeCellRenderer
}
/**
* setBackground
* Sets the background color.
*
* @param c
* the color.
* @param c the color.
*/
public void setBackground(Color c)
{
@ -372,23 +425,18 @@ public class DefaultTreeCellRenderer
}
/**
* getTreeCellRendererComponent
* Returns a component (in fact <code>this</code>) that can be used to
* render a tree cell with the specified state.
*
* @param tree
* TODO
* @param val
* TODO
* @param selected
* TODO
* @param expanded
* TODO
* @param leaf
* TODO
* @param row
* TODO
* @param hasFocus
* TODO
* @returns Component
* @param tree the tree that the cell belongs to.
* @param val the cell value.
* @param selected indicates whether or not the cell is selected.
* @param expanded indicates whether or not the cell is expanded.
* @param leaf indicates whether or not the cell is a leaf in the tree.
* @param row the row index.
* @param hasFocus indicates whether or not the cell has the focus.
*
* @return <code>this</code>.
*/
public Component getTreeCellRendererComponent(JTree tree, Object val,
boolean selected,
@ -433,9 +481,11 @@ public class DefaultTreeCellRenderer
}
/**
* getFont
* Returns the current font.
*
* @return the current Font
* @return The current font.
*
* @see #setFont(Font)
*/
public Font getFont()
{
@ -460,7 +510,7 @@ public class DefaultTreeCellRenderer
insets = border.getBorderInsets(this);
FontMetrics fm = getToolkit().getFontMetrics(getFont());
SwingUtilities.layoutCompoundLabel(((JLabel) this), fm, getText(),
SwingUtilities.layoutCompoundLabel((JLabel) this, fm, getText(),
getIcon(), getVerticalAlignment(),
getHorizontalAlignment(),
getVerticalTextPosition(),
@ -471,7 +521,7 @@ public class DefaultTreeCellRenderer
Rectangle bounds = getBounds(ir);
bounds.x = tr.x - insets.left;
bounds.width = tr.width + insets.left+insets.right;
bounds.width = tr.width + insets.left + insets.right;
g.setColor(super.getBackground());
g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);
@ -491,9 +541,9 @@ public class DefaultTreeCellRenderer
}
/**
* returns the preferred size of the cell.
* Returns the preferred size of the cell.
*
* @returns Dimension
* @return The preferred size of the cell.
*/
public Dimension getPreferredSize()
{
@ -502,7 +552,7 @@ public class DefaultTreeCellRenderer
Rectangle tr = new Rectangle();
FontMetrics fm = getToolkit().getFontMetrics(getFont());
SwingUtilities.layoutCompoundLabel(((JLabel) this), fm, getText(),
SwingUtilities.layoutCompoundLabel((JLabel) this, fm, getText(),
getIcon(), getVerticalAlignment(),
getHorizontalAlignment(),
getVerticalTextPosition(),
@ -510,182 +560,156 @@ public class DefaultTreeCellRenderer
getIconTextGap());
Rectangle cr = ir.union(tr);
return new Dimension(cr.width, cr.height);
} // getPreferredSize()
}
/**
* validate
* For performance reasons, this method is overridden to do nothing.
*/
public void validate()
{
// Overridden for performance reasons.
} // validate()
}
/**
* revalidate
* For performance reasons, this method is overridden to do nothing.
*/
public void revalidate()
{
// Overridden for performance reasons.
} // revalidate()
}
/**
* repaint
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param value3
* TODO
* @param value4
* TODO
* @param tm ignored
* @param x coordinate of the region to mark as dirty
* @param y coordinate of the region to mark as dirty
* @param width dimension of the region to mark as dirty
* @param height dimension of the region to mark as dirty
*/
public void repaint(long value0, int value1, int value2, int value3,
int value4)
public void repaint(long tm, int x, int y, int width, int height)
{
// Overridden for performance reasons.
} // repaint()
}
/**
* repaint
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param area the area to repaint.
*/
public void repaint(Rectangle value0)
public void repaint(Rectangle area)
{
// Overridden for performance reasons.
} // repaint()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
protected void firePropertyChange(String value0, Object value1, Object value2)
protected void firePropertyChange(String name, Object oldValue,
Object newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String value0, byte value1, byte value2)
public void firePropertyChange(String name, byte oldValue, byte newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String value0, char value1, char value2)
public void firePropertyChange(String name, char oldValue, char newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String value0, short value1, short value2)
public void firePropertyChange(String name, short oldValue, short newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String value0, int value1, int value2)
public void firePropertyChange(String name, int oldValue, int newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String value0, long value1, long value2)
public void firePropertyChange(String name, long oldValue, long newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0
* TODO
* @param value1
* TODO
* @param value2
* TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String value0, float value1, float value2)
public void firePropertyChange(String name, float oldValue, float newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param value0 TODO
* @param value1 TODO
* @param value2 TODO
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String value0, double value1, double value2)
public void firePropertyChange(String name, double oldValue, double newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
/**
* firePropertyChange
* For performance reasons, this method is overridden to do nothing.
*
* @param name the property name.
* @param v1 the old value.
* @param v2 the new value.
* @param name the property name.
* @param oldValue the old value.
* @param newValue the new value.
*/
public void firePropertyChange(String name, boolean v1, boolean v2)
public void firePropertyChange(String name, boolean oldValue,
boolean newValue)
{
// Overridden for performance reasons.
} // firePropertyChange()
}
} // DefaultTreeCellRenderer
}