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 2006/01/28 03:39:20 UTC
svn commit: r373073 - in /maven/components/trunk/maven-artifact/src:
main/java/org/apache/maven/artifact/DefaultArtifact.java
test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Author: carlos
Date: Fri Jan 27 18:39:17 2006
New Revision: 373073
URL: http://svn.apache.org/viewcvs?rev=373073&view=rev
Log:
Don't print null values in DefaultArtifact.toString
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.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=373073&r1=373072&r2=373073&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:39:17 2006
@@ -273,8 +273,11 @@
public String toString()
{
StringBuffer sb = new StringBuffer();
- sb.append( getGroupId() );
- sb.append( ":" );
+ if ( getGroupId() != null )
+ {
+ sb.append( getGroupId() );
+ sb.append( ":" );
+ }
appendArtifactTypeClassifierString( sb );
sb.append( ":" );
if ( version != null || baseVersion != null )
@@ -285,8 +288,11 @@
{
sb.append( versionRange.toString() );
}
- sb.append( ":" );
- sb.append( scope );
+ if ( scope != null )
+ {
+ sb.append( ":" );
+ sb.append( scope );
+ }
return sb.toString();
}
Modified: maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java?rev=373073&r1=373072&r2=373073&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (original)
+++ maven/components/trunk/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java Fri Jan 27 18:39:17 2006
@@ -75,22 +75,19 @@
public void testToStringNullGroupId()
{
artifact.setGroupId( null );
- assertEquals( null + ":" + artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope, artifact
- .toString() );
+ assertEquals( artifactId + ":" + type + ":" + classifier + ":" + version + ":" + scope, artifact.toString() );
}
public void testToStringNullClassifier()
{
artifact = new DefaultArtifact( groupId, artifactId, versionRange, scope, type, null, artifactHandler );
- assertEquals( groupId + ":" + artifactId + ":" + type + ":" + version + ":" + scope, artifact
- .toString() );
+ assertEquals( groupId + ":" + artifactId + ":" + type + ":" + version + ":" + scope, artifact.toString() );
}
public void testToStringNullScope()
{
artifact.setScope( null );
- assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version + ":" + null, artifact
- .toString() );
+ assertEquals( groupId + ":" + artifactId + ":" + type + ":" + classifier + ":" + version, artifact.toString() );
}
}