2006-03-03 David Gilbert <david.gilbert@object-refinery.com>

	* javax/swing/event/CaretEvent.java: Reformatting and fixed API doc
	warnings,
	* javax/swing/event/DocumentEvent.java: Likewise,
	* javax/swing/event/EventListenerList.java: Likewise,
	* javax/swing/event/MenuDragMouseEvent.java: Likewise,
	* javax/swing/event/MenuKeyEvent.java: Likewise,
	* javax/swing/event/TableColumnModelEvent.java: Likewise,
	* javax/swing/event/TreeExpansionEvent.java: Likewise,
	* javax/swing/event/TreeModelEvent.java: Likewise,
	* javax/swing/event/TreeSelectionEvent.java: Likewise,
	* javax/swing/event/UndoableEditEvent.java: Likewise.
----------------------------------------------------------------------

11 files changed, 349 insertions, 410 deletions

diff --git a/ChangeLog b/ChangeLog
index 01ea17aeb..c6a39f959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-03  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/event/CaretEvent.java: Reformatting and fixed API doc 
+	warnings,
+	* javax/swing/event/DocumentEvent.java: Likewise,
+	* javax/swing/event/EventListenerList.java: Likewise,
+	* javax/swing/event/MenuDragMouseEvent.java: Likewise,
+	* javax/swing/event/MenuKeyEvent.java: Likewise,
+	* javax/swing/event/TableColumnModelEvent.java: Likewise,
+	* javax/swing/event/TreeExpansionEvent.java: Likewise,
+	* javax/swing/event/TreeModelEvent.java: Likewise,
+	* javax/swing/event/TreeSelectionEvent.java: Likewise,
+	* javax/swing/event/UndoableEditEvent.java: Likewise.
+
 2006-03-03  Tom Tromey  <tromey@redhat.com>
 
 	* java/awt/Insets.java (set): New method.
diff --git a/javax/swing/event/CaretEvent.java b/javax/swing/event/CaretEvent.java
index c4870a800..7de05a81b 100644
--- a/javax/swing/event/CaretEvent.java
+++ b/javax/swing/event/CaretEvent.java
@@ -1,5 +1,5 @@
 /* CaretEvent.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,43 +37,34 @@ exception statement from your version. */
 
 package javax.swing.event;
 
-// Imports
 import java.util.EventObject;
 
 /**
  * CaretEvent
  * @author Andrew Selkirk
  */
-public abstract class CaretEvent extends EventObject {
+public abstract class CaretEvent extends EventObject 
+{
 
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-	
-	/**
-	 * CaretEvent constructor
-	 * @param source Source object
-	 */
-	public CaretEvent(Object source) {
-		super(source);
-	} // CaretEvent()
+  /**
+   * CaretEvent constructor
+   * @param source Source object
+   */
+  public CaretEvent(Object source) 
+  {
+    super(source);
+  }
 
-	
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-	
-	/**
-	 * Get caret location
-	 * @returns the dot
-	 */
-	public abstract int getDot();
+  /**
+   * Get caret location
+   * @return the dot
+   */
+  public abstract int getDot();
 
-	/**
-	 * Get mark
-	 * @returns the mark
-	 */
-	public abstract int getMark();
+  /**
+   * Get mark
+   * @return the mark
+   */
+  public abstract int getMark();
 
-
-} // CaretEvent
+} 
diff --git a/javax/swing/event/DocumentEvent.java b/javax/swing/event/DocumentEvent.java
index c17b24254..822304925 100644
--- a/javax/swing/event/DocumentEvent.java
+++ b/javax/swing/event/DocumentEvent.java
@@ -1,5 +1,5 @@
 /* DocumentEvent.java --
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -54,25 +54,25 @@ public interface DocumentEvent
   {
     /**
      * getIndex
-     * @returns int
+     * @return int
      */
     int getIndex();
 
     /**
      * getElement
-     * @returns Element
+     * @return Element
      */
     Element getElement();
 
     /**
      * getChildrenRemoved
-     * @returns Element[]
+     * @return Element[]
      */
     Element[] getChildrenRemoved();
 
     /**
      * getChildrenAdded
-     * @returns Element[]
+     * @return Element[]
      */
     Element[] getChildrenAdded();
     
