--- /home/cpdev/src/classpath/javax/swing/table/TableColumn.java	2005-07-13 17:32:46.000000000 +0000
+++ javax/swing/table/TableColumn.java	2005-06-30 05:35:20.000000000 +0000
@@ -1,5 +1,5 @@
 /* TableColumn.java --
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,16 +38,13 @@
 
 package javax.swing.table;
 
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.Serializable;
 
 import javax.swing.event.SwingPropertyChangeSupport;
 
 /**
- * Represents the attributes of a column in a table, including the column index,
- * width, minimum width, preferred width and maximum width.
- * 
+ * TableColumn
  * @author	Andrew Selkirk
  * @version	1.0
  */
@@ -57,53 +54,52 @@
   static final long serialVersionUID = -6113660025878112608L;
 
   /**
-   * The name for the <code>columnWidth</code> property.  Note that the typo
-   * in the name value is deliberate, to match the specification.
+   * COLUMN_WIDTH_PROPERTY
    */
   public static final String COLUMN_WIDTH_PROPERTY = "columWidth";
 
   /**
-   * The name for the <code>headerValue</code> property.
+   * HEADER_VALUE_PROPERTY
    */
   public static final String HEADER_VALUE_PROPERTY = "headerValue";
 
   /**
-   * The name for the <code>headerRenderer</code> property.
+   * HEADER_RENDERER_PROPERTY
    */
   public static final String HEADER_RENDERER_PROPERTY = "headerRenderer";
 
   /**
-   * The name for the <code>cellRenderer</code> property.
+   * CELL_RENDERER_PROPERTY
    */
   public static final String CELL_RENDERER_PROPERTY = "cellRenderer";
 
   /**
-   * The index of the corresponding column in the table model.
+   * modelIndex
    */
   protected int modelIndex;
 
   /**
-   * The identifier for the column.
+   * identifier
    */
   protected Object identifier;
 
   /**
-   * The width.
+   * width
    */
   protected int width;
 
   /**
-   * The minimum width.
+   * minWidth
    */
   protected int minWidth = 15;
 
   /**
-   * The preferred width.
+   * preferredWidth
    */
   private int preferredWidth;
 
   /**
-   * The maximum width.
+   * maxWidth
    */
   protected int maxWidth = Integer.MAX_VALUE;
 
@@ -113,7 +109,7 @@
   protected TableCellRenderer headerRenderer;
 
   /**
-   * The header value.
+   * headerValue
    */
   protected Object headerValue;
 
@@ -146,8 +142,7 @@
     new SwingPropertyChangeSupport(this);
 
   /**
-   * Creates a new <code>TableColumn</code> that maps to column 0 in the
-   * related table model.  The default width is <code>75</code> units.
+   * Constructor TableColumn
    */
   public TableColumn()
   {
@@ -155,8 +150,7 @@
   }
 
   /**
-   * Creates a new <code>TableColumn</code> that maps to the specified column 
-   * in the related table model.  The default width is <code>75</code> units.
+   * Constructor TableColumn
    * 
    * @param modelIndex the index of the column in the model
    */
@@ -166,8 +160,7 @@
   }
 
   /**
-   * Creates a new <code>TableColumn</code> that maps to the specified column 
-   * in the related table model, and has the specified <code>width</code>.
+   * Constructor TableColumn
    * 
    * @param modelIndex the index of the column in the model
    * @param width the width
@@ -178,14 +171,12 @@
   }
 
   /**
-   * Creates a new <code>TableColumn</code> that maps to the specified column 
-   * in the related table model, and has the specified <code>width</code>,
-   * <code>cellRenderer</code> and <code>cellEditor</code>.
+   * Constructor TableColumn
    * 
    * @param modelIndex the index of the column in the model
    * @param width the width
-   * @param cellRenderer the cell renderer (<code>null</code> permitted).
-   * @param cellEditor the cell editor (<code>null</code> permitted).
+   * @param cellRenderer the cell renderer
+   * @param cellEditor the cell editor
    */
   public TableColumn(int modelIndex, int width,
                      TableCellRenderer cellRenderer, TableCellEditor cellEditor)
