From 6fd3cc05db5e1d259d184105feb5f1111350661d Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sat, 17 Jul 2004 12:42:46 +0000 Subject: [PATCH] Box.java: Put FIXME comment above class declaration. 2004-07-17 Mark Wielaard * 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. From-SVN: r84866 --- libjava/ChangeLog | 18 +++++++++++++++++ libjava/javax/swing/Box.java | 6 ++---- libjava/javax/swing/JButton.java | 3 ++- libjava/javax/swing/JCheckBox.java | 3 ++- libjava/javax/swing/JDialog.java | 6 +++--- libjava/javax/swing/JRadioButton.java | 3 ++- libjava/javax/swing/JToggleButton.java | 4 ++-- libjava/javax/swing/UIManager.java | 6 +++--- libjava/javax/swing/border/TitledBorder.java | 20 +++++++++---------- .../javax/swing/plaf/basic/BasicLabelUI.java | 4 ++-- .../swing/plaf/basic/BasicLookAndFeel.java | 4 ++-- .../plaf/basic/BasicPopupMenuSeparatorUI.java | 2 +- .../swing/plaf/basic/BasicProgressBarUI.java | 2 +- .../swing/plaf/basic/BasicScrollBarUI.java | 6 +++--- .../swing/plaf/basic/BasicSeparatorUI.java | 6 +++--- libjava/javax/swing/text/JTextComponent.java | 2 +- 16 files changed, 57 insertions(+), 38 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b73fa460978..375f109b6fc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,21 @@ +2004-07-17 Mark Wielaard + + * 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 * java/net/DatagramPacket.java (setAddress): Removed check for diff --git a/libjava/javax/swing/Box.java b/libjava/javax/swing/Box.java index f5d090e0b9d..4e338747859 100644 --- a/libjava/javax/swing/Box.java +++ b/libjava/javax/swing/Box.java @@ -55,9 +55,8 @@ public class Box extends JComponent implements Accessible { 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; @@ -75,9 +74,8 @@ public class Box extends JComponent implements Accessible { 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; diff --git a/libjava/javax/swing/JButton.java b/libjava/javax/swing/JButton.java index 0eb5e448201..cb44992f3be 100644 --- a/libjava/javax/swing/JButton.java +++ b/libjava/javax/swing/JButton.java @@ -98,7 +98,8 @@ public class JButton extends AbstractButton implements Accessible 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"; } diff --git a/libjava/javax/swing/JCheckBox.java b/libjava/javax/swing/JCheckBox.java index 94aba4a4733..b4620593ed4 100644 --- a/libjava/javax/swing/JCheckBox.java +++ b/libjava/javax/swing/JCheckBox.java @@ -85,7 +85,8 @@ public class JCheckBox extends JToggleButton 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"; } diff --git a/libjava/javax/swing/JDialog.java b/libjava/javax/swing/JDialog.java index 598f4931cd3..d3315801828 100644 --- a/libjava/javax/swing/JDialog.java +++ b/libjava/javax/swing/JDialog.java @@ -76,7 +76,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants, /** 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; /** @@ -237,7 +237,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants, * 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() { @@ -249,7 +249,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants, * 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) { diff --git a/libjava/javax/swing/JRadioButton.java b/libjava/javax/swing/JRadioButton.java index 0802ac09ba4..54582f6001a 100644 --- a/libjava/javax/swing/JRadioButton.java +++ b/libjava/javax/swing/JRadioButton.java @@ -80,7 +80,8 @@ public class JRadioButton extends JToggleButton 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"; } diff --git a/libjava/javax/swing/JToggleButton.java b/libjava/javax/swing/JToggleButton.java index 9f3395aa227..67371da0f14 100644 --- a/libjava/javax/swing/JToggleButton.java +++ b/libjava/javax/swing/JToggleButton.java @@ -115,8 +115,8 @@ public class JToggleButton extends AbstractButton implements Accessible } /** - * 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() { diff --git a/libjava/javax/swing/UIManager.java b/libjava/javax/swing/UIManager.java index 4ad95308647..0310ed640e4 100644 --- a/libjava/javax/swing/UIManager.java +++ b/libjava/javax/swing/UIManager.java @@ -1,5 +1,5 @@ /* 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. @@ -194,7 +194,7 @@ public class UIManager implements Serializable * * @param key an Object that specifies the font. Typically, * this is a String such as - * "TitledBorder.font". + * TitledBorder.font. */ public static Font getFont(Object key) { @@ -253,7 +253,7 @@ public class UIManager implements Serializable } 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); diff --git a/libjava/javax/swing/border/TitledBorder.java b/libjava/javax/swing/border/TitledBorder.java index 8b9fe2a73be..b257ce1c7ad 100644 --- a/libjava/javax/swing/border/TitledBorder.java +++ b/libjava/javax/swing/border/TitledBorder.java @@ -252,7 +252,7 @@ public class TitledBorder * The border underneath the title. If this value is * null, the border will be retrieved from the {@link * javax.swing.UIManager}’s defaults table using the key - * "TitledBorder.border". + * TitledBorder.border. */ protected Border border; @@ -279,7 +279,7 @@ public class TitledBorder * The font for displaying the title text. If this value is * null, the font will be retrieved from the {@link * javax.swing.UIManager}’s defaults table using the key - * "TitledBorder.font". + * TitledBorder.font. */ protected Font titleFont; @@ -288,7 +288,7 @@ public class TitledBorder * The color for displaying the title text. If this value is * null, the color will be retrieved from the {@link * javax.swing.UIManager}’s defaults table using the key - * "TitledBorder.titleColor". + * TitledBorder.titleColor. */ protected Color titleColor; @@ -717,11 +717,11 @@ public class TitledBorder * Retrieves the border underneath the title. If no border has been * set, or if it has been set tonull, the current * {@link javax.swing.LookAndFeel} will be asked for a border - * using the key "TitledBorder.border". + * using the key TitledBorder.border. * * @return a border, or null if the current LookAndFeel * does not provide a border for the key - * "TitledBorder.border". + * TitledBorder.border. * * @see javax.swing.UIManager#getBorder(Object) */ @@ -766,11 +766,11 @@ public class TitledBorder * Retrieves the font for displaying the title text. If no font has * been set, or if it has been set tonull, the current * {@link javax.swing.LookAndFeel} will be asked for a font - * using the key "TitledBorder.font". + * using the key TitledBorder.font. * * @return a font, or null if the current LookAndFeel * does not provide a font for the key - * "TitledBorder.font". + * TitledBorder.font. * * @see javax.swing.UIManager#getFont(Object) */ @@ -787,11 +787,11 @@ public class TitledBorder * Retrieves the color for displaying the title text. If no color has * been set, or if it has been set tonull, the current * {@link javax.swing.LookAndFeel} will be asked for a color - * using the key "TitledBorder.titleColor". + * using the key TitledBorder.titleColor. * * @return a color, or null if the current LookAndFeel * does not provide a color for the key - * "TitledBorder.titleColor". + * TitledBorder.titleColor. * * @see javax.swing.UIManager#getColor(Object) */ @@ -1088,7 +1088,7 @@ public class TitledBorder /** - * The border that constitues the "interior" border + * The border that constitues the interior border * underneath the title text. */ Border border; diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.java b/libjava/javax/swing/plaf/basic/BasicLabelUI.java index 782c2f0e5fa..46d012ddd58 100644 --- a/libjava/javax/swing/plaf/basic/BasicLabelUI.java +++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.java @@ -59,7 +59,7 @@ import javax.swing.plaf.LabelUI; /** * 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 { @@ -81,7 +81,7 @@ 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) { diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java index 0da43dd9a39..314ab5f665c 100644 --- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java +++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java @@ -1,5 +1,5 @@ /* BasicLookAndFeel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -228,7 +228,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel { 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); diff --git a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java index a1adf01731c..caa5f8ddd34 100644 --- a/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java +++ b/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java @@ -53,7 +53,7 @@ import javax.swing.plaf.SeparatorUI; /** - * The Basic L&F UI delegate for JPopupMenu.Separator. + * The Basic Look and Feel UI delegate for JPopupMenu.Separator. */ public class BasicPopupMenuSeparatorUI extends BasicSeparatorUI { diff --git a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java index d171917172f..fa84267efa2 100644 --- a/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java @@ -139,7 +139,7 @@ public class BasicProgressBarUI extends ProgressBarUI // 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 | diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java index b16f2a733e2..478ecc08d42 100644 --- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java +++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java @@ -571,7 +571,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, /** * 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() { @@ -891,7 +891,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, /** * This method installs the defaults for the scrollbar specified - * by the Basic L&F. + * by the Basic Look and Feel. */ protected void installDefaults() { @@ -1257,7 +1257,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager, /** * 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() { diff --git a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.java b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.java index 8f4500fd58c..9149cb85d80 100644 --- a/libjava/javax/swing/plaf/basic/BasicSeparatorUI.java +++ b/libjava/javax/swing/plaf/basic/BasicSeparatorUI.java @@ -51,7 +51,7 @@ import javax.swing.JSeparator; 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 { @@ -113,7 +113,7 @@ 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. */ @@ -128,7 +128,7 @@ public class BasicSeparatorUI extends SeparatorUI /** * 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. */ diff --git a/libjava/javax/swing/text/JTextComponent.java b/libjava/javax/swing/text/JTextComponent.java index 6451ef5c31f..d5227d03e08 100644 --- a/libjava/javax/swing/text/JTextComponent.java +++ b/libjava/javax/swing/text/JTextComponent.java @@ -371,7 +371,7 @@ public abstract class JTextComponent extends JComponent } /** - * 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" -- 2.30.2