4 files changed, 267 insertions, 250 deletions

diff --git a/libjava/javax/swing/table/DefaultTableColumnModel.java b/libjava/javax/swing/table/DefaultTableColumnModel.java
index 2946829..ea46ce5 100644
--- a/libjava/javax/swing/table/DefaultTableColumnModel.java
+++ b/libjava/javax/swing/table/DefaultTableColumnModel.java
@@ -35,7 +35,6 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package javax.swing.table;
 
 import java.beans.PropertyChangeEvent;
@@ -52,21 +51,18 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableColumnModelEvent;
 import javax.swing.event.TableColumnModelListener;
 
+
 /**
  * DefaultTableColumnModel
  * @author	Andrew Selkirk
  * @version	1.0
  */
 public class DefaultTableColumnModel
-  implements TableColumnModel, PropertyChangeListener,
-             ListSelectionListener, Serializable
+  implements TableColumnModel, PropertyChangeListener, ListSelectionListener,
+             Serializable
 {
   static final long serialVersionUID = 6580012493508960512L;
 
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * tableColumns
 	 */
@@ -102,265 +98,283 @@ public class DefaultTableColumnModel
 	 */
 	protected int totalColumnWidth;
 
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * Constructor DefaultTableColumnModel
 	 */
-	public DefaultTableColumnModel() {
+  public DefaultTableColumnModel()
+  {
 		// TODO
-	} // DefaultTableColumnModel()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
+  }
 
 	/**
 	 * addColumn
 	 * @param value0 TODO
 	 */
-	public void addColumn(TableColumn value0) {
+  public void addColumn(TableColumn value0)
+  {
 		// TODO
-	} // addColumn()
+  }
 
 	/**
 	 * removeColumn
 	 * @param value0 TODO
 	 */
-	public void removeColumn(TableColumn value0) {
+  public void removeColumn(TableColumn value0)
+  {
 		// TODO
-	} // removeColumn()
+  }
 
 	/**
 	 * moveColumn
 	 * @param value0 TODO
 	 * @param value1 TODO
 	 */
-	public void moveColumn(int value0, int value1) {
+  public void moveColumn(int value0, int value1)
+  {
 		// TODO
-	} // moveColumn()
+  }
 
 	/**
 	 * setColumnMargin
 	 * @param value0 TODO
 	 */
-	public void setColumnMargin(int value0) {
+  public void setColumnMargin(int value0)
+  {
 		// TODO
-	} // setColumnMargin()
+  }
 
 	/**
 	 * getColumnCount
-	 * @returns int
+   * @return int
 	 */
-	public int getColumnCount() {
+  public int getColumnCount()
+  {
 		return 0; // TODO
-	} // getColumnCount()
+  }
 
 	/**
 	 * getColumns
-	 * @returns Enumeration
+   * @return Enumeration
 	 */
-	public Enumeration getColumns() {
+  public Enumeration getColumns()
+  {
 		return null; // TODO
-	} // getColumns()
+  }
 
 	/**
 	 * getColumnIndex
 	 * @param value0 TODO
-	 * @returns int
+   * @return int
 	 */
-	public int getColumnIndex(Object value0) {
+  public int getColumnIndex(Object value0)
+  {
 		return 0; // TODO
-	} // getColumnIndex()
+  }
 
 	/**
 	 * getColumn
 	 * @param value0 TODO
-	 * @returns TableColumn
+   * @return TableColumn
 	 */
-	public TableColumn getColumn(int value0) {
+  public TableColumn getColumn(int value0)
+  {
 		return null; // TODO
-	} // getColumn()
+  }
 
 	/**
 	 * getColumnMargin
-	 * @returns int
+   * @return int
 	 */
-	public int getColumnMargin() {
+  public int getColumnMargin()
+  {
 		return 0; // TODO
-	} // getColumnMargin()
+  }
 
 	/**
 	 * getColumnIndexAtX
 	 * @param value0 TODO
-	 * @returns int
+   * @return int
 	 */
-	public int getColumnIndexAtX(int value0) {
+  public int getColumnIndexAtX(int value0)
+  {
 		return 0; // TODO
-	} // getColumnIndexAtX()
+  }
 
 	/**
 	 * getTotalColumnWidth
-	 * @returns int
+   * @return int
 	 */
-	public int getTotalColumnWidth() {
+  public int getTotalColumnWidth()
+  {
 		return 0; // TODO
-	} // getTotalColumnWidth()
+  }
 
 	/**
 	 * setSelectionModel
 	 * @param value0 TODO
 	 */
-	public void setSelectionModel(ListSelectionModel value0) {
+  public void setSelectionModel(ListSelectionModel value0)
+  {
 		// TODO
-	} // setSelectionModel()
+  }
 
 	/**
 	 * getSelectionModel
-	 * @returns ListSelectionModel
+   * @return ListSelectionModel
 	 */
-	public ListSelectionModel getSelectionModel() {
+  public ListSelectionModel getSelectionModel()
+  {
 		return null; // TODO
-	} // getSelectionModel()
+  }
 
 	/**
 	 * setColumnSelectionAllowed
 	 * @param value0 TODO
 	 */
-	public void setColumnSelectionAllowed(boolean value0) {
+  public void setColumnSelectionAllowed(boolean value0)
+  {
 		// TODO
-	} // setColumnSelectionAllowed()
+  }
 
 	/**
 	 * getColumnSelectionAllowed
-	 * @returns boolean
+   * @return boolean
 	 */
-	public boolean getColumnSelectionAllowed() {
+  public boolean getColumnSelectionAllowed()
+  {
 		return false; // TODO
-	} // getColumnSelectionAllowed()
+  }
 
 	/**
 	 * getSelectedColumns
-	 * @returns int[]
+   * @return int[]
 	 */
-	public int[] getSelectedColumns() {
+  public int[] getSelectedColumns()
+  {
 		return null; // TODO
-	} // getSelectedColumns()
+  }
 
 	/**
 	 * getSelectedColumnCount
-	 * @returns int
+   * @return int
 	 */
-	public int getSelectedColumnCount() {
+  public int getSelectedColumnCount()
+  {
 		return 0; // TODO
-	} // getSelectedColumnCount()
+  }
 
 	/**
 	 * addColumnModelListener
 	 * @param value0 TODO
 	 */
-	public void addColumnModelListener(TableColumnModelListener value0) {
+  public void addColumnModelListener(TableColumnModelListener value0)
+  {
 		// TODO
-	} // addColumnModelListener()
+  }
 
 	/**
 	 * removeColumnModelListener
 	 * @param value0 TODO
 	 */
-	public void removeColumnModelListener(TableColumnModelListener value0) {
+  public void removeColumnModelListener(TableColumnModelListener value0)
+  {
 		// TODO
-	} // removeColumnModelListener()
+  }
 
 	/**
 	 * fireColumnAdded
 	 * @param value0 TODO
 	 */
-	protected void fireColumnAdded(TableColumnModelEvent value0) {
+  protected void fireColumnAdded(TableColumnModelEvent value0)
+  {
 		// TODO
-	} // fireColumnAdded()
+  }
 
 	/**
 	 * fireColumnRemoved
 	 * @param value0 TODO
 	 */
-	protected void fireColumnRemoved(TableColumnModelEvent value0) {
+  protected void fireColumnRemoved(TableColumnModelEvent value0)
+  {
 		// TODO
-	} // fireColumnRemoved()
+  }
 
 	/**
 	 * fireColumnMoved
 	 * @param value0 TODO
 	 */
-	protected void fireColumnMoved(TableColumnModelEvent value0) {
+  protected void fireColumnMoved(TableColumnModelEvent value0)
+  {
 		// TODO
-	} // fireColumnMoved()
+  }
 
 	/**
 	 * fireColumnSelectionChanged
 	 * @param value0 TODO
 	 */
-	protected void fireColumnSelectionChanged(ListSelectionEvent value0) {
+  protected void fireColumnSelectionChanged(ListSelectionEvent value0)
+  {
 		// TODO
-	} // fireColumnSelectionChanged()
+  }
 
 	/**
 	 * fireColumnMarginChanged
 	 */
-	protected void fireColumnMarginChanged() {
+  protected void fireColumnMarginChanged()
+  {
 		// TODO
-	} // fireColumnMarginChanged()
+  }
 
 	/**
 	 * getListeners
 	 * @param value0 TODO
-	 * @returns EventListener[]
+   * @return EventListener[]
 	 */
-	public EventListener[] getListeners(Class value0) {
+  public EventListener[] getListeners(Class value0)
+  {
 		return null; // TODO
-	} // getListeners()
+  }
 
 	/**
 	 * propertyChange
 	 * @param value0 TODO
 	 */
-	public void propertyChange(PropertyChangeEvent value0) {
+  public void propertyChange(PropertyChangeEvent value0)
+  {
 		// TODO
-	} // propertyChange()
+  }
 
 	/**
 	 * valueChanged
 	 * @param value0 TODO
 	 */
-	public void valueChanged(ListSelectionEvent value0) {
+  public void valueChanged(ListSelectionEvent value0)
+  {
 		// TODO
-	} // valueChanged()
+  }
 
 	/**
 	 * createSelectionModel
-	 * @returns ListSelectionModel
+   * @return ListSelectionModel
 	 */
-	protected ListSelectionModel createSelectionModel() {
+  protected ListSelectionModel createSelectionModel()
+  {
 		return null; // TODO
-	} // createSelectionModel()
+  }
 
 	/**
 	 * recalcWidthCache
 	 */
-	protected void recalcWidthCache() {
+  protected void recalcWidthCache()
+  {
 		// TODO
-	} // recalcWidthCache()
+  }
 
 	/**
 	 * invalidateWidthCache
 	 */
-	private void invalidateWidthCache() {
+  private void invalidateWidthCache()
+  {
 		// TODO
-	} // invalidateWidthCache()
-
-
-} // DefaultTableColumnModel
-
+  }
+}
diff --git a/libjava/javax/swing/table/TableColumn.java b/libjava/javax/swing/table/TableColumn.java
index 73313c6..39ae1bd 100644
--- a/libjava/javax/swing/table/TableColumn.java
+++ b/libjava/javax/swing/table/TableColumn.java
@@ -35,26 +35,23 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package javax.swing.table;
 
 import java.beans.PropertyChangeListener;
 import java.io.Serializable;
 import javax.swing.event.SwingPropertyChangeSupport;
 