@@ -239,10 +230,9 @@
   }
 
   /**
-   * Sets the index of the column in the related {@link TableModel} that this
-   * <code>TableColumn</code> maps to.
+   * setModelIndex
    * 
-   * @param modelIndex the column index in the model.
+   * @param modelIndex the index to set
    */
   public void setModelIndex(int modelIndex)
   {
@@ -250,8 +240,7 @@
   }
 
   /**
-   * Returns the index of the column in the related {@link TableModel} that
-   * this <code>TableColumn</code> maps to.
+   * getModelIndex
    * 
    * @return the model index
    */
@@ -261,7 +250,7 @@
   }
 
   /**
-   * Sets the identifier for the column.
+   * setIdentifier
    * 
    * @param identifier the identifier
    */
@@ -271,11 +260,9 @@
   }
 
   /**
-   * Returns the identifier for the column, or {@link #getHeaderValue()} if the 
-   * identifier is <code>null</code>.
+   * getIdentifier
    * 
-   * @return The identifier (or {@link #getHeaderValue()} if the identifier is 
-   *         <code>null</code>).
+   * @return the identifier
    */
   public Object getIdentifier()
   {
@@ -285,9 +272,7 @@
   }
 
   /**
-   * Sets the header value and sends a {@link PropertyChangeEvent} to all
-   * registered listeners.  The header value property uses the name
-   * {@link #HEADER_VALUE_PROPERTY}.
+   * setHeaderValue
    * 
    * @param headerValue the value of the header
    */
@@ -302,7 +287,7 @@
   }
 
   /**
-   * Returns the header value.
+   * getHeaderValue
    * 
    * @return the value of the header
    */
@@ -314,7 +299,7 @@
   /**
    * setHeaderRenderer
    * 
-   * @param renderer the renderer to use
+   * @param headerRenderer the renderer to se
    */
   public void setHeaderRenderer(TableCellRenderer renderer)
   {
@@ -337,10 +322,9 @@
   }
 
   /**
-   * Sets the renderer for cells in this column and sends a 
-   * {@link PropertyChangeEvent} to all registered listeners.
+   * setCellRenderer
    * 
-   * @param renderer the cell renderer (<code>null</code> permitted).
+   * @param cellRenderer the cell renderer
    */
   public void setCellRenderer(TableCellRenderer renderer)
   {
@@ -354,9 +338,9 @@
   }
 
   /**
-   * Returns the renderer for the table cells in this column.
+   * getCellRenderer
    * 
-   * @return The cell renderer.
+   * @return the cell renderer
    */
   public TableCellRenderer getCellRenderer()
   {
@@ -441,10 +425,9 @@
   }
 
   /**
-   * Sets the minimum width for the column and, if necessary, updates the
-   * <code>width</code> and <code>preferredWidth</code>.
+   * setMinWidth
    * 
-   * @param minWidth the minimum width
+   * @param minWidth the minium width
    */
   public void setMinWidth(int minWidth)
   {
@@ -454,9 +437,9 @@
   }
 
   /**
-   * Returns the <code>TableColumn</code>'s minimum width.
+   * getMinWidth
    * 
-   * @return The minimum width.
+   * @return the minimum width
    */
   public int getMinWidth()
   {
@@ -464,8 +447,7 @@
   }
 
   /**
-   * Sets the maximum width and, if necessary, updates the <code>width</code>
-   * and <code>preferredWidth</code>.
+   * setMaxWidth
    * 
    * @param maxWidth the maximum width
    */
@@ -477,9 +459,8 @@
   }
 
   /**
-   * Returns the maximum width.
-   * 
-   * @return The maximum width.
+   * getMaxWidth
+   * @return the maximim width
    */
   public int getMaxWidth()
   {
@@ -517,7 +498,8 @@
   }
 
   /**
-   * This method is empty, unused and deprecated.
+   * disableResizedPosting
+   *
    * @deprecated 1.3
    */
   public void disableResizedPosting()
@@ -526,7 +508,8 @@
   }
 
   /**
-   * This method is empty, unused and deprecated.
+   * enableResizedPosting
+   *
    * @deprecated 1.3
    */
   public void enableResizedPosting()
@@ -535,9 +518,8 @@
   }
 
   /**
-   * Adds a property change listener.
-   * 
-   * @param listener the listener to add
+   * addPropertyChangeListener
+   * @param listener the listener to all
    */
   public synchronized void addPropertyChangeListener(PropertyChangeListener listener)
   {
@@ -554,7 +536,6 @@
   }
 
   /**
-   * Returns the property change listeners for this <code>TableColumn</code>.
    * @since 1.4
    */
   public PropertyChangeListener[] getPropertyChangeListeners()