svn commit: r373072 - /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

[ca...@apache.org]

Author: carlos
Date: Fri Jan 27 18:37:33 2006
New Revision: 373072

URL: http://svn.apache.org/viewcvs?rev=373072&view=rev
Log:
Refactor to use StringBuffer in DefaultArtifact getDependencyConflictId and toString

Modified:
    maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=373072&r1=373071&r2=373072&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Fri Jan 27 18:37:33 2006
@@ -224,8 +224,23 @@
 
     public String getDependencyConflictId()
     {
-        return getGroupId() + ":" + getArtifactId() + ":" + getType() +
-            ( hasClassifier() ? ":" + getClassifier() : "" );
+        StringBuffer sb = new StringBuffer();
+        sb.append( getGroupId() );
+        sb.append( ":" );
+        appendArtifactTypeClassifierString( sb );
+        return sb.toString();
+    }
+
+    private void appendArtifactTypeClassifierString( StringBuffer sb )
+    {
+        sb.append( getArtifactId() );
+        sb.append( ":" );
+        sb.append( getType() );
+        if ( hasClassifier() )
+        {
+            sb.append( ":" );
+            sb.append( getClassifier() );
+        }
     }
 
     public void addMetadata( ArtifactMetadata metadata )
@@ -257,9 +272,22 @@
 
     public String toString()
     {
-        return getDependencyConflictId() + ":" +
-            ( version != null || baseVersion != null ? getBaseVersion() : versionRange.toString() ) + 
-            ":" + scope;
+        StringBuffer sb = new StringBuffer();
+        sb.append( getGroupId() );
+        sb.append( ":" );
+        appendArtifactTypeClassifierString( sb );
+        sb.append( ":" );
+        if ( version != null || baseVersion != null )
+        {
+            sb.append( getBaseVersion() );
+        }
+        else
+        {
+            sb.append( versionRange.toString() );
+        }
+        sb.append( ":" );
+        sb.append( scope );
+        return sb.toString();
     }
 
     public int hashCode()