svn commit: r1350765 - in /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph: DependencyGraphBuilder.java internal/Maven2DependencyNode.java internal/Maven3DependencyNode.java

[hboutemy]

Author: hboutemy
Date: Fri Jun 15 20:02:48 2012
New Revision: 1350765

URL: http://svn.apache.org/viewvc?rev=1350765&view=rev
Log:
filter can be null

Modified:
    
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyGraphBuilder.java
    
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven2DependencyNode.java
    
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyNode.java

Modified: 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyGraphBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyGraphBuilder.java?rev=1350765&r1=1350764&r2=1350765&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyGraphBuilder.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/DependencyGraphBuilder.java
 Fri Jun 15 20:02:48 2012
@@ -30,6 +30,14 @@ import org.apache.maven.project.MavenPro
  */
 public interface DependencyGraphBuilder
 {
+    /**
+     * Build the dependency graph.
+     *
+     * @param project the project
+     * @param filter artifact filter (can be <code>null</code>
+     * @return the dependency graph
+     * @throws DependencyGraphBuilderException
+     */
     public DependencyNode buildDependencyGraph( MavenProject project, 
ArtifactFilter filter )
         throws DependencyGraphBuilderException;
 }

Modified: 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven2DependencyNode.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven2DependencyNode.java?rev=1350765&r1=1350764&r2=1350765&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven2DependencyNode.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven2DependencyNode.java
 Fri Jun 15 20:02:48 2012
@@ -48,7 +48,7 @@ public class Maven2DependencyNode
         List<DependencyNode> nodes = new ArrayList<DependencyNode>( 
node.getChildren().size() );
         for ( org.apache.maven.shared.dependency.tree.DependencyNode child : 
node.getChildren() )
         {
-            if ( filter.include( child.getArtifact() ) )
+            if ( ( filter == null ) || filter.include( child.getArtifact() ) )
             {
                 nodes.add( new Maven2DependencyNode( child, filter ) );
             }

Modified: 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyNode.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyNode.java?rev=1350765&r1=1350764&r2=1350765&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyNode.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyNode.java
 Fri Jun 15 20:02:48 2012
@@ -62,7 +62,7 @@ public class Maven3DependencyNode
                                                   art.getExtension(), 
art.getClassifier(), dep.getScope(),
                                                   dep.isOptional() );
 
-            if ( !filter.include( tmpArtifact ) )
+            if ( ( filter != null ) && !filter.include( tmpArtifact ) )
             {
                 this.artifact = null;
                 children = null;