2005-07-21 David Gilbert <david.gilbert@object-refinery.com>

	* javax/swing/AbstractListModel.java: API doc fixes,
	* javax/swing/BorderFactory.java: likewise,
	* javax/swing/BoundedRangeModel.java: likewise,
	* javax/swing/BoxLayout.java: likewise,
	* javax/swing/CellRendererPane.java: likewise,
	* javax/swing/ComponentInputMap.java: likewise,
	* javax/swing/DefaultBoundedRangeModel.java: likewise,
	* javax/swing/DefaultButtonModel.java: likewise,
	* javax/swing/DefaultCellEditor.java: likewise,
	* javax/swing/InputMap.java: likewise,
	* javax/swing/JButton.java: likewise,
	* javax/swing/JFrame.java: likewise,
	* javax/swing/JLabel.java: likewise,
	* javax/swing/JMenuBar.java: likewise,
	* javax/swing/JPopupMenu.java: likewise,
	* javax/swing/JScrollBar.java: likewise,
	* javax/swing/JScrollPane.java: likewise,
	* javax/swing/JSeparator.java: likewise,
	* javax/swing/JSlider.java: likewise,
	* javax/swing/JSpinner.java: likewise,
	* javax/swing/JTextArea.java: likewise,
	* javax/swing/JToggleButton.java: likewise,
	* javax/swing/SpinnerListModel.java: likewise,
	* javax/swing/Spring.java: likewise,
	* javax/swing/SpringLayout.java: likewise.

25 files changed, 74 insertions, 78 deletions

