svn commit: r568210 - /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java

[carlos]

Author: carlos
Date: Tue Aug 21 10:48:19 2007
New Revision: 568210

URL: http://svn.apache.org/viewvc?rev=568210&view=rev
Log:
Fix bug when an updateScopeCurrentPom event is received prior to an 
includeArtifact

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

Modified: 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java?rev=568210&r1=568209&r2=568210&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
 Tue Aug 21 10:48:19 2007
@@ -276,16 +276,18 @@
      * @see 
org.apache.maven.artifact.resolver.ResolutionListener#updateScopeCurrentPom(org.apache.maven.artifact.Artifact,
      *      java.lang.String)
      */
-    public void updateScopeCurrentPom( Artifact artifact, String scope )
+    public void updateScopeCurrentPom( Artifact artifact, String scopeIgnored )
     {
         DependencyNode node = getNode( artifact );
 
         if ( node == null )
         {
-            throw new IllegalStateException( "Cannot find dependency node for 
artifact " + artifact );
+            // updateScopeCurrentPom events can be received prior to 
includeArtifact events
+            node = addNode( artifact );
+            // TODO remove the node that tried to impose its scope and add 
some info
         }
-        
-        node.setFailedUpdateScope( scope );
+
+        node.setFailedUpdateScope( scopeIgnored );
     }
 
     /*
@@ -349,8 +351,6 @@
         }
     }
 
-    // public methods ---------------------------------------------------------
-    
     /**
      * Gets a list of all dependency nodes in the computed dependency tree.
      * 
@@ -403,7 +403,7 @@
      *            the attached artifact for the new dependency node
      * @return the new dependency node
      */
-    private DependencyNode addNode( Artifact artifact )
+    DependencyNode addNode( Artifact artifact )
     {
         DependencyNode node = createNode( artifact );