@@ -114,7 +114,7 @@ public interface DocumentEvent
 
     /**
      * toString
-     * @returns String
+     * @return String
      */
     public String toString()
     {
@@ -124,32 +124,32 @@ public interface DocumentEvent
 
   /**
    * getType
-   * @returns EventType
+   * @return EventType
    */
   EventType getType();
 
   /**
    * getOffset
-   * @returns int
+   * @return int
    */
   int getOffset();
 
   /**
    * getLength
-   * @returns int
+   * @return int
    */
   int getLength();
 
   /**
    * getDocument
-   * @returns Document
+   * @return Document
    */
   Document getDocument();
 
   /**
    * getChange
    * @param element TODO
-   * @returns ElementChange
+   * @return ElementChange
    */
   ElementChange getChange(Element element);
 
diff --git a/javax/swing/event/EventListenerList.java b/javax/swing/event/EventListenerList.java
index 147d68ef1..a7fbec44d 100644
--- a/javax/swing/event/EventListenerList.java
+++ b/javax/swing/event/EventListenerList.java
@@ -188,7 +188,7 @@ public class EventListenerList
 
   /**
    * Get a list of listenerType/listener pairs
-   * @returns Listener list
+   * @return Listener list
    */
   public Object[] getListenerList()
   {
@@ -214,7 +214,7 @@ public class EventListenerList
    * @throws NullPointerException if <code>c</code> is
    * <code>null</code>.
    *
-   * @returns an array of <code>c</code> whose elements are the
+   * @return an array of <code>c</code> whose elements are the
    * currently subscribed listeners of the specified type.  If there
    * are no such listeners, an empty array is returned.
    *
diff --git a/javax/swing/event/MenuDragMouseEvent.java b/javax/swing/event/MenuDragMouseEvent.java
index 997616706..6be11bcca 100644
--- a/javax/swing/event/MenuDragMouseEvent.java
+++ b/javax/swing/event/MenuDragMouseEvent.java
@@ -1,5 +1,5 @@
 /* MenuDragMouseEvent.java --
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,68 +48,57 @@ import javax.swing.MenuSelectionManager;
  * MenuDragMouseEvent
  * @author Andrew Selkirk
  */
-public class MenuDragMouseEvent extends MouseEvent {
+public class MenuDragMouseEvent extends MouseEvent 
+{
 
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * path
-	 */
-	private	MenuElement[]			path		= null;
+  /**
+   * path
+   */
+  private MenuElement[] path = null;
 	
-	/**
-	 * manager
-	 */
-	private	MenuSelectionManager	manager		= null;
-
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * Constructor MenuDragMouseEvent
-	 * @param source Source
-	 * @param id MouseEvent type
-	 * @param when Time
-	 * @param modifiers Key modifiers
-	 * @param x Horizontal position
-	 * @param y Vertical position
-	 * @param clickCount Click count
-	 * @param popupTrigger Popup trigger?
-	 * @param path Path
-	 * @param manager MenuSelectionManager
-	 */
-	public MenuDragMouseEvent(Component source, int id, long when, int modifiers,
-						int x, int y, int clickCount, boolean popupTrigger,
-						MenuElement[] path, MenuSelectionManager manager) {
-		super(source, id, when, modifiers, x, y, clickCount, popupTrigger);
-		this.path = path;
-		this.manager = manager;
-	} // MenuDragMouseEvent()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * Get path
-	 * @returns path
-	 */
-	public MenuElement[] getPath() {
-		return path;
-	} // getPath()
-
-	/**
-	 * Get menu selection manager
-	 * @returns manager
-	 */
-	public MenuSelectionManager getMenuSelectionManager() {
-		return manager;
-	} // getMenuSelectionManager()
-
-
-} // MenuDragMouseEvent
+  /**
+   * manager
+   */
+  private MenuSelectionManager manager = null;
+
+  /**
+   * Constructor MenuDragMouseEvent
+   * @param source Source
+   * @param id MouseEvent type
+   * @param when Time
+   * @param modifiers Key modifiers
+   * @param x Horizontal position
+   * @param y Vertical position
+   * @param clickCount Click count
+   * @param popupTrigger Popup trigger?
+   * @param path Path
+   * @param manager MenuSelectionManager
+   */
+  public MenuDragMouseEvent(Component source, int id, long when, int modifiers,
+      int x, int y, int clickCount, boolean popupTrigger,
+      MenuElement[] path, MenuSelectionManager manager) 
+  {
+    super(source, id, when, modifiers, x, y, clickCount, popupTrigger);
+    this.path = path;
+    this.manager = manager;
+  } 
+
+  /**
+   * Get path
+   * @return path
+   */
+  public MenuElement[] getPath() 
+  {
+    return path;
+  } 
+
+  /**
+   * Get menu selection manager
+   * @return manager
+   */
+  public MenuSelectionManager getMenuSelectionManager() 
+  {
+    return manager;
+  }
+
+} 
diff --git a/javax/swing/event/MenuKeyEvent.java b/javax/swing/event/MenuKeyEvent.java
index 511cb2254..3335850bc 100644
--- a/javax/swing/event/MenuKeyEvent.java
+++ b/javax/swing/event/MenuKeyEvent.java
@@ -1,5 +1,5 @@
 /* MenuKeyEvent.java --
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,66 +48,55 @@ import javax.swing.MenuSelectionManager;
  * MenuKeyEvent
  * @author Andrew Selkirk
  */
-public class MenuKeyEvent extends KeyEvent {
+public class MenuKeyEvent extends KeyEvent 
+{
 
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * path
-	 */
-	private	MenuElement[]			path		= null;
+  /**
+   * path
+   */
+  private MenuElement[] path = null;
 	
-	/**
-	 * manager
-	 */
-	private	MenuSelectionManager	manager		= null;
-
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * Constructor MenuKeyEvent
-	 * @param source Source
-	 * @param id KeyEvent ID
-	 * @param when Time
-	 * @param modifiers Modifier keys
-	 * @param keyCode Key code
-	 * @param keyChar Key char
-	 * @param path Path
-	 * @param manager MenuSelectionManager
-	 */
-	public MenuKeyEvent(Component source, int id, long when, int modifiers,
-						int keyCode, char keyChar, MenuElement[] path,
-						MenuSelectionManager manager) {
-		super(source, id, when, modifiers, keyCode, keyChar);
-		this.path = path;
-		this.manager = manager;
-	} // MenuKeyEvent()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * getPath
-	 * @returns path
-	 */
-	public MenuElement[] getPath() {
-		return path;
-	} // getPath()
-
-	/**
-	 * getMenuSelectionManager
-	 * @returns MenuSelectionManager
-	 */
-	public MenuSelectionManager getMenuSelectionManager() {
-		return manager;
-	} // getMenuSelectionManager()
-
-
-} // MenuKeyEvent
+  /**
+   * manager
+   */
+  private MenuSelectionManager manager = null;
+
+  /**
+   * Constructor MenuKeyEvent
+   * @param source Source
+   * @param id KeyEvent ID
+   * @param when Time
+   * @param modifiers Modifier keys
+   * @param keyCode Key code
+   * @param keyChar Key char
+   * @param path Path
+   * @param manager MenuSelectionManager
+   */
+  public MenuKeyEvent(Component source, int id, long when, int modifiers,
+      int keyCode, char keyChar, MenuElement[] path,
+      MenuSelectionManager manager) 
+  {
+    super(source, id, when, modifiers, keyCode, keyChar);
+    this.path = path;
+    this.manager = manager;
+  } 
+
+  /**
+   * getPath
+   * @return path
+   */
+  public MenuElement[] getPath() 
+  {
+    return path;
+  }
+
+  /**
+   * getMenuSelectionManager
+   * @return MenuSelectionManager
+   */
+  public MenuSelectionManager getMenuSelectionManager() 
+  {
+    return manager;
+  }
+
+} 
diff --git a/javax/swing/event/TableColumnModelEvent.java b/javax/swing/event/TableColumnModelEvent.java
index a304b03b8..cff49130e 100644
--- a/javax/swing/event/TableColumnModelEvent.java
+++ b/javax/swing/event/TableColumnModelEvent.java
@@ -74,7 +74,7 @@ public class TableColumnModelEvent extends EventObject
 
   /**
    * getFromIndex.
-   * @returns From index
+   * @return From index
    */
   public int getFromIndex() 
   {
@@ -83,7 +83,7 @@ public class TableColumnModelEvent extends EventObject
 
   /**
    * getToIndex. 
-   * @returns To index
+   * @return To index
    */
   public int getToIndex() 
   {
diff --git a/javax/swing/event/TreeExpansionEvent.java b/javax/swing/event/TreeExpansionEvent.java
index c4b331346..5820b3391 100644
--- a/javax/swing/event/TreeExpansionEvent.java
+++ b/javax/swing/event/TreeExpansionEvent.java
@@ -1,5 +1,5 @@
 /* TreeExpansionEvent.java --
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,44 +46,32 @@ import javax.swing.tree.TreePath;
  * TreeExpansionEvent
  * @author Andrew Selkirk
  */
-public class TreeExpansionEvent extends EventObject {
-
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * path
-	 */
-	protected TreePath	path		= null;
-
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * Constructor TreeExpansionEvent
-	 * @param source Source object
-	 * @param path Path
-	 */
-	public TreeExpansionEvent(Object source, TreePath path) {
-		super(source);
-		this.path = path;
-	} // TreeExpansionEvent()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-	
-	/**
-	 * getPath
-	 * @returns Tree path
-	 */
-	public TreePath getPath() {
-		return path;
-	} // getPath()
-
-
-} // TreeExpansionEvent
+public class TreeExpansionEvent extends EventObject 
+{
+
+  /**
+   * path
+   */
+  protected TreePath path = null;
+
+  /**
+   * Constructor TreeExpansionEvent
+   * @param source Source object
+   * @param path Path
+   */
+  public TreeExpansionEvent(Object source, TreePath path) 
+  {
+    super(source);
+    this.path = path;
+  }
+
+  /**
+   * getPath
+   * @return Tree path
+   */
+  public TreePath getPath() 
+  {
+    return path;
+  } 
+
+} 
diff --git a/javax/swing/event/TreeModelEvent.java b/javax/swing/event/TreeModelEvent.java
index 8fa28a7ea..2d562a5c4 100644
--- a/javax/swing/event/TreeModelEvent.java
+++ b/javax/swing/event/TreeModelEvent.java
@@ -1,5 +1,5 @@
 /* TreeModelEvent.java --
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,128 +46,123 @@ import javax.swing.tree.TreePath;
  * TreeModelEvent
  * @author Andrew Selkirk
  */
-public class TreeModelEvent extends EventObject {
-
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-	
-	/**
-	 * childIndices
-	 */
-	protected int[]		childIndices	= null;
-
-	/**
-	 * children
-	 */
-	protected Object[]	children		= null;
-
-	/**
-	 * path
-	 */
-	protected TreePath	path			= null;
-
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
+public class TreeModelEvent extends EventObject 
+{
+
+  /**
+   * childIndices
+   */
+  protected int[] childIndices = null;
+
+  /**
+   * children
+   */
+  protected Object[] children = null;
+
+  /**
+   * path
+   */
+  protected TreePath path = null;
 	
-	/**
-	 * Constructor TreeModelEvent
-	 * @param source Source object
-	 * @param path
-	 */
-	public TreeModelEvent(Object source, Object[] path) {
-		super(source);
-		this.path = new TreePath(path);
-	} // TreeModelEvent()
-
-	/**
-	 * Constructor TreeModelEvent
-	 * @param source Source object
-	 * @param path path
-	 * @param childIndices Child indices
-	 * @param children Children
-	 */
-	public TreeModelEvent(Object source, Object[] path,
-						int[] childIndices, Object[] children) {
-		super(source);
-		this.path		 	= new TreePath(path);
-		this.childIndices	= childIndices;
-		this.children		= children;
-	} // TreeModelEvent()
-
-	/**
-	 * Constructor TreeModelEvent
-	 * @param source Source object
-	 * @param path Path
-	 */
-	public TreeModelEvent(Object source, TreePath path) {
-		super(source);
-		this.path = path;
-	} // TreeModelEvent()
-
-	/**
-	 * Constructor TreeModelEvent
-	 * @param source Source object
-	 * @param path Path
-	 * @param childIndices Child indices
-	 * @param children Children
-	 */
-	public TreeModelEvent(Object source, TreePath path,
-						int[] childIndices, Object[] children) {
-		super(source);
-		this.path		 	= path;
-		this.childIndices	= childIndices;
-		this.children		= children;
-	} // TreeModelEvent()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * getChildIndices
-	 * @returns child indices
-	 */
-	public int[] getChildIndices() {
-		return childIndices;
-	} // getChildIndices()
-
-	/**
-	 * getChildren
-	 * @returns children
-	 */
-	public Object[] getChildren() {
-		return children;
-	} // getChildren()
-
-	/**
-	 * getPath
-	 * @returns path
-	 */
-	public Object[] getPath() {
-		return path.getPath();
-	} // getPath()
-
-	/**
-	 * getTreePath
-	 * @returns TreePath
-	 */
-	public TreePath getTreePath() {
-		return path;
-	} // getTreePath()
-
-	/**
-	 * String representation
-	 * @returns String representation
-	 */
-	public String toString() {
-		return getClass() + " [Source: " + getSource() + ", TreePath: " + getTreePath() +
-        ", Child Indicies: " + getChildIndices() + ", Children: " + getChildren() + 
-        ", Path: " + getPath() +"]";
-	} // toString()
-
-
-} // TreeModelEvent
+  /**
+   * Constructor TreeModelEvent
+   * @param source Source object
+   * @param path
+   */
+  public TreeModelEvent(Object source, Object[] path) 
+  {
+    super(source);
+    this.path = new TreePath(path);
+  } 
+
+  /**
+   * Constructor TreeModelEvent
+   * @param source Source object
+   * @param path path
+   * @param childIndices Child indices
+   * @param children Children
+   */
+  public TreeModelEvent(Object source, Object[] path,
+      int[] childIndices, Object[] children) 
+  {
+    super(source);
+    this.path = new TreePath(path);
+    this.childIndices = childIndices;
+    this.children = children;
+  } 
+
+  /**
+   * Constructor TreeModelEvent
+   * @param source Source object
+   * @param path Path
+   */
+  public TreeModelEvent(Object source, TreePath path) 
+  {
+    super(source);
+    this.path = path;
+  } 
+
+  /**
+   * Constructor TreeModelEvent
+   * @param source Source object
+   * @param path Path
+   * @param childIndices Child indices
+   * @param children Children
+   */
+  public TreeModelEvent(Object source, TreePath path,
+      int[] childIndices, Object[] children) 
+  {
+    super(source);
+    this.path = path;
+    this.childIndices = childIndices;
+    this.children = children;
+  } 
+
+  /**
+   * getChildIndices
+   * @return child indices
+   */
+  public int[] getChildIndices()  
+  {
+    return childIndices;
+  } 
+
+  /**
+   * getChildren
+   * @return children
+   */
+  public Object[] getChildren()  
+  {
+    return children;
+  } 
+
+  /**
+   * getPath
+   * @return path
+   */
+  public Object[] getPath() 
+  {
+    return path.getPath();
+  } 
+
+  /**
+   * getTreePath
+   * @return TreePath
+   */
+  public TreePath getTreePath() 
+  {
+    return path;
+  } 
+
+  /**  
+   * String representation
+   * @return String representation
+   */
+  public String toString() 
+  {
+    return getClass() + " [Source: " + getSource() + ", TreePath: " 
+        + getTreePath() + ", Child Indicies: " + getChildIndices() 
+        + ", Children: " + getChildren() + ", Path: " + getPath() +"]";
+  } 
+
+} 
diff --git a/javax/swing/event/TreeSelectionEvent.java b/javax/swing/event/TreeSelectionEvent.java
index 9b87667a3..1930677af 100644
--- a/javax/swing/event/TreeSelectionEvent.java
+++ b/javax/swing/event/TreeSelectionEvent.java
@@ -1,5 +1,5 @@
 /* TreeSelectionEvent.java --
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -49,10 +49,6 @@ import javax.swing.tree.TreePath;
  */
 public class TreeSelectionEvent extends EventObject {
 
-  //-------------------------------------------------------------
-  // Variables --------------------------------------------------
-  //-------------------------------------------------------------
-
   /**
    * paths
    */
@@ -73,11 +69,6 @@ public class TreeSelectionEvent extends EventObject {
    */
   protected TreePath newLeadSelectionPath;
 
-
-  //-------------------------------------------------------------
-  // Initialization ---------------------------------------------
-  //-------------------------------------------------------------
-
   /**
    * Constructor TreeSelectionEvent
    * @param source TODO
@@ -95,7 +86,7 @@ public class TreeSelectionEvent extends EventObject {
     this.areNew					= areNew;
     this.oldLeadSelectionPath	= oldLeadSelectionPath;
     this.newLeadSelectionPath	= newLeadSelectionPath;
-  } // TreeSelectionEvent()
+  }
 
   /**
    * Constructor TreeSelectionEvent
@@ -114,29 +105,24 @@ public class TreeSelectionEvent extends EventObject {
     this.areNew = new boolean[]{isNew};
     this.oldLeadSelectionPath	= oldLeadSelectionPath;
     this.newLeadSelectionPath	= newLeadSelectionPath;
-  } // TreeSelectionEvent()
-
-
-  //-------------------------------------------------------------
-  // Methods ----------------------------------------------------
-  //-------------------------------------------------------------
+  }
 
   /**
-   * @returns the first path element
+   * @return the first path element
    */
   public TreePath getPath()
   {
     return paths[0];
-  } // getPath()
+  } 
 
   /**
    * 
-   * @returns the paths with selection changed
+   * @return the paths with selection changed
    */
   public TreePath[] getPaths()
   {
     return (TreePath[]) paths.clone();
-  } // getPaths()
+  } 
 
   /**
    * @return true if the first path is added to the selection, false otherwise
@@ -144,7 +130,7 @@ public class TreeSelectionEvent extends EventObject {
   public boolean isAddedPath()
   {
     return areNew[0];
-  } // isAddedPath()
+  } 
 
   /**
    * @param path the path to check
@@ -157,7 +143,7 @@ public class TreeSelectionEvent extends EventObject {
 	return areNew[i];
 
     return false;
-  } // isAddedPath()
+  } 
 
   /**
    * @param index the index'th path
@@ -166,7 +152,7 @@ public class TreeSelectionEvent extends EventObject {
   public boolean isAddedPath(int index)
   {
     return areNew[index];
-  } // isAddedPath()
+  }
 
   /**
    * @return the previous lead selection path
@@ -174,15 +160,15 @@ public class TreeSelectionEvent extends EventObject {
   public TreePath getOldLeadSelectionPath()
   {
     return oldLeadSelectionPath;
-  } // getOldLeadSelectionPath()
+  } 
 
   /**
-   * @returns the current lead selection path
+   * @return the current lead selection path
    */
   public TreePath getNewLeadSelectionPath()
   {
     return newLeadSelectionPath;
-  } // getNewLeadSelectionPath()
+  }
 
   /**
    * @param source the new event source
@@ -193,7 +179,6 @@ public class TreeSelectionEvent extends EventObject {
     return new TreeSelectionEvent (source, paths, areNew,
 				   oldLeadSelectionPath,
 				   newLeadSelectionPath);
-  } // cloneWithSource()
-
+  } 
 
-} // TreeSelectionEvent
+} 
diff --git a/javax/swing/event/UndoableEditEvent.java b/javax/swing/event/UndoableEditEvent.java
index 147c2e5b1..b59ceadc9 100644
--- a/javax/swing/event/UndoableEditEvent.java
+++ b/javax/swing/event/UndoableEditEvent.java
@@ -1,5 +1,5 @@
 /* UndoableEditEvent.java --
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,46 +47,34 @@ import javax.swing.undo.UndoableEdit;
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public class UndoableEditEvent extends EventObject {
+public class UndoableEditEvent extends EventObject 
+{
 
   private static final long serialVersionUID = 4418044561759134484L;
 
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * edit
-	 */
-	private UndoableEdit edit;
-
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * Constructor UndoableEditEvent
-	 * @param source TODO
-	 * @param edit TODO
-	 */
-	public UndoableEditEvent(Object source, UndoableEdit edit) {
-		super(source);
-		this.edit = edit;
-	} // UndoableEditEvent()
-
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * getEdit
-	 * @returns UndoableEdit
-	 */
-	public UndoableEdit getEdit() {
-		return edit;
-	} // getEdit()
-
-
-} // UndoableEditEvent
+  /**
+   * edit
+   */
+  private UndoableEdit edit;
+
+  /**
+   * Constructor UndoableEditEvent
+   * @param source TODO
+   * @param edit TODO
+   */
+  public UndoableEditEvent(Object source, UndoableEdit edit) 
+  {
+    super(source);
+    this.edit = edit;
+  } 
+
+  /**
+   * getEdit
+   * @return UndoableEdit
+   */
+  public UndoableEdit getEdit() 
+  {
+    return edit;
+  }
+
+}