+
 /**
  * TableColumn
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class TableColumn implements Serializable
+public class TableColumn
+  implements Serializable
 {
   static final long serialVersionUID = -6113660025878112608L;
 
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * COLUMN_WIDTH_PROPERTY
 	 */
@@ -138,36 +135,35 @@ public class TableColumn implements Serializable
 	/**
 	 * changeSupport
 	 */
-	private SwingPropertyChangeSupport changeSupport = new SwingPropertyChangeSupport(this);
-
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
+  private SwingPropertyChangeSupport changeSupport =
+    new SwingPropertyChangeSupport(this);
 
 	/**
 	 * Constructor TableColumn
 	 */
-	public TableColumn() {
+  public TableColumn()
+  {
 		this(0, 75, null, null);
-	} // TableColumn()
+  }
 
 	/**
 	 * Constructor TableColumn
 	 * @param modelIndex TODO
 	 */
-	public TableColumn(int modelIndex) {
+  public TableColumn(int modelIndex)
+  {
 		this(modelIndex, 75, null, null);
-	} // TableColumn()
+  }
 
 	/**
 	 * Constructor TableColumn
 	 * @param modelIndex TODO
 	 * @param width TODO
 	 */
-	public TableColumn(int modelIndex, int width) {
+  public TableColumn(int modelIndex, int width)
+  {
 		this(modelIndex, width, null, null);
-	} // TableColumn()
+  }
 
 	/**
 	 * Constructor TableColumn
@@ -177,7 +173,8 @@ public class TableColumn implements Serializable
 	 * @param cellEditor TODO
 	 */
 	public TableColumn(int modelIndex, int width,
-			TableCellRenderer cellRenderer, TableCellEditor cellEditor) {
+                     TableCellRenderer cellRenderer, TableCellEditor cellEditor)
+  {
 		this.modelIndex = modelIndex;
 		this.width = width;
 		this.preferredWidth = width;
@@ -185,12 +182,7 @@ public class TableColumn implements Serializable
 		this.cellEditor = cellEditor;
 		this.headerValue = null;
 		this.identifier = null;
-	} // TableColumn()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
+  }
 
 	/**
 	 * firePropertyChange
@@ -198,9 +190,11 @@ public class TableColumn implements Serializable
 	 * @param oldValue TODO
 	 * @param newValue TODO
 	 */
