Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049

6 files changed, 85 insertions, 91 deletions

diff --git a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
index e709e2a..d974772 100644
--- a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
@@ -45,7 +45,6 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
index 7a44e73..2891a77 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
@@ -47,7 +47,6 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Rectangle;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
@@ -56,12 +55,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.EventObject;
 
-import javax.swing.CellRendererPane;
 import javax.swing.DefaultCellEditor;
 import javax.swing.Icon;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
 import javax.swing.JTextField;
 import javax.swing.JTree;
 import javax.swing.SwingUtilities;
@@ -354,9 +349,9 @@ public class DefaultTreeCellEditor
   /**
    * Configures the editing component whenever it is null.
    * 
-   * @param tree- the tree to configure to component for.
-   * @param renderer- the renderer used to set up the nodes
-   * @param editor- the editor used 
+   * @param tree the tree to configure to component for.
+   * @param renderer the renderer used to set up the nodes
+   * @param editor the editor used 
    */
   private void configureEditingComponent(JTree tree,
                                          DefaultTreeCellRenderer renderer,
@@ -513,6 +508,8 @@ public class DefaultTreeCellEditor
     // Cell may not be currently editable, but may need to start timer.
     if (shouldStartEditingTimer(event))
       startEditingTimer();
+    else if (timer.isRunning())
+      timer.stop();
     return false;
   }
 
@@ -605,7 +602,7 @@ public class DefaultTreeCellEditor
   /**
    * Messaged when the timer fires, this will start the editing session.
    * 
-   * @param @param e - the event that characterizes the action.
+   * @param e the event that characterizes the action.
    */
   public void actionPerformed(ActionEvent e)
   {
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
index 4a353b3..d1cb9c0 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -419,8 +419,7 @@ public class DefaultTreeCellRenderer
         super.setBackground(getBackgroundSelectionColor());
         setForeground(getTextSelectionColor());
         
-        if (tree.getLeadSelectionPath() == null || 
-            (tree.getLeadSelectionPath().getLastPathComponent()).equals(val))
+        if (hasFocus)
           setBorderSelectionColor(UIManager.getLookAndFeelDefaults().
                                   getColor("Tree.selectionBorderColor"));
         else
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeModel.java b/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
index 5b5e039..5cf8098 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
@@ -299,6 +299,7 @@ public class DefaultTreeModel
   public void insertNodeInto(MutableTreeNode newChild, MutableTreeNode parent,
                              int index)
   {
+    newChild.setParent(parent);
     parent.insert(newChild, index);
     int[] childIndices = new int[1];
     childIndices[0] = index;
diff --git a/libjava/classpath/javax/swing/tree/TreeCellRenderer.java b/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
index ebbe3fa..a1808c9 100644
--- a/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
+++ b/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
@@ -46,22 +46,24 @@ import javax.swing.JTree;
  * TreeCellRenderer public interface
  * @author Andrew Selkirk
  */
-public interface TreeCellRenderer {
+public interface TreeCellRenderer
+{
 
-	/**
-	 * getTreeCellRendererComponent
-	 * @param tree TODO
-	 * @param value TODO
-	 * @param selected TODO
-	 * @param expanded TODO
-	 * @param leaf TODO
-	 * @param row TODO
-	 * @param us TODO
-	 * @returns TODO
-	 */
-	Component getTreeCellRendererComponent(JTree tree,
-			Object value, boolean selected, boolean expanded,
-			boolean leaf, int row, boolean hasFocus);
+  /**
+   * getTreeCellRendererComponent
+   * @param tree TODO
+   * @param value TODO
+   * @param selected TODO
+   * @param expanded TODO
+   * @param leaf TODO
+   * @param row TODO
+   * @param hasFocus TODO
+   * @returns TODO
+   */
+  Component getTreeCellRendererComponent(JTree tree, Object value,
+                                         boolean selected, boolean expanded,
+                                         boolean leaf, int row,
+                                         boolean hasFocus);
 
 
-} // TreeCellRenderer
+}
diff --git a/libjava/classpath/javax/swing/tree/TreeModel.java b/libjava/classpath/javax/swing/tree/TreeModel.java
index 759aaac..ec1884e 100644
--- a/libjava/classpath/javax/swing/tree/TreeModel.java
+++ b/libjava/classpath/javax/swing/tree/TreeModel.java
@@ -44,66 +44,62 @@ import javax.swing.event.TreeModelListener;
  * TreeModel public interface
  * @author Andrew Selkirk
  */
-public interface TreeModel {
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
-	/**
-	 * getRoot
-	 * @returns Object
-	 */
-	Object getRoot();
-
-	/**
-	 * getChild
-	 * @param parent TODO
-	 * @param index TODO
-	 * @returns Object
-	 */
-	Object getChild(Object parent, int index);
-
-	/**
-	 * getChildCount
-	 * @param parent TODO
-	 * @returns int
-	 */
-	int getChildCount(Object parent);
-
-	/**
-	 * isLeaf
-	 * @param node TODO
-	 * @returns boolean
-	 */
-	boolean isLeaf(Object node);
-
-	/**
-	 * valueForPathChanged
-	 * @param path TODO
-	 * @param newvalue TODO
-	 */
-	void valueForPathChanged(TreePath path, Object newvalue);
-
-	/**
-	 * getIndexOfChild
-	 * @param parent TODO
-	 * @param ild TODO
-	 * @returns int
-	 */
-	int getIndexOfChild(Object parent, Object child);
-
-	/**
-	 * addTreeModelListener
-	 * @param listener TODO
-	 */
-	void addTreeModelListener(TreeModelListener listener);
-
-	/**
-	 * removeTreeModelListener
-	 * @param listener TODO
-	 */
-	void removeTreeModelListener(TreeModelListener listener);
-
-
-} // TreeModel
+public interface TreeModel
+{
+  /**
+   * getRoot
+   * @returns Object
+   */
+  Object getRoot();
+
+  /**
+   * getChild
+   * @param parent TODO
+   * @param index TODO
+   * @returns Object
+   */
+  Object getChild(Object parent, int index);
+
+  /**
+   * getChildCount
+   * @param parent TODO
+   * @returns int
+   */
+  int getChildCount(Object parent);
+
+  /**
+   * isLeaf
+   * @param node TODO
+   * @returns boolean
+   */
+  boolean isLeaf(Object node);
+
+  /**
+   * valueForPathChanged
+   * @param path TODO
+   * @param newvalue TODO
+   */
+  void valueForPathChanged(TreePath path, Object newvalue);
+
+  /**
+   * getIndexOfChild
+   * @param parent TODO
+   * @param child TODO
+   * @returns int
+   */
+  int getIndexOfChild(Object parent, Object child);
+
+  /**
+   * addTreeModelListener
+   * @param listener TODO
+   */
+  void addTreeModelListener(TreeModelListener listener);
+
+  /**
+   * removeTreeModelListener
+   * @param listener TODO
+   */
+  void removeTreeModelListener(TreeModelListener listener);
+
+
+}