+2004-07-17 Mark Wielaard <mark@klomp.org>
+
+ * javax/swing/Box.java: Put FIXME comment above class declaration.
+ * javax/swing/JButton.java: Remove illegal L&F HTML from comments.
+ * javax/swing/JCheckBox.java: Likewise.
+ * javax/swing/JDialog.java: Likewise.
+ * javax/swing/JRadioButton.java: Likewise.
+ * javax/swing/JToggleButton.java: Likewise.
+ * javax/swing/UIManager.java: Likewise.
+ * javax/swing/border/TitledBorder.java: Likewise.
+ * javax/swing/plaf/basic/BasicLabelUI.java: Likewise.
+ * javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise.
+ * javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: Likewise.
+ * javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise.
+ * javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise.
+ * javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise.
+ * javax/swing/text/JTextComponent.java: Likewise.
+
2004-07-17 Jeroen Frijters <jeroen@frijters.net>
* java/net/DatagramPacket.java (setAddress): Removed check for
{
private static final long serialVersionUID = 1525417495883046342L;
- protected class AccessibleBox
// FIXME: disable to make libjava compile; visibility rules are broken
- // extends Container.AccessibleAWTContainer
+ protected class AccessibleBox // extends Container.AccessibleAWTContainer
{
private static final long serialVersionUID = -7775079816389931944L;
{
private static final long serialVersionUID = -1204263191910183998L;
- protected class AccessibleBoxFiller
// FIXME: disable to make libjava compile; visibility rules are broken
- // extends Component.AccessibleAWTComponent
+ protected class AccessibleBoxFiller // extends Component.AccessibleAWTComponent
{
private static final long serialVersionUID = 164963348357479321L;
public String getUIClassID()
{
- //Returns a string that specifies the name of the L&F class that renders this component.
+ //Returns a string that specifies the name of the Look and Feel
+ //class that renders this component.
return "ButtonUI";
}
public String getUIClassID()
{
- //Returns a string that specifies the name of the L&F class that renders this component.
+ //Returns a string that specifies the name of the Look and Feel
+ //class that renders this component.
return "CheckBoxUI";
}
/** The default action taken when closed. */
private int close_action = HIDE_ON_CLOSE;
- /** Whether JDialogs are decorated by the L&F. */
+ /** Whether JDialogs are decorated by the Look and Feel. */
private static boolean decorated = false;
/**
* This method returns whether JDialogs will have their
* window decorations provided by the Look and Feel.
*
- * @return Whether the window decorations are L&F provided.
+ * @return Whether the window decorations are Look and Feel provided.
*/
public static boolean isDefaultLookAndFeelDecorated()
{
* window decorations provided by the Look and Feel.
*
* @param defaultLookAndFeelDecorated Whether the window
- * decorations are L&F provided.
+ * decorations are Look and Feel provided.
*/
public static void setDefaultLookAndFeelDecorated(boolean defaultLookAndFeelDecorated)
{
public String getUIClassID()
{
- //Returns a string that specifies the name of the L&F class that renders this component.
+ //Returns a string that specifies the name of the Look and Feel
+ //class that renders this component.
return "RadioButtonUI";
}
}
/**
- * Returns a string that specifies the name of the L&F class that renders
- * this component.
+ * Returns a string that specifies the name of the Look and Feel
+ * class that renders this component.
*/
public String getUIClassID()
{
/* UIManager.java --
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
*
* @param key an Object that specifies the font. Typically,
* this is a String such as
- * <code>"TitledBorder.font"</code>.
+ * <code>TitledBorder.font</code>.
*/
public static Font getFont(Object key)
{
}
public static ComponentUI getUI(JComponent target)
- // Returns the L&F object that renders the target component.
+ // Returns the Look and Feel object that renders the target component.
{
ComponentUI ui = getDefaults().getUI(target);
//System.out.println("GET-UI-> " + ui + ", for " + target);
* The border underneath the title. If this value is
* <code>null</code>, the border will be retrieved from the {@link
* javax.swing.UIManager}’s defaults table using the key
- * <code>"TitledBorder.border"</code>.
+ * <code>TitledBorder.border</code>.
*/
protected Border border;
* The font for displaying the title text. If this value is
* <code>null</code>, the font will be retrieved from the {@link
* javax.swing.UIManager}’s defaults table using the key
- * <code>"TitledBorder.font"</code>.
+ * <code>TitledBorder.font</code>.
*/
protected Font titleFont;
* The color for displaying the title text. If this value is
* <code>null</code>, the color will be retrieved from the {@link
* javax.swing.UIManager}’s defaults table using the key
- * <code>"TitledBorder.titleColor"</code>.
+ * <code>TitledBorder.titleColor</code>.
*/
protected Color titleColor;
* Retrieves the border underneath the title. If no border has been
* set, or if it has been set to<code>null</code>, the current
* {@link javax.swing.LookAndFeel} will be asked for a border
- * using the key <code>"TitledBorder.border"</code>.
+ * using the key <code>TitledBorder.border</code>.
*
* @return a border, or <code>null</code> if the current LookAndFeel
* does not provide a border for the key
- * <code>"TitledBorder.border"</code>.
+ * <code>TitledBorder.border</code>.
*
* @see javax.swing.UIManager#getBorder(Object)
*/
* Retrieves the font for displaying the title text. If no font has
* been set, or if it has been set to<code>null</code>, the current
* {@link javax.swing.LookAndFeel} will be asked for a font
- * using the key <code>"TitledBorder.font"</code>.
+ * using the key <code>TitledBorder.font</code>.
*
* @return a font, or <code>null</code> if the current LookAndFeel
* does not provide a font for the key
- * <code>"TitledBorder.font"</code>.
+ * <code>TitledBorder.font</code>.
*
* @see javax.swing.UIManager#getFont(Object)
*/
* Retrieves the color for displaying the title text. If no color has
* been set, or if it has been set to<code>null</code>, the current
* {@link javax.swing.LookAndFeel} will be asked for a color
- * using the key <code>"TitledBorder.titleColor"</code>.
+ * using the key <code>TitledBorder.titleColor</code>.
*
* @return a color, or <code>null</code> if the current LookAndFeel
* does not provide a color for the key
- * <code>"TitledBorder.titleColor"</code>.
+ * <code>TitledBorder.titleColor</code>.
*
* @see javax.swing.UIManager#getColor(Object)
*/
/**
- * The border that constitues the "interior" border
+ * The border that constitues the interior border
* underneath the title text.
*/
Border border;
/**
* This is the Basic Look and Feel class for the JLabel. One BasicLabelUI
- * object is used to paint all JLabels that utilize the Basic L&F.
+ * object is used to paint all JLabels that utilize the Basic Look and Feel.
*/
public class BasicLabelUI extends LabelUI implements PropertyChangeListener
{
*
* @param c The {@link JComponent} that a UI is being created for.
*
- * @return A label UI for the Basic L&F.
+ * @return A label UI for the Basic Look and Feel.
*/
public static ComponentUI createUI(JComponent c)
{
/* BasicLookAndFeel.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
{
Object[] uiDefaults;
- // The JDK's default L&F happens to use these three purple shades
+ // The default Look and Feel happens to use these three purple shades
// extensively.
Color lightPurple = new Color(0xCC, 0xCC, 0xFF);
Color midPurple = new Color(0x99, 0x99, 0xCC);
/**
- * The Basic L&F UI delegate for JPopupMenu.Separator.
+ * The Basic Look and Feel UI delegate for JPopupMenu.Separator.
*/
public class BasicPopupMenuSeparatorUI extends BasicSeparatorUI
{
// The total number of frames must be an even number.
// The total number of frames is calculated from
// the cycleTime and repaintInterval given by
- // the basic L&F's defaults.
+ // the basic Look and Feel defaults.
//
// +-----------------------------------------------+
// | frame0 | frame1 | frame2 | frame 3 | frame 4 |
/**
* This method configures the scrollbar's colors. This can be
- * done by looking up the standard colors from the L&F defaults.
+ * done by looking up the standard colors from the Look and Feel defaults.
*/
protected void configureScrollBarColors()
{
/**
* This method installs the defaults for the scrollbar specified
- * by the Basic L&F.
+ * by the Basic Look and Feel.
*/
protected void installDefaults()
{
/**
* This method uninstalls any defaults that this
- * scrollbar acquired from the Basic L&F defaults.
+ * scrollbar acquired from the Basic Look and Feel defaults.
*/
protected void uninstallDefaults()
{
import javax.swing.SwingUtilities;
/**
- * The Basic L&F UI delegate for JSeparator.
+ * The Basic Look and Feel UI delegate for JSeparator.
*/
public class BasicSeparatorUI extends SeparatorUI
{
/**
* This method installs the defaults that are given by
- * the Basic L&F.
+ * the Basic Look and Feel.
*
* @param s The JSeparator that is being installed.
*/
/**
* This method removes the defaults that were given
- * by the Basic L&F.
+ * by the Basic Look and Feel.
*
* @param s The JSeparator that is being uninstalled.
*/
}
/**
- * Returns a string that specifies the name of the l&f class
+ * Returns a string that specifies the name of the Look and Feel class
* that renders this component.
*
* @return the string "TextComponentUI"