-	private void firePropertyChange(String property, Object oldValue, Object newValue) {
+  private void firePropertyChange(String property, Object oldValue,
+                                  Object newValue)
+  {
 		changeSupport.firePropertyChange(property, oldValue, newValue);
-	} // firePropertyChange()
+  }
 
 	/**
 	 * firePropertyChange
@@ -208,9 +202,10 @@ public class TableColumn implements Serializable
 	 * @param oldValue TODO
 	 * @param newValue TODO
 	 */
-	private void firePropertyChange(String property, int oldValue, int newValue) {
+  private void firePropertyChange(String property, int oldValue, int newValue)
+  {
 		firePropertyChange(property, new Integer(oldValue), new Integer(newValue));
-	} // firePropertyChange()
+  }
 
 	/**
 	 * firePropertyChange
@@ -218,7 +213,8 @@ public class TableColumn implements Serializable
 	 * @param oldValue TODO
 	 * @param newValue TODO
 	 */
-	private void firePropertyChange(String property, boolean oldValue, boolean newValue)
+  private void firePropertyChange(String property, boolean oldValue,
+                                  boolean newValue)
 	{
 		firePropertyChange(property, new Boolean(oldValue), new Boolean(newValue));
 	}
@@ -227,43 +223,46 @@ public class TableColumn implements Serializable
 	 * setModelIndex
 	 * @param modelIndex TODO
 	 */
