--- /home/cpdev/src/classpath/javax/swing/tree/DefaultMutableTreeNode.java	2005-07-15 17:32:44.000000000 +0000
+++ javax/swing/tree/DefaultMutableTreeNode.java	2005-06-30 05:35:21.000000000 +0000
@@ -45,19 +45,14 @@
 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;
 import java.util.Stack;
 import java.util.Vector;
 
-
 /**
  * DefaultMutableTreeNode
  *
  * @author Andrew Selkirk
- * @author Robert Schuster (robertschuster@fsfe.org)
  */
 public class DefaultMutableTreeNode
   implements Cloneable, MutableTreeNode, Serializable
@@ -237,7 +232,7 @@
    * Inserts given child node at the given index.
    *
    * @param node the child node
-   * @param index the index.
+   * @param value the index.
    */
   public void insert(MutableTreeNode node, int index)
   {
@@ -358,7 +353,7 @@
    */
   public void removeFromParent()
   {
-    parent.remove(this);
+    // FIXME: IS this implementation really correct ?
     parent = null;
   }
 
@@ -394,7 +389,7 @@
   /**
    * isNodeDescendant
    *
-   * @param node TODO
+   * @param node0 TODO
    *
    * @return boolean
    */
@@ -661,7 +656,7 @@
    */
   public Enumeration preorderEnumeration()
   {
-    return new PreorderEnumeration(this);
+    return null; // TODO: Implement me.
   }
 
   /**
@@ -671,7 +666,7 @@
    */
   public Enumeration postorderEnumeration()
   {
-    return new PostorderEnumeration(this);
+    return null; // TODO: Implement me.
   }
 
   /**
@@ -681,7 +676,7 @@
    */
   public Enumeration breadthFirstEnumeration()
   {
-    return new BreadthFirstEnumeration(this);
+    return null; // TODO: Implement me.
   }
 
   /**
@@ -918,7 +913,6 @@
     if (parent == null)
       return null;
 
-    // TODO: Fix implementation.
     return null;
     //return parent.getChildAfter(this);
   }
@@ -932,8 +926,7 @@
   {
     if (parent == null)
       return null;
-
-    // TODO: Fix implementation.
+    
     return null;
     //return parent.getChildBefore(this);
   }
@@ -958,155 +951,4 @@
 
     return count;
   }
-
-  /** Provides an enumeration of a tree in breadth-first traversal
-   * order.
-   */
-  static class BreadthFirstEnumeration implements Enumeration
-  {
-
-      LinkedList queue = new LinkedList();
-
-      BreadthFirstEnumeration(TreeNode node)
-      {
-          queue.add(node);
-      }
-
-      public boolean hasMoreElements()
-      {
-          return !queue.isEmpty();
-      }
-
-      public Object nextElement()
-      {
-          if(queue.isEmpty())
-              throw new NoSuchElementException("No more elements left.");
-
-          TreeNode node = (TreeNode) queue.removeFirst();
-
-          Enumeration children = node.children();
-          while (children.hasMoreElements())
-              queue.add(children.nextElement());
-
-          return node;
-      }
-  }
-
-  /** Provides an enumeration of a tree traversing it
-   * preordered.
-   */
-  static class PreorderEnumeration implements Enumeration
-  {
-	  TreeNode next;
-
-      Stack childrenEnums = new Stack();
-
-      PreorderEnumeration(TreeNode node)
-      {
-          next = node;
-          childrenEnums.push(node.children());
-      }
-
-      public boolean hasMoreElements()
-      {
-          return next != null;
-      }
-
-      public Object nextElement()
-      {
-          if( next == null )
-              throw new NoSuchElementException("No more elements left.");
-
-          Object current = next;
-
-          Enumeration children = (Enumeration) childrenEnums.peek();
-
-          // Retrieves the next element.
-          next = traverse(children);
-
-          return current;
-      }
-
-      private TreeNode traverse(Enumeration children)
-      {
-          // If more children are available step down.
-          if( children.hasMoreElements() )
-          {
-              TreeNode child = (TreeNode) children.nextElement();
-              childrenEnums.push(child.children());
-
-              return child;
-          }
-          
-          // If no children are left, we return to a higher level.
-          childrenEnums.pop();
-
-          // If there are no more levels left, there is no next
-          // element to return.
-          if ( childrenEnums.isEmpty() )
-              return null;
-          else
-          {
-              return traverse((Enumeration) childrenEnums.peek());
-          }
-      }
-   }
-
-  /** Provides an enumeration of a tree traversing it
-   * postordered (= depth-first).
-   */
-   static class PostorderEnumeration implements Enumeration
-   {
-
-       Stack nodes = new Stack();
-       Stack childrenEnums = new Stack();
-
-       PostorderEnumeration(TreeNode node)
-       {
-           nodes.push(node);
-           childrenEnums.push(node.children());
-       }
-
-       public boolean hasMoreElements()
-       {
-           return !nodes.isEmpty();
-       }
-
-       public Object nextElement()
-       {
-           if( nodes.isEmpty() )
-               throw new NoSuchElementException("No more elements left!");
-
-           Enumeration children = (Enumeration) childrenEnums.peek();
-
-           return traverse(children);
-       }
-
-       private Object traverse(Enumeration children)
-       {
-           if ( children.hasMoreElements() )
-           {
-               TreeNode node = (TreeNode) children.nextElement();
-               nodes.push(node);
-
-               Enumeration newChildren = node.children();
-               childrenEnums.push(newChildren);
-
-               return traverse(newChildren);
-           }
-           else
-           {
-               childrenEnums.pop();
-
-               // Returns the node whose children
-               // have all been visited. (= postorder)
-               Object next = nodes.peek();
-               nodes.pop();
-
-               return next;
-           }
-       }
-
-    }
-
 }