diff --git a/javax/swing/AbstractListModel.java b/javax/swing/AbstractListModel.java
index a924b73a2..df09ae205 100644
--- a/javax/swing/AbstractListModel.java
+++ b/javax/swing/AbstractListModel.java
@@ -88,7 +88,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
 
   /**
    * Call {@link ListDataListener#contentsChanged} on each element of the
-   * {@link listenerList} which is a {@link ListDataListener}. The event
+   * {@link #listenerList} which is a {@link ListDataListener}. The event
    * fired has type {@ListDataEvent.CONTENTS_CHANGED} and represents a
    * change to the data elements in the range [startIndex, endIndex]
    * inclusive.
@@ -110,7 +110,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
 
   /**
    * Call {@link ListDataListener#intervalAdded} on each element of the
-   * {@link listenerList} which is a {@link ListDataListener}. The event
+   * {@link #listenerList} which is a {@link ListDataListener}. The event
    * fired has type {@ListDataEvent.INTERVAL_ADDED} and represents an
    * addition of the data elements in the range [startIndex, endIndex]
    * inclusive.
@@ -132,7 +132,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
 
   /**
    * Call {@link ListDataListener#intervalRemoved} on each element of the
-   * {@link listenerList} which is a {@link ListDataListener}. The event
+   * {@link #listenerList} which is a {@link ListDataListener}. The event
    * fired has type {@ListDataEvent.INTERVAL_REMOVED} and represents a
    * removal of the data elements in the range [startIndex, endIndex]
    * inclusive.
@@ -155,7 +155,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
 
   /**
    * Return the subset of {@link EventListener} objects found in this
-   * object's {@link listenerList} which are elements of the specified
+   * object's {@link #listenerList} which are elements of the specified
    * type.
    *
    * @param listenerType The type of listeners to select
@@ -170,7 +170,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
   /**
    * A synonym for <code>getListeners(ListDataListener.class)</code>.
    *
-   * @return The set of ListDataListeners found in the {@link listenerList}
+   * @return The set of ListDataListeners found in the {@link #listenerList}
    */
   public ListDataListener[] getListDataListeners()
   {
diff --git a/javax/swing/BorderFactory.java b/javax/swing/BorderFactory.java
index b084b61a1..dac75871d 100644
--- a/javax/swing/BorderFactory.java
+++ b/javax/swing/BorderFactory.java
@@ -257,7 +257,7 @@ public class BorderFactory
    * justification (left) and using the default font and text color determined
    * by the current look and feel.
    *
-   * @param order The Border object to add the title to
+   * @param border The Border object to add the title to
    * @param title A String containing the text of the title
    *
    * @return The TitledBorder object
diff --git a/javax/swing/BoundedRangeModel.java b/javax/swing/BoundedRangeModel.java
index 5f85000d6..6d752a6c2 100644
--- a/javax/swing/BoundedRangeModel.java
+++ b/javax/swing/BoundedRangeModel.java
@@ -108,7 +108,7 @@ public interface BoundedRangeModel
    * @return <code>true</code> if value is adjusting,
    * otherwise <code>false</code>
    *
-   * @see setValueIsAdjusting(boolean)
+   * @see #setValueIsAdjusting(boolean)
    */
   boolean getValueIsAdjusting();
 
diff --git a/javax/swing/BoxLayout.java b/javax/swing/BoxLayout.java
index 5dfe1d6b7..787e92e77 100644
--- a/javax/swing/BoxLayout.java
+++ b/javax/swing/BoxLayout.java
@@ -150,7 +150,8 @@ public class BoxLayout implements LayoutManager2, Serializable
      * direction. This will be <code>insets.top</code> for vertical direction
      * and <code>insets.left</code> for horizontal direction.
      *
-     * @param the {@link Insets} object from which to return the lower bounds
+     * @param insets the {@link Insets} object from which to return the lower 
+     *               bounds
      *
      * @return the lower bounds of the {@link Insets} object according to this
      *     direction
@@ -226,7 +227,8 @@ public class BoxLayout implements LayoutManager2, Serializable
      * direction. This will be <code>insets.top</code> for vertical direction
      * and <code>insets.left</code> for horizontal direction.
      *
-     * @param the {@link Insets} object from which to return the lower bounds
+     * @param insets the {@link Insets} object from which to return the lower 
+     *        bounds
      *
      * @return the lower bounds of the {@link Insets} object according to this
      *     direction
diff --git a/javax/swing/CellRendererPane.java b/javax/swing/CellRendererPane.java
index db7a14341..d7e5e9880 100644
--- a/javax/swing/CellRendererPane.java
+++ b/javax/swing/CellRendererPane.java
@@ -70,7 +70,6 @@ public class CellRendererPane
 
     /**
      * Constructor AccessibleCellRendererPane
-     * @param component TODO
      */
     protected AccessibleCellRendererPane()
     {
diff --git a/javax/swing/ComponentInputMap.java b/javax/swing/ComponentInputMap.java
index 4ecc05852..2192123a1 100644
--- a/javax/swing/ComponentInputMap.java
+++ b/javax/swing/ComponentInputMap.java
@@ -70,7 +70,7 @@ public class ComponentInputMap extends InputMap
    * If actionMapKey is null an existing entry will be removed.
    *
    * @param keystroke the keystroke for the entry
-   * @param actionMapKey the action.
+   * @param value the action.
    */
   public void put(KeyStroke keystroke, Object value)
   {
@@ -90,7 +90,7 @@ public class ComponentInputMap extends InputMap
   /**
    * Remove an entry from the <code>InputMap</code>.
    *
-   * @param key the key of the entry to remove
+   * @param keystroke the key of the entry to remove
    */
   public void remove(KeyStroke keystroke)
   {
@@ -103,7 +103,7 @@ public class ComponentInputMap extends InputMap
    *
    * @param parentMap the new parent
    *
-   * @exception IllegalArgument if parentMap is not a
+   * @exception IllegalArgumentException if parentMap is not a
    * <code>ComponentInputMap</code> or not associated with the same component
    */
   public void setParent(InputMap parentMap)
diff --git a/javax/swing/DefaultBoundedRangeModel.java b/javax/swing/DefaultBoundedRangeModel.java
index 53c0fb343..c6fd09ab8 100644
--- a/javax/swing/DefaultBoundedRangeModel.java
+++ b/javax/swing/DefaultBoundedRangeModel.java
@@ -413,7 +413,7 @@ public class DefaultBoundedRangeModel
   /**
    * Retrieves the current listeners of the specified class.
    *
-   * @param c the class of listeners; usually {@link
+   * @param listenerType the class of listeners; usually {@link
    *     ChangeListener}<code>.class</code>.
    *
    * @return an array with the currently subscribed listeners, or
diff --git a/javax/swing/DefaultButtonModel.java b/javax/swing/DefaultButtonModel.java
index 2cfb9e96e..4499ecabd 100644
--- a/javax/swing/DefaultButtonModel.java
+++ b/javax/swing/DefaultButtonModel.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package javax.swing;
 
+import java.awt.ItemSelectable;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -265,9 +266,9 @@ public class DefaultButtonModel implements ButtonModel, Serializable
   }
 
   /**
-   * Inform each ItemListener in the {@link listenerList} that an ItemEvent
+   * Inform each ItemListener in the {@link #listenerList} that an ItemEvent
    * has occurred. This happens in response to any change to the {@link
-   * stateMask} field.
+   * #stateMask} field.
    *
    * @param e The ItemEvent to fire
    */
@@ -280,9 +281,9 @@ public class DefaultButtonModel implements ButtonModel, Serializable
   }
 
   /**
-   * Inform each ActionListener in the {@link listenerList} that an
+   * Inform each ActionListener in the {@link #listenerList} that an
    * ActionEvent has occurred. This happens in response to the any change to
-   * the {@link stateMask} field which makes the enabled, armed and pressed
+   * the {@link #stateMask} field which makes the enabled, armed and pressed
    * properties all simultaneously <code>true</code>.
    *
    * @param e The ActionEvent to fire
@@ -296,7 +297,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
   }
 
   /**
-   * Inform each ChangeListener in the {@link listenerList} that a ChangeEvent
+   * Inform each ChangeListener in the {@link #listenerList} that a ChangeEvent
    * has occurred. This happens in response to the any change to a property
    * of the model.
    */
diff --git a/javax/swing/DefaultCellEditor.java b/javax/swing/DefaultCellEditor.java
index e67e2f5a4..4358026f9 100644
--- a/javax/swing/DefaultCellEditor.java
+++ b/javax/swing/DefaultCellEditor.java
@@ -75,8 +75,6 @@ public class DefaultCellEditor
 
     /**
      * Constructor EditorDelegate
-     *
-     * @param value0 TODO
      */
     protected EditorDelegate()
     {
diff --git a/javax/swing/InputMap.java b/javax/swing/InputMap.java
index afc431d48..eb8ae24ed 100644
--- a/javax/swing/InputMap.java
+++ b/javax/swing/InputMap.java
@@ -80,7 +80,7 @@ public class InputMap
   /**
    * Returns the binding for keystroke.
    *
-   * @param key the key of the enty
+   * @param keystroke the key of the enty
    *
    * @return the binding associated with keystroke may be null
    */
@@ -111,7 +111,7 @@ public class InputMap
   /**
    * Remove an entry from the <code>InputMap</code>.
    *
-   * @param key the key of the entry to remove
+   * @param keystroke the key of the entry to remove
    */
   public void remove(KeyStroke keystroke)
   {
diff --git a/javax/swing/JButton.java b/javax/swing/JButton.java
index 29406d657..5653fbf42 100644
--- a/javax/swing/JButton.java
+++ b/javax/swing/JButton.java
@@ -61,7 +61,7 @@ public class JButton extends AbstractButton
   {
     /**
      * Returns the accessible role that this component represents.
-     * This is {@link AccessibleRole.PUSH_BUTTON} for <code>JButton</code>s.
+     * This is {@link AccessibleRole#PUSH_BUTTON} for <code>JButton</code>s.
      *
      * @return the accessible role that this component represents
      */
diff --git a/javax/swing/JFrame.java b/javax/swing/JFrame.java
index d8b10d5e3..bcefce22f 100644
--- a/javax/swing/JFrame.java
+++ b/javax/swing/JFrame.java
@@ -98,7 +98,7 @@ public class JFrame extends Frame
    * @param gc the <code>GraphicsConfiguration</code> that is used for
    *     the new <code>JFrame</code>
    *
-   * @see Frame(GraphicsConfiguration)
+   * @see Frame#Frame(GraphicsConfiguration)
    */
   public JFrame(GraphicsConfiguration gc)
   {
@@ -114,7 +114,7 @@ public class JFrame extends Frame
    * @param gc the <code>GraphicsConfiguration</code> that is used for
    *     the new <code>JFrame</code>
    *
-   * @see Frame(String, GraphicsConfiguration)
+   * @see Frame#Frame(String, GraphicsConfiguration)
    */
   public JFrame(String title, GraphicsConfiguration gc)
   {
diff --git a/javax/swing/JLabel.java b/javax/swing/JLabel.java
index ea30bc1c4..2e7ad98dd 100644
--- a/javax/swing/JLabel.java
+++ b/javax/swing/JLabel.java
@@ -123,9 +123,9 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
      * <code>part</code> parameter determines what is returned, the character,
      * word or sentence after the index.
      *
-     * @param part one of {@link AccessibleText.CHARACTER},
-     *             {@link AccessibleText.WORD} or
-     *             {@link AccessibleText.SENTENCE}, specifying what is returned
+     * @param part one of {@link AccessibleText#CHARACTER},
+     *             {@link AccessibleText#WORD} or
+     *             {@link AccessibleText#SENTENCE}, specifying what is returned
      * @param index the index
      *
      * @return the character, word or sentence after <code>index</code>
@@ -164,9 +164,9 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
      * <code>part</code> parameter determines what is returned, the character,
      * word or sentence after the index.
      *
-     * @param part one of {@link AccessibleText.CHARACTER},
-     *             {@link AccessibleText.WORD} or
-     *             {@link AccessibleText.SENTENCE}, specifying what is returned
+     * @param part one of {@link AccessibleText#CHARACTER},
+     *             {@link AccessibleText#WORD} or
+     *             {@link AccessibleText#SENTENCE}, specifying what is returned
      * @param index the index
      *
      * @return the character, word or sentence after <code>index</code>
@@ -205,9 +205,9 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
      * <code>part</code> parameter determines what is returned, the character,
      * word or sentence before the index.
      *
-     * @param part one of {@link AccessibleText.CHARACTER},
-     *             {@link AccessibleText.WORD} or
-     *             {@link AccessibleText.SENTENCE}, specifying what is returned
+     * @param part one of {@link AccessibleText#CHARACTER},
+     *             {@link AccessibleText#WORD} or
+     *             {@link AccessibleText#SENTENCE}, specifying what is returned
      * @param index the index
      *
      * @return the character, word or sentence before <code>index</code>
@@ -881,7 +881,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   /**
    * DOCUMENT ME!
    *
-   * @return
+   * @return The accessible context.
    */
   public AccessibleContext getAccessibleContext()
   {
diff --git a/javax/swing/JMenuBar.java b/javax/swing/JMenuBar.java
index a464fff9b..eebb1a050 100644
--- a/javax/swing/JMenuBar.java
+++ b/javax/swing/JMenuBar.java
@@ -326,7 +326,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
    * Process key events forwarded from MenuSelectionManager. This method
    * doesn't do anything. It is here to conform to the MenuElement interface.
    *
-   * @param event event forwarded from MenuSelectionManager
+   * @param e event forwarded from MenuSelectionManager
    * @param path path to the menu element from which event was generated
    * @param manager MenuSelectionManager for the current menu hierarchy
    *
diff --git a/javax/swing/JPopupMenu.java b/javax/swing/JPopupMenu.java
index c4c6c8b59..c4ee5fe73 100644
--- a/javax/swing/JPopupMenu.java
+++ b/javax/swing/JPopupMenu.java
@@ -910,13 +910,13 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
    */
   private class LightWeightPopup extends Container implements Popup
   {
+    private Component c;
+
     /**
      * Creates a new LightWeightPopup menu
      *
      * @param c Container containing menu items
      */
-    private Component c;
-
     public LightWeightPopup(Container c)
     {
       this.c = c;
diff --git a/javax/swing/JScrollBar.java b/javax/swing/JScrollBar.java
index caed92cf6..a2cc76c65 100644
--- a/javax/swing/JScrollBar.java
+++ b/javax/swing/JScrollBar.java
@@ -69,8 +69,6 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
     
     /**
      * Creates a new AccessibleJSlider object.
-     *
-     * @param value0 DOCUMENT ME!
      */
     protected AccessibleJScrollBar()
     {
diff --git a/javax/swing/JScrollPane.java b/javax/swing/JScrollPane.java
index 377f05a88..e83513f07 100644
--- a/javax/swing/JScrollPane.java
+++ b/javax/swing/JScrollPane.java
@@ -571,8 +571,6 @@ public class JScrollPane
    * Creates a new <code>JScrollPane</code> without a view. The scrollbar
    * policy is set to {@link #VERTICAL_SCROLLBAR_AS_NEEDED} and
    * {@link #HORIZONTAL_SCROLLBAR_AS_NEEDED}.
-   *
-   * @param view the component that is embedded inside the JScrollPane
    */
   public JScrollPane() 
   {
@@ -600,12 +598,12 @@ public class JScrollPane
    * @param vsbPolicy the vertical scrollbar policy to set
    * @param hsbPolicy the vertical scrollbar policy to set
    *
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_NEVER}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER}
+   * @see ScrollPaneConstants#HORIZONTAL_SCROLLBAR_ALWAYS
+   * @see ScrollPaneConstants#HORIZONTAL_SCROLLBAR_AS_NEEDED
+   * @see ScrollPaneConstants#HORIZONTAL_SCROLLBAR_NEVER
+   * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_ALWAYS
+   * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED
+   * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER
    */
   public JScrollPane(int vsbPolicy, int hsbPolicy) 
   {
@@ -620,12 +618,12 @@ public class JScrollPane
    * @param vsbPolicy the vertical scrollbar policy to set
    * @param hsbPolicy the vertical scrollbar policy to set
    *
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#HORIZONTAL_SCROLLBAR_NEVER}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_ALWAYS}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED}
-   * @see {@link ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER}
+   * @see ScrollPaneConstants#HORIZONTAL_SCROLLBAR_ALWAYS
+   * @see ScrollPaneConstants#HORIZONTAL_SCROLLBAR_AS_NEEDED
+   * @see ScrollPaneConstants#HORIZONTAL_SCROLLBAR_NEVER
+   * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_ALWAYS
+   * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED
+   * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER
    */
   public JScrollPane(Component view, int vsbPolicy, int hsbPolicy) 
   {
diff --git a/javax/swing/JSeparator.java b/javax/swing/JSeparator.java
index 064c465b5..6a3b97d35 100644
--- a/javax/swing/JSeparator.java
+++ b/javax/swing/JSeparator.java
@@ -59,8 +59,6 @@ public class JSeparator extends JComponent implements SwingConstants,
   
     /**
      * Constructor AccessibleJSeparator
-     *
-     * @param component TODO
      */
     protected AccessibleJSeparator()
     {
diff --git a/javax/swing/JSlider.java b/javax/swing/JSlider.java
index 661c4d7a1..2caf509a1 100644
--- a/javax/swing/JSlider.java
+++ b/javax/swing/JSlider.java
@@ -41,6 +41,7 @@ package javax.swing;
 import java.awt.Dimension;
 import java.awt.MenuContainer;
 import java.awt.image.ImageObserver;
+import java.beans.PropertyChangeEvent;
 import java.io.Serializable;
 import java.util.Dictionary;
 import java.util.Enumeration;
diff --git a/javax/swing/JSpinner.java b/javax/swing/JSpinner.java
index 96fe10f72..fc2b13e81 100644
--- a/javax/swing/JSpinner.java
+++ b/javax/swing/JSpinner.java
@@ -49,7 +49,6 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
-import javax.swing.border.EtchedBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.SpinnerUI;
@@ -297,7 +296,7 @@ public class JSpinner extends JComponent
      *     create a <code>DateEditor</code> instance
      * @param dateFormatPattern the date format to use
      *
-     * @see SimpleDateFormat(String)
+     * @see SimpleDateFormat#SimpleDateFormat(String)
      */
     public DateEditor(JSpinner spinner, String dateFormatPattern)
     {
diff --git a/javax/swing/JTextArea.java b/javax/swing/JTextArea.java
index fb35eb3d1..53591ffcc 100644
--- a/javax/swing/JTextArea.java
+++ b/javax/swing/JTextArea.java
@@ -80,13 +80,13 @@ import javax.swing.text.View;
  * @author Michael Koch  (konqueror@gmx.de)
  * @author Andrew John Hughes  (gnu_andrew@member.fsf.org)
  * @see java.awt.TextArea
- * @see javax.swing.JTextComponent
+ * @see javax.swing.text.JTextComponent
  * @see javax.swing.JTextField
  * @see javax.swing.JTextPane
  * @see javax.swing.JEditorPane
  * @see javax.swing.text.Document
- * @see javax.swing.text.DocumentEvent
- * @see javax.swing.text.DocumentListener
+ * @see javax.swing.event.DocumentEvent
+ * @see javax.swing.event.DocumentListener
  */
 
 public class JTextArea extends JTextComponent
@@ -166,7 +166,7 @@ public class JTextArea extends JTextComponent
   /**
    * Creates a new <code>JTextArea</code> object.
    *
-   * @param the document model to use
+   * @param doc the document model to use
    */
   public JTextArea(Document doc)
   {
@@ -176,7 +176,7 @@ public class JTextArea extends JTextComponent
   /**
    * Creates a new <code>JTextArea</code> object.
    *
-   * @param the document model to use
+   * @param doc the document model to use
    * @param text the initial text
    * @param rows the number of rows
    * @param columns the number of cols
@@ -235,12 +235,12 @@ public class JTextArea extends JTextComponent
   /**
    * Returns the increment that is needed to expose exactly one new line
    * of text. This is implemented here to return the values of
-   * {@link #getRowHeight} and {@link getColumnWidth}, depending on
+   * {@link #getRowHeight} and {@link #getColumnWidth}, depending on
    * the value of the argument <code>direction</code>.
    *
    * @param visibleRect the view area that is visible in the viewport
-   * @param orientation either {@link SwingConstants.VERTICAL} or
-   *     {@link SwingConstants.HORIZONTAL}
+   * @param orientation either {@link SwingConstants#VERTICAL} or
+   *     {@link SwingConstants#HORIZONTAL}
    * @param direction less than zero for up/left scrolling, greater
    *     than zero for down/right scrolling
    *
@@ -329,7 +329,7 @@ public class JTextArea extends JTextComponent
   /**
    * Sets the number of rows.
    *
-   * @param columns number of columns
+   * @param rows number of rows
    *
    * @exception IllegalArgumentException if rows is negative
    */
@@ -355,7 +355,7 @@ public class JTextArea extends JTextComponent
   /**
    * Enables/disables line wrapping.
    *
-   * @param wrapping <code>true</code> to enable line wrapping,
+   * @param flag <code>true</code> to enable line wrapping,
    * <code>false</code> otherwise
    */
   public void setLineWrap(boolean flag)
diff --git a/javax/swing/JToggleButton.java b/javax/swing/JToggleButton.java
index 0e1b9e601..b91369200 100644
--- a/javax/swing/JToggleButton.java
+++ b/javax/swing/JToggleButton.java
@@ -134,7 +134,7 @@ public class JToggleButton extends AbstractButton implements Accessible
      * Sets the pressed state of the button.  The selected state
      * of the button also changes follwing the button being pressed.
      *
-     * @param b true if the button is pressed down.
+     * @param p true if the button is pressed down.
      */
     public void setPressed(boolean p)  
     {
diff --git a/javax/swing/SpinnerListModel.java b/javax/swing/SpinnerListModel.java
index a0dc4d144..85dc4efa6 100644
--- a/javax/swing/SpinnerListModel.java
+++ b/javax/swing/SpinnerListModel.java
@@ -42,6 +42,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.swing.event.ChangeEvent;
+
 /**
  * An implementation of <code>SpinnerModel</code> which uses the values
  * contained within a list or an array.  The backing list or array is
diff --git a/javax/swing/Spring.java b/javax/swing/Spring.java
index 4255e86f8..69c88c77d 100644
--- a/javax/swing/Spring.java
+++ b/javax/swing/Spring.java
@@ -189,9 +189,9 @@ public abstract class Spring
     /**
      * Creates a new SimpleSpring object.
      *
-     * @param min the constant minimum value.
-     * @param pref the constant preferred value.
-     * @param max the constant maximum value.
+     * @param newMin the constant minimum value.
+     * @param newPref the constant preferred value.
+     * @param newMax the constant maximum value.
      */
     public SimpleSpring(int newMin, int newPref, int newMax)
     {
diff --git a/javax/swing/SpringLayout.java b/javax/swing/SpringLayout.java
index b45edba53..df9ddffb6 100644
--- a/javax/swing/SpringLayout.java
+++ b/javax/swing/SpringLayout.java
@@ -152,7 +152,7 @@ public class SpringLayout implements LayoutManager2
     /**
      * Returns the constraint for the edge with the <code>edgeName</code>.
      * This is expected to be one of
-     * {@link #EAST}, {@link #WEST}, {@link NORTH} or {@link SOUTH}.
+     * {@link #EAST}, {@link #WEST}, {@link #NORTH} or {@link #SOUTH}.
      *
      * @param edgeName the name of the edge.
      * @return the constraint for the specified edge.
@@ -246,7 +246,7 @@ public class SpringLayout implements LayoutManager2
      * the mathematics still hold true.
      *
      * @param edgeName the name of the edge, one of {@link #EAST},
-     *     {@link #WEST}, {@link NORTH} or {@link SOUTH}.
+     *     {@link #WEST}, {@link #NORTH} or {@link #SOUTH}.
      * @param s the constraint to be set.
      */
     public void setConstraint(String edgeName, Spring s)
@@ -361,8 +361,8 @@ public class SpringLayout implements LayoutManager2
    * Method. This method does nothing, since SpringLayout does not manage
    * String-indexed components.
    *
-   * @param component the component to be added.
-   * @param constraint the constraint to be set.
+   * @param name  the name.
+   * @param c the component to be added.
    */
   public void addLayoutComponent(String name, Component c)
   {
@@ -374,7 +374,7 @@ public class SpringLayout implements LayoutManager2
    *
    * @param c the component from which to get the constraint.
    * @param edgeName the name of the edge, one of {@link #EAST},
-   *     {@link #WEST}, {@link NORTH} or {@link SOUTH}.
+   *     {@link #WEST}, {@link #NORTH} or {@link #SOUTH}.
    * @return the constraint of the edge <code>edgeName</code> of the
    * component c.
    */