-	public void setModelIndex(int modelIndex) {
+  public void setModelIndex(int modelIndex)
+  {
 		this.modelIndex = modelIndex;
-	} // setModelIndex()
+  }
 
 	/**
 	 * getModelIndex
-	 * @returns int
+   * @return int
 	 */
-	public int getModelIndex() {
+  public int getModelIndex()
+  {
 		return modelIndex;
-	} // getModelIndex()
+  }
 
 	/**
 	 * setIdentifier
 	 * @param identifier TODO
 	 */
-	public void setIdentifier(Object identifier) {
+  public void setIdentifier(Object identifier)
+  {
 		this.identifier = identifier;
-	} // setIdentifier()
+  }
 
 	/**
 	 * getIdentifier
-	 * @returns Object
+   * @return Object
 	 */
-	public Object getIdentifier() {
-		if (identifier == null) {
+  public Object getIdentifier()
+  {
+    if (identifier == null)
 			return getHeaderValue();
-		} // if
 		return identifier;
-	} // getIdentifier()
+  }
 
 	/**
 	 * setHeaderValue
 	 * @param headerValue TODO
 	 */
-	public void setHeaderValue(Object headerValue) {
-
+  public void setHeaderValue(Object headerValue)
+  {
 		// Variables
 		Object	oldValue;
 
@@ -274,25 +273,24 @@ public class TableColumn implements Serializable
 		this.headerValue = headerValue;
 
 		// Notify Listeners of change
-		firePropertyChange(HEADER_VALUE_PROPERTY, 
-				oldValue, headerValue);
-
-	} // setHeaderValue()
+    firePropertyChange(HEADER_VALUE_PROPERTY, oldValue, headerValue);
+  }
 
 	/**
 	 * getHeaderValue
-	 * @returns Object
+   * @return Object
 	 */
-	public Object getHeaderValue() {
+  public Object getHeaderValue()
+  {
 		return headerValue;
-	} // getHeaderValue()
+  }
 
 	/**
 	 * setHeaderRenderer
 	 * @param headerRenderer TODO
 	 */
