This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: javax.swing - javadoc fixes
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sat, 17 Jul 2004 14:48:07 +0200
- Subject: Patch: javax.swing - javadoc fixes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to trunk to merge swing with
classpath again. I will put this patch into java-gui-branch soon too.
Michael
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.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFA+SANWSOgCCdjSDsRAmEAAJ43av90LbVhzBs/qoP500kLqwNr0gCgjEf1
75llly1KOVJY601KpRmNK6o=
=KadP
-----END PGP SIGNATURE-----
Index: javax/swing/Box.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Box.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 Box.java
--- javax/swing/Box.java 17 Jun 2004 23:43:12 -0000 1.5
+++ javax/swing/Box.java 17 Jul 2004 12:40:32 -0000
@@ -55,9 +55,8 @@
{
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 @@
{
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;
Index: javax/swing/JButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JButton.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JButton.java
--- javax/swing/JButton.java 17 Jun 2004 23:43:12 -0000 1.5
+++ javax/swing/JButton.java 17 Jul 2004 12:40:32 -0000
@@ -98,7 +98,8 @@
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";
}
Index: javax/swing/JCheckBox.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBox.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JCheckBox.java
--- javax/swing/JCheckBox.java 17 Jun 2004 23:43:12 -0000 1.4
+++ javax/swing/JCheckBox.java 17 Jul 2004 12:40:32 -0000
@@ -85,7 +85,8 @@
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";
}
Index: javax/swing/JDialog.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDialog.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JDialog.java
--- javax/swing/JDialog.java 17 Jun 2004 23:43:12 -0000 1.5
+++ javax/swing/JDialog.java 17 Jul 2004 12:40:32 -0000
@@ -76,7 +76,7 @@
/** 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 @@
* 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 @@
* 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)
{
Index: javax/swing/JRadioButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButton.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JRadioButton.java
--- javax/swing/JRadioButton.java 17 Jun 2004 23:43:12 -0000 1.4
+++ javax/swing/JRadioButton.java 17 Jul 2004 12:40:32 -0000
@@ -80,7 +80,8 @@
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";
}
Index: javax/swing/JToggleButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToggleButton.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 JToggleButton.java
--- javax/swing/JToggleButton.java 17 Jun 2004 23:43:12 -0000 1.6
+++ javax/swing/JToggleButton.java 17 Jul 2004 12:40:32 -0000
@@ -115,8 +115,8 @@
}
/**
- * 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()
{
Index: javax/swing/UIManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/UIManager.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 UIManager.java
--- javax/swing/UIManager.java 5 Jun 2004 15:16:46 -0000 1.8
+++ javax/swing/UIManager.java 17 Jul 2004 12:40:32 -0000
@@ -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 @@
*
* @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)
{
@@ -253,7 +253,7 @@
}
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);
Index: javax/swing/border/TitledBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/TitledBorder.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 TitledBorder.java
--- javax/swing/border/TitledBorder.java 5 May 2004 09:16:15 -0000 1.5
+++ javax/swing/border/TitledBorder.java 17 Jul 2004 12:40:32 -0000
@@ -252,7 +252,7 @@
* 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;
@@ -279,7 +279,7 @@
* 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;
@@ -288,7 +288,7 @@
* 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;
@@ -717,11 +717,11 @@
* 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)
*/
@@ -766,11 +766,11 @@
* 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)
*/
@@ -787,11 +787,11 @@
* 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)
*/
@@ -1088,7 +1088,7 @@
/**
- * The border that constitues the "interior" border
+ * The border that constitues the interior border
* underneath the title text.
*/
Border border;
Index: javax/swing/plaf/basic/BasicLabelUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicLabelUI.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 BasicLabelUI.java
--- javax/swing/plaf/basic/BasicLabelUI.java 27 May 2004 06:17:42 -0000 1.7
+++ javax/swing/plaf/basic/BasicLabelUI.java 17 Jul 2004 12:40:32 -0000
@@ -59,7 +59,7 @@
/**
* 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 @@
*
* @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)
{
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java 17 Jun 2004 23:43:13 -0000 1.8
+++ javax/swing/plaf/basic/BasicLookAndFeel.java 17 Jul 2004 12:40:33 -0000
@@ -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 @@
{
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);
Index: javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicPopupMenuSeparatorUI.java
--- javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java 17 Jun 2004 23:43:15 -0000 1.2
+++ javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java 17 Jul 2004 12:40:33 -0000
@@ -53,7 +53,7 @@
/**
- * The Basic L&F UI delegate for JPopupMenu.Separator.
+ * The Basic Look and Feel UI delegate for JPopupMenu.Separator.
*/
public class BasicPopupMenuSeparatorUI extends BasicSeparatorUI
{
Index: javax/swing/plaf/basic/BasicProgressBarUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicProgressBarUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicProgressBarUI.java
--- javax/swing/plaf/basic/BasicProgressBarUI.java 17 Jun 2004 23:43:14 -0000 1.5
+++ javax/swing/plaf/basic/BasicProgressBarUI.java 17 Jul 2004 12:40:33 -0000
@@ -139,7 +139,7 @@
// 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 |
Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 BasicScrollBarUI.java
--- javax/swing/plaf/basic/BasicScrollBarUI.java 17 Jun 2004 23:43:14 -0000 1.6
+++ javax/swing/plaf/basic/BasicScrollBarUI.java 17 Jul 2004 12:40:34 -0000
@@ -571,7 +571,7 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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()
{
Index: javax/swing/plaf/basic/BasicSeparatorUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicSeparatorUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicSeparatorUI.java
--- javax/swing/plaf/basic/BasicSeparatorUI.java 27 May 2004 06:17:42 -0000 1.3
+++ javax/swing/plaf/basic/BasicSeparatorUI.java 17 Jul 2004 12:40:34 -0000
@@ -51,7 +51,7 @@
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 @@
/**
* 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 @@
/**
* 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.
*/
Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/JTextComponent.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 JTextComponent.java
--- javax/swing/text/JTextComponent.java 17 Jun 2004 23:43:15 -0000 1.6
+++ javax/swing/text/JTextComponent.java 17 Jul 2004 12:40:34 -0000
@@ -371,7 +371,7 @@
}
/**
- * 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"