2004-07-08 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.

6 files changed, 12 insertions, 12 deletions

diff --git a/javax/swing/plaf/basic/BasicLabelUI.java b/javax/swing/plaf/basic/BasicLabelUI.java
index 782c2f0e5..46d012ddd 100644
--- a/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/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/javax/swing/plaf/basic/BasicLookAndFeel.java b/javax/swing/plaf/basic/BasicLookAndFeel.java
index 0da43dd9a..314ab5f66 100644
--- a/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/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/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java b/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
index a1adf0173..caa5f8ddd 100644
--- a/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
+++ b/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/javax/swing/plaf/basic/BasicProgressBarUI.java b/javax/swing/plaf/basic/BasicProgressBarUI.java
index d17191717..fa84267ef 100644
--- a/javax/swing/plaf/basic/BasicProgressBarUI.java
+++ b/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/javax/swing/plaf/basic/BasicScrollBarUI.java b/javax/swing/plaf/basic/BasicScrollBarUI.java
index b16f2a733..478ecc08d 100644
--- a/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/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/javax/swing/plaf/basic/BasicSeparatorUI.java b/javax/swing/plaf/basic/BasicSeparatorUI.java
index 8f4500fd5..9149cb85d 100644
--- a/javax/swing/plaf/basic/BasicSeparatorUI.java
+++ b/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.
    */