-	public void setHeaderRenderer(TableCellRenderer headerRenderer) {
-
+  public void setHeaderRenderer(TableCellRenderer headerRenderer)
+  {
 		// Variables
 		TableCellRenderer	oldRenderer;
 
@@ -303,25 +301,24 @@ public class TableColumn implements Serializable
 		this.headerRenderer = headerRenderer;
 
 		// Notify Listeners of change
-		firePropertyChange(HEADER_RENDERER_PROPERTY, 
-				oldRenderer, headerRenderer);
-
-	} // setHeaderRenderer()
+    firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer, headerRenderer);
+  }
 
 	/**
 	 * getHeaderRenderer
-	 * @returns TableCellRenderer
+   * @return TableCellRenderer
 	 */
-	public TableCellRenderer getHeaderRenderer() {
+  public TableCellRenderer getHeaderRenderer()
+  {
 		return headerRenderer;
-	} // getHeaderRenderer()
+  }
 
 	/**
 	 * setCellRenderer
 	 * @param cellRenderer TODO
 	 */
-	public void setCellRenderer(TableCellRenderer cellRenderer) {
-
+  public void setCellRenderer(TableCellRenderer cellRenderer)
+  {
 		// Variables
 		TableCellRenderer	oldRenderer;
 
@@ -332,41 +329,42 @@ public class TableColumn implements Serializable
 		this.cellRenderer = cellRenderer;
 
 		// Notify Listeners of change
-		firePropertyChange(CELL_RENDERER_PROPERTY, 
-				oldRenderer, cellRenderer);
-
-	} // setCellRenderer()
+    firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer, cellRenderer);
+  }
 
 	/**
 	 * getCellRenderer
-	 * @returns TableCellRenderer
+   * @return TableCellRenderer
 	 */
-	public TableCellRenderer getCellRenderer() {
+  public TableCellRenderer getCellRenderer()
+  {
 		return cellRenderer;
-	} // getCellRenderer()
+  }
 
 	/**
 	 * setCellEditor
 	 * @param cellEditor TODO
 	 */
-	public void setCellEditor(TableCellEditor cellEditor) {
+  public void setCellEditor(TableCellEditor cellEditor)
+  {
 		this.cellEditor = cellEditor;
-	} // setCellEditor()
+  }
 
 	/**
 	 * getCellEditor
-	 * @returns TableCellEditor
+   * @return TableCellEditor
 	 */
-	public TableCellEditor getCellEditor() {
+  public TableCellEditor getCellEditor()
+  {
 		return cellEditor;
-	} // getCellEditor()
+  }
 
 	/**
 	 * setWidth
 	 * @param width TODO
 	 */
-	public void setWidth(int width) {
-
+  public void setWidth(int width)
+  {
 		// Variables
 		int	oldWidth;
 
@@ -374,145 +372,154 @@ public class TableColumn implements Serializable
 		oldWidth = this.width;
 
 		// Adjust Width within Limits
-		if (width < minWidth) {
+    if (width < minWidth)
 			this.width = minWidth;
-		} else if (width > maxWidth) {
+    else if (width > maxWidth)
 			this.width = maxWidth;
-		} else {
+    else
 			this.width = width;
-		} // if
 
-		// Fire Property Change
 		firePropertyChange(COLUMN_WIDTH_PROPERTY, oldWidth, this.width);
-
-	} // setWidth()
+  }
 
 	/**
 	 * getWidth
-	 * @returns int
+   * @return int
 	 */
-	public int getWidth() {
+  public int getWidth()
+  {
 		return width;
-	} // getWidth()
+  }
 
 	/**
 	 * setPreferredWidth
 	 * @param preferredWidth TODO
 	 */
-	public void setPreferredWidth(int preferredWidth) {
-		if (preferredWidth < minWidth) {
+  public void setPreferredWidth(int preferredWidth)
+  {
+    if (preferredWidth < minWidth)
 			this.preferredWidth = minWidth;
-		} else if (preferredWidth > maxWidth) {
+    else if (preferredWidth > maxWidth)
 			this.preferredWidth = maxWidth;
-		} else {
+    else
 			this.preferredWidth = preferredWidth;
-		} // if
-	} // setPreferredWidth()
+  }
 
 	/**
 	 * getPreferredWidth
-	 * @returns int
+   * @return int
 	 */
