* javax/swing/AbstractButton.java: Replace special HTML entities with

       ASCII equivalent.
       * javax/swing/DefaultBoundedRangeModel.java: Likewise.
       * javax/swing/DefaultButtonModel.java: Likewise.
       * javax/swing/DefaultListModel.java: Likewise.
       * javax/swing/JList.java: Likewise.
       * javax/swing/JSlider.java: Likewise.
       * javax/swing/ListModel.java: Likewise.
       * javax/swing/Popup.java: Likewise.
       * javax/swing/SwingUtilities.java: Likewise.

10 files changed, 24 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 2bf07d0b7..99fd3a3f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2004-05-01  Mark Wielaard  <mark@klomp.org>
 
+	* javax/swing/AbstractButton.java: Replace special HTML entities with
+	ASCII equivalent.
+	* javax/swing/DefaultBoundedRangeModel.java: Likewise.
+	* javax/swing/DefaultButtonModel.java: Likewise.
+	* javax/swing/DefaultListModel.java: Likewise.
+	* javax/swing/JList.java: Likewise.
+	* javax/swing/JSlider.java: Likewise.
+	* javax/swing/ListModel.java: Likewise.
+	* javax/swing/Popup.java: Likewise.
+	* javax/swing/SwingUtilities.java: Likewise.
+
+2004-05-01  Mark Wielaard  <mark@klomp.org>
+
 	Import GNU JAXP 2004-02-01
 	* external/jaxp/source/gnu/xml/aelfred2/JAXPFactory.java: Imported.
 	* external/jaxp/source/gnu/xml/aelfred2/SAXDriver.java: Idem.
diff --git a/javax/swing/AbstractButton.java b/javax/swing/AbstractButton.java
index 26ec727b0..b2d2c52b8 100644
--- a/javax/swing/AbstractButton.java
+++ b/javax/swing/AbstractButton.java
@@ -147,8 +147,8 @@ import javax.swing.text.AttributeSet;
  *
  * </ul>
  *
- * @author Ronald Veldema (rveldema&064;cs.vu.nl)
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Ronald Veldema (rveldema@cs.vu.nl)
+ * @author Graydon Hoare (graydon@redhat.com)
  */
 
 public abstract class AbstractButton extends JComponent
diff --git a/javax/swing/DefaultBoundedRangeModel.java b/javax/swing/DefaultBoundedRangeModel.java
index 8ca178dd5..3294c1d9e 100644
--- a/javax/swing/DefaultBoundedRangeModel.java
+++ b/javax/swing/DefaultBoundedRangeModel.java
@@ -203,7 +203,7 @@ public class DefaultBoundedRangeModel
    * Changes the current value of this bounded range model. In a
    * scroll bar visualization of a {@link BoundedRangeModel}, the
    * <code>value</code> is displayed as the position of the thumb;
-   * changing the <code>value</code> of a scroll bar&#x2019;s model
+   * changing the <code>value</code> of a scroll bar's model
    * thus moves the thumb to a different position.
    */
   public void setValue(int value)
diff --git a/javax/swing/DefaultButtonModel.java b/javax/swing/DefaultButtonModel.java
index 7683e8538..a608de448 100644
--- a/javax/swing/DefaultButtonModel.java
+++ b/javax/swing/DefaultButtonModel.java
@@ -71,7 +71,7 @@ import javax.swing.event.EventListenerList;
  *
  * In all other respects this class is just a container of boolean flags.
  *
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
  */
 public class DefaultButtonModel implements ButtonModel, Serializable
 {
diff --git a/javax/swing/DefaultListModel.java b/javax/swing/DefaultListModel.java
index 0017ec292..53dd20cbc 100644
--- a/javax/swing/DefaultListModel.java
+++ b/javax/swing/DefaultListModel.java
@@ -47,7 +47,7 @@ import java.util.Vector;
  * java.util.Vector}.
  *
  * @author Andrew Selkirk
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
  */
 
 public class DefaultListModel extends AbstractListModel
diff --git a/javax/swing/JList.java b/javax/swing/JList.java
index 7ed776c03..e8d2228bc 100644
--- a/javax/swing/JList.java
+++ b/javax/swing/JList.java
@@ -99,7 +99,7 @@ import javax.swing.plaf.ListUI;
  * <tr><td>visibleRowCount                </td><td>list     </td><td>no    </td></tr>
  * </table> 
  *
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
  */
 
 public class JList extends JComponent implements Accessible, Scrollable
diff --git a/javax/swing/JSlider.java b/javax/swing/JSlider.java
index 24b0a490f..7350ea4ee 100644
--- a/javax/swing/JSlider.java
+++ b/javax/swing/JSlider.java
@@ -411,7 +411,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * This method returns a name to identify which look and feel class will be
    * the UI delegate for the slider.
    *
-   * @return The L&F classID. "SliderUI"
+   * @return The Look and Feel classID. "SliderUI"
    */
   public String getUIClassID()
   {
diff --git a/javax/swing/ListModel.java b/javax/swing/ListModel.java
index e11fc633c..1aa7bd206 100644
--- a/javax/swing/ListModel.java
+++ b/javax/swing/ListModel.java
@@ -42,7 +42,7 @@ import javax.swing.event.ListDataListener;
  * This is an interface to general list-like data, typically used as the
  * model object of a {@link JList} component.
  *
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
  */
 public interface ListModel
 {
diff --git a/javax/swing/Popup.java b/javax/swing/Popup.java
index b1cb4460a..1b8d08e33 100644
--- a/javax/swing/Popup.java
+++ b/javax/swing/Popup.java
@@ -163,7 +163,7 @@ public class Popup
 
 
     /**
-     * Displays the popup&#x2019;s <code>JWindow</code> on the screen.
+     * Displays the popup's <code>JWindow</code> on the screen.
      * Nothing happens if it is already visible.
      */
     public void show()
@@ -173,7 +173,7 @@ public class Popup
     
     
     /**
-     * Removes the popup&#x2019;s <code>JWindow</code> from the
+     * Removes the popup's <code>JWindow</code> from the
      * screen.  Nothing happens if it is currently not visible.
      */
     public void hide()
diff --git a/javax/swing/SwingUtilities.java b/javax/swing/SwingUtilities.java
index 6595fa332..e75a95e0f 100644
--- a/javax/swing/SwingUtilities.java
+++ b/javax/swing/SwingUtilities.java
@@ -59,7 +59,7 @@ import java.lang.reflect.InvocationTargetException;
  * useful when drawing swing components, dispatching events, or calculating
  * regions which need painting.
  *
- * @author Graydon Hoare (graydon&064;redhat.com)
+ * @author Graydon Hoare (graydon@redhat.com)
  */
 public class SwingUtilities implements SwingConstants
 {