You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/02/21 17:40:31 UTC

svn commit: r379526 - in /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact: DefaultArtifact.java resolver/ResolutionNode.java

Author: jvanzyl
Date: Tue Feb 21 08:40:28 2006
New Revision: 379526

URL: http://svn.apache.org/viewcvs?rev=379526&view=rev
Log:
merging in 371856 from trunk

Modified:
    maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
    maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java

Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=379526&r1=379525&r2=379526&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Tue Feb 21 08:40:28 2006
@@ -258,7 +258,8 @@
     public String toString()
     {
         return getDependencyConflictId() + ":" +
-            ( version != null || baseVersion != null ? getBaseVersion() : versionRange.toString() );
+            ( version != null || baseVersion != null ? getBaseVersion() : versionRange.toString() ) + 
+            ":" + scope;
     }
 
     public int hashCode()

Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java?rev=379526&r1=379525&r2=379526&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java Tue Feb 21 08:40:28 2006
@@ -216,4 +216,10 @@
         }
         return success;
     }
+
+    public String toString()
+    {
+        return artifact.toString() + " (" + depth + ")";
+    }
+
 }