-	public int getPreferredWidth() {
+  public int getPreferredWidth()
+  {
 		return preferredWidth;
-	} // getPreferredWidth()
+  }
 
 	/**
 	 * setMinWidth
 	 * @param minWidth TODO
 	 */
-	public void setMinWidth(int minWidth) {
+  public void setMinWidth(int minWidth)
+  {
 		this.minWidth = minWidth;
 		setWidth(getWidth());
 		setPreferredWidth(getPreferredWidth());
-	} // setMinWidth()
+  }
 
 	/**
 	 * getMinWidth
-	 * @returns int
+   * @return int
 	 */
-	public int getMinWidth() {
+  public int getMinWidth()
+  {
 		return minWidth;
-	} // getMinWidth()
+  }
 
 	/**
 	 * setMaxWidth
 	 * @param maxWidth TODO
 	 */
-	public void setMaxWidth(int maxWidth) {
+  public void setMaxWidth(int maxWidth)
+  {
 		this.maxWidth = maxWidth;
 		setWidth(getWidth());
 		setPreferredWidth(getPreferredWidth());
-	} // setMaxWidth()
+  }
 
 	/**
 	 * getMaxWidth
-	 * @returns int
+   * @return int
 	 */
-	public int getMaxWidth() {
+  public int getMaxWidth()
+  {
 		return maxWidth;
-	} // getMaxWidth()
+  }
 
 	/**
 	 * setResizable
 	 * @param isResizable TODO
 	 */
-	public void setResizable(boolean isResizable) {
+  public void setResizable(boolean isResizable)
+  {
 		this.isResizable = isResizable;
-	} // setResizable()
+  }
 
 	/**
 	 * getResizable
-	 * @returns boolean
+   * @return boolean
 	 */
-	public boolean getResizable() {
+  public boolean getResizable()
+  {
 		return isResizable;
-	} // getResizable()
+  }
 
 	/**
 	 * sizeWidthToFit
 	 */
-	public void sizeWidthToFit() {
+  public void sizeWidthToFit()
+  {
 		// TODO
-	} // sizeWidthToFit()
+  }
 
 	/**
 	 * disableResizedPosting
 	 */
-	public void disableResizedPosting() {
+  public void disableResizedPosting()
+  {
 		// Does nothing
-	} // disableResizedPosting()
+  }
 
 	/**
 	 * enableResizedPosting
 	 */
-	public void enableResizedPosting() {
+  public void enableResizedPosting()
+  {
 		// Does nothing
-	} // enableResizedPosting()
+  }
 
 	/**
 	 * addPropertyChangeListener
-	 * @param listener TODO
+   * @param listener the listener to all
 	 */
-	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+  public synchronized void addPropertyChangeListener(PropertyChangeListener listener)
+  {
 		changeSupport.addPropertyChangeListener(listener);
-	} // addPropertyChangeListener()
+  }
 
 	/**
 	 * removePropertyChangeListener
-	 * @param listener TODO
+   * @param listener the listener to remove
 	 */
-	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
+  public synchronized void removePropertyChangeListener(PropertyChangeListener listener)
+  {
 		changeSupport.removePropertyChangeListener(listener);
-	} // removePropertyChangeListener()
+  }
 
 	/**
 	 * createDefaultHeaderRenderer
-	 * @returns TableCellRenderer
+   * @return TableCellRenderer
 	 */
-	protected TableCellRenderer createDefaultHeaderRenderer() {
+  protected TableCellRenderer createDefaultHeaderRenderer()
+  {
 		return new DefaultTableCellRenderer();
-	} // createDefaultHeaderRenderer()
-
-
-} // TableColumn
+  }
+}
diff --git a/libjava/javax/swing/table/TableColumnModel.java b/libjava/javax/swing/table/TableColumnModel.java
index 1845697..ef0897d 100644
--- a/libjava/javax/swing/table/TableColumnModel.java
+++ b/libjava/javax/swing/table/TableColumnModel.java
@@ -37,17 +37,17 @@ exception statement from your version. */
 
 package javax.swing.table;
 
-// Imports
 import java.util.Enumeration;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.TableColumnModelListener;
 
