--- /home/cpdev/src/classpath/javax/swing/table/TableColumnModel.java	2005-07-13 17:32:46.000000000 +0000
+++ javax/swing/table/TableColumnModel.java	2005-06-30 05:35:20.000000000 +0000
@@ -1,5 +1,5 @@
 /* TableColumnModel.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.
 
@@ -40,39 +40,29 @@
 
 import java.util.Enumeration;
 
-import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.TableColumnModelListener;
 
 /**
- * The interface used by {@link JTable} to access the columns in the table
- * view.
- * 
+ * TableColumnModel public interface
  * @author Andrew Selkirk
  */
 public interface TableColumnModel
 {
   /**
-   * Adds a column to the model.
-   * 
-   * @param column  the new column (<code>null</code> not permitted).
-   * 
-   * @throws IllegalArgumentException if <code>column</code> is 
-   *         <code>null</code>.
+   * addColumn
+   * @param column TableColumn
    */
   void addColumn(TableColumn column);
 
   /**
-   * Removes a column from the model.  If <code>column</code> is not defined
-   * in the model, this method does nothing.
-   * 
+   * removeColumn
    * @param column TableColumn
    */
   void removeColumn(TableColumn column);
 
   /**
-   * Moves a column.
-   * 
+   * moveColumn
    * @param columnIndex Index of column to move
    * @param newIndex New index of column
    */
@@ -85,9 +75,8 @@
   void setColumnMargin(int margin);
 
   /**
-   * Returns the number of columns in the model.
-   * 
-   * @return The column count
+   * getColumnCount
+   * @return Column count
    */
   int getColumnCount();
 
@@ -98,30 +87,20 @@
   Enumeration getColumns();
 
   /**
-   * Returns the index of the {@link TableColumn} with the given identifier.
-   *
-   * @param identifier  the identifier (<code>null</code> not permitted).
-   * 
-   * @return The index of the {@link TableColumn} with the given identifier.
-   * 
-   * @throws IllegalArgumentException if <code>identifier</code> is 
-   *         <code>null</code> or there is no column with that identifier.
+   * getColumnIndex
+   * @param columnIdentifier Column id
    */
   int getColumnIndex(Object columnIdentifier);
 
   /**
-   * Returns the <code>TableColumn</code> at the specified index.
-   * 
-   * @param columnIndex  the column index.
-   * 
-   * @return The table column.
+   * getColumn
+   * @param columnIndex Index of column
    */
   TableColumn getColumn(int columnIndex);
 
   /**
-   * Returns the column margin.
-   * 
-   * @return The column margin.
+   * getColumnMargin
+   * @return Column margin
    */
   int getColumnMargin();