13 files changed, 87 insertions, 45 deletions
diff --git a/libjava/javax/swing/tree/AbstractLayoutCache.java b/libjava/javax/swing/tree/AbstractLayoutCache.java
index 5be988c..4362684 100644
--- a/libjava/javax/swing/tree/AbstractLayoutCache.java
+++ b/libjava/javax/swing/tree/AbstractLayoutCache.java
@@ -35,18 +35,19 @@ 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.tree;
 
-// Imports
-import java.awt.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.awt.Rectangle;
+import java.util.Enumeration;
+import javax.swing.event.TreeModelEvent;
 
 /**
  * AbstractLayoutCache
  * @author Andrew Selkirk
  */
-public abstract class AbstractLayoutCache implements RowMapper {
+public abstract class AbstractLayoutCache implements RowMapper
+{
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/javax/swing/tree/DefaultMutableTreeNode.java
index 0c2b545..01be46a 100644
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode.java
@@ -35,11 +35,18 @@ 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.tree;
 
-// Imports
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Random;
+import java.util.Stack;
+import java.util.Vector;
 
 /**
  * DefaultMutableTreeNode
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.java b/libjava/javax/swing/tree/DefaultTreeCellEditor.java
index 732077b..6d922a4 100644
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/libjava/javax/swing/tree/DefaultTreeCellEditor.java
@@ -35,16 +35,29 @@ 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.tree;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.EventObject;
+import javax.swing.Icon;
+import javax.swing.JTextField;
+import javax.swing.JTree;
+import javax.swing.border.Border;
+import javax.swing.event.CellEditorListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 
 /**
  * DefaultTreeCellEditor
diff --git a/libjava/javax/swing/tree/DefaultTreeCellRenderer.java b/libjava/javax/swing/tree/DefaultTreeCellRenderer.java
index 6de55de..f0eb454 100644
--- a/libjava/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/libjava/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -35,11 +35,18 @@ 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.tree;
 
-// Imports
-import java.awt.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+import javax.swing.JTree;
 
 /**
  * DefaultTreeCellRenderer
diff --git a/libjava/javax/swing/tree/DefaultTreeModel.java b/libjava/javax/swing/tree/DefaultTreeModel.java
index d905be9..4f546ac 100644
--- a/libjava/javax/swing/tree/DefaultTreeModel.java
+++ b/libjava/javax/swing/tree/DefaultTreeModel.java
@@ -35,12 +35,16 @@ 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.tree;
 
-// Imports
-import java.io.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.EventListener;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TreeModelListener;
 
 /**
  * DefaultTreeModel
diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel.java b/libjava/javax/swing/tree/DefaultTreeSelectionModel.java
index 9b53582..79f642a 100644
--- a/libjava/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/libjava/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -35,14 +35,21 @@ 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.tree;
 
-// Imports
-import java.beans.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.EventListener;
+import java.util.Vector;
+import javax.swing.DefaultListSelectionModel;
+import javax.swing.event.SwingPropertyChangeSupport;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 
 /**
  * DefaultTreeSelectionModel
diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache.java b/libjava/javax/swing/tree/FixedHeightLayoutCache.java
index 279eec0..dae3422 100644
--- a/libjava/javax/swing/tree/FixedHeightLayoutCache.java
+++ b/libjava/javax/swing/tree/FixedHeightLayoutCache.java
@@ -35,12 +35,12 @@ 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.tree;
 
-// Imports
-import java.awt.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.awt.Rectangle;
+import java.util.Enumeration;
+import javax.swing.event.TreeModelEvent;
 
 /**
  * FixedHeightLayoutCache
diff --git a/libjava/javax/swing/tree/TreeCellEditor.java b/libjava/javax/swing/tree/TreeCellEditor.java
index c55b97d..503cd2d 100644
--- a/libjava/javax/swing/tree/TreeCellEditor.java
+++ b/libjava/javax/swing/tree/TreeCellEditor.java
@@ -35,9 +35,9 @@ 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.tree;
 
-// Imports
 import java.awt.Component;
 import javax.swing.JTree;
 
diff --git a/libjava/javax/swing/tree/TreeModel.java b/libjava/javax/swing/tree/TreeModel.java
index 6763544..5c3a125 100644
--- a/libjava/javax/swing/tree/TreeModel.java
+++ b/libjava/javax/swing/tree/TreeModel.java
@@ -35,10 +35,10 @@ 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.tree;
 
-// Imports
-import javax.swing.event.*;
+import javax.swing.event.TreeModelListener;
 
 /**
  * TreeModel interface
diff --git a/libjava/javax/swing/tree/TreeNode.java b/libjava/javax/swing/tree/TreeNode.java
index 46464d2..4fd7ec6 100644
--- a/libjava/javax/swing/tree/TreeNode.java
+++ b/libjava/javax/swing/tree/TreeNode.java
@@ -35,10 +35,10 @@ 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.tree;
 
-// Imports
-import java.util.*;
+import java.util.Enumeration;
 
 /**
  * TreeNode interface
diff --git a/libjava/javax/swing/tree/TreePath.java b/libjava/javax/swing/tree/TreePath.java
index 77627db..ba0a00b 100644
--- a/libjava/javax/swing/tree/TreePath.java
+++ b/libjava/javax/swing/tree/TreePath.java
@@ -35,10 +35,13 @@ 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.tree;
 
-// Imports
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * TreePath
diff --git a/libjava/javax/swing/tree/TreeSelectionModel.java b/libjava/javax/swing/tree/TreeSelectionModel.java
index ef8e0b4..3f28450 100644
--- a/libjava/javax/swing/tree/TreeSelectionModel.java
+++ b/libjava/javax/swing/tree/TreeSelectionModel.java
@@ -35,9 +35,9 @@ 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.tree;
 
-// Imports
 import java.beans.PropertyChangeListener;
 import javax.swing.event.TreeSelectionListener;
 
diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache.java b/libjava/javax/swing/tree/VariableHeightLayoutCache.java
index 8e90153..445faa9 100644
--- a/libjava/javax/swing/tree/VariableHeightLayoutCache.java
+++ b/libjava/javax/swing/tree/VariableHeightLayoutCache.java
@@ -35,12 +35,12 @@ 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.tree;
 
-// Imports
-import java.awt.*;
-import java.util.*;
-import javax.swing.event.*;
+import java.awt.Rectangle;
+import java.util.Enumeration;
+import javax.swing.event.TreeModelEvent;
 
 /**
  * VariableHeightLayoutCache