+
 /**
  * TableColumnModel public interface
  * @author Andrew Selkirk
  */
-public interface TableColumnModel {
-
+public interface TableColumnModel
+{
 	/**
 	 * addColumn
 	 * @param column TableColumn
@@ -75,13 +75,13 @@ public interface TableColumnModel {
 
 	/**
 	 * getColumnCount
-	 * @returns Column count
+   * @return Column count
 	 */
 	int getColumnCount();
 
 	/**
 	 * getColumns
-	 * @returns Enumeration of columns
+   * @return Enumeration of columns
 	 */
 	Enumeration getColumns();
 
@@ -99,19 +99,19 @@ public interface TableColumnModel {
 
 	/**
 	 * getColumnMargin
-	 * @returns Column margin
+   * @return Column margin
 	 */
 	int getColumnMargin();
 
 	/**
 	 * getColumnIndexAtX
-	 * @returns Column index as position x
+   * @return Column index as position x
 	 */
 	int getColumnIndexAtX(int xPosition);
 
 	/**
 	 * getTotalColumnWidth
-	 * @returns Total column width
+   * @return Total column width
 	 */
 	int getTotalColumnWidth();
 
@@ -123,19 +123,19 @@ public interface TableColumnModel {
 
 	/**
 	 * getColumnSelectionAllowed
-	 * @returns true if column selection allowed, false otherwise
+   * @return true if column selection allowed, false otherwise
 	 */
 	boolean getColumnSelectionAllowed();
 
 	/**
 	 * getSelectedColumns
-	 * @returns Selected columns
+   * @return Selected columns
 	 */
 	int[] getSelectedColumns();
 
 	/**
 	 * getSelectedColumnCount
-	 * @returns Count of selected columns
+   * @return Count of selected columns
 	 */
 	int getSelectedColumnCount();
 
@@ -162,6 +162,4 @@ public interface TableColumnModel {
 	 * @param listener TableColumnModelListener
 	 */
 	void removeColumnModelListener(TableColumnModelListener listener);
-
-
-} // TableColumnModel
+}
diff --git a/libjava/javax/swing/table/TableModel.java b/libjava/javax/swing/table/TableModel.java
index 64a0855..a4732d0 100644
--- a/libjava/javax/swing/table/TableModel.java
+++ b/libjava/javax/swing/table/TableModel.java
@@ -37,38 +37,38 @@ exception statement from your version. */
 
 package javax.swing.table;
 
-// Imports
 import javax.swing.event.TableModelListener;
 
+
 /**
  * TableModel public interface
  * @author Andrew Selkirk
  */
-public interface TableModel {
-
+public interface TableModel
+{
 	/**
 	 * getRowCount
-	 * @returns row count
+   * @return row count
 	 */
 	int getRowCount();
 
 	/**
 	 * getColumnCount
-	 * @returns column count
+   * @return column count
 	 */
 	int getColumnCount();
 
 	/**
 	 * getColumnName
 	 * @param columnIndex Column index
-	 * @returns Column name
+   * @return Column name
 	 */
 	String getColumnName(int columnIndex);
 
 	/**
 	 * getColumnClass
 	 * @param columnIndex Column index
-	 * @returns Column class
+   * @return Column class
 	 */
 	Class getColumnClass(int columnIndex);
 
@@ -76,7 +76,7 @@ public interface TableModel {
 	 * isCellEditable
 	 * @param rowIndex Row index
 	 * @param columnIndex Column index
-	 * @returns true if editable, false otherwise
+   * @return true if editable, false otherwise
 	 */
 	boolean isCellEditable(int rowIndex, int columnIndex);
 
@@ -84,7 +84,7 @@ public interface TableModel {
 	 * getValueAt
 	 * @param rowIndex Row index
 	 * @param columnIndex Column index
-	 * @returns Value at specified indices
+   * @return Value at specified indices
 	 */
 	Object getValueAt(int rowIndex, int columnIndex);
 
@@ -107,6 +107,4 @@ public interface TableModel {
 	 * @param listener TableModelListener
 	 */
 	void removeTableModelListener(TableModelListener listener);
-
-
-} // TableModel
+}