You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/02/21 08:07:36 UTC

svn commit: r509921 - in /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree: DependencyNode.java DependencyTree.java

Author: carlos
Date: Tue Feb 20 23:07:36 2007
New Revision: 509921

URL: http://svn.apache.org/viewvc?view=rev&rev=509921
Log:
Move iterator methods to dependency node

Modified:
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
    maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTree.java

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java?view=diff&rev=509921&r1=509920&r2=509921
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java Tue Feb 20 23:07:36 2007
@@ -102,4 +102,29 @@
 
         return sb.toString();
     }
+
+    /**
+     * @see #preorderIterator()
+     */
+    public Iterator iterator()
+    {
+        return preorderIterator();
+    }
+
+    /**
+     * @see DependencyTreePreorderIterator
+     */
+    public Iterator preorderIterator()
+    {
+        return new DependencyTreePreorderIterator( this );
+    }
+
+    /**
+     * @see DependencyTreeInverseIterator
+     */
+    public Iterator inverseIterator()
+    {
+        return new DependencyTreeInverseIterator( this );
+    }
+
 }

Modified: maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTree.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTree.java?view=diff&rev=509921&r1=509920&r2=509921
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTree.java (original)
+++ maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTree.java Tue Feb 20 23:07:36 2007
@@ -40,6 +40,12 @@
 
     // constructors -----------------------------------------------------------
 
+    /**
+     * Create a tree initialized to the arguments
+     * 
+     * @param rootNode
+     * @param nodes
+     */
     public DependencyTree( DependencyNode rootNode, Collection nodes )
     {
         this.rootNode = rootNode;
@@ -62,7 +68,7 @@
     {
         List artifacts = new ArrayList();
 
-        Iterator it = nodes.iterator();
+        Iterator it = getNodes().iterator();
         while ( it.hasNext() )
         {
             DependencyNode node = (DependencyNode) it.next();
@@ -78,26 +84,26 @@
     }
 
     /**
-     * @see #preorderIterator()
+     * @see DependencyNode#iterator()
      */
     public Iterator iterator()
     {
-        return preorderIterator();
+        return getRootNode().iterator();
     }
 
     /**
-     * @see DependencyTreePreorderIterator
+     * @see DependencyNode#preorderIterator()
      */
     public Iterator preorderIterator()
     {
-        return new DependencyTreePreorderIterator( getRootNode() );
+        return getRootNode().preorderIterator();
     }
 
     /**
-     * @see DependencyTreeInverseIterator
+     * @see DependencyNode#inverseIterator()
      */
     public Iterator inverseIterator()
     {
-        return new DependencyTreeInverseIterator( getRootNode() );
+        return getRootNode().inverseIterator();
     }
 }