cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact DefaultArtifact.java

[jdcasey]

jdcasey     2005/03/21 00:45:44

  Modified:    maven-artifact/src/main/java/org/apache/maven/artifact
                        DefaultArtifact.java
  Log:
  o Correcting violation to the conflictId: this shouldn't include $classifier, 
according to the documentation on the repository layout.
  
  Revision  Changes    Path
  1.13      +3 -4      
maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
  
  Index: DefaultArtifact.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultArtifact.java      21 Mar 2005 08:18:33 -0000      1.12
  +++ DefaultArtifact.java      21 Mar 2005 08:45:44 -0000      1.13
  @@ -169,13 +169,12 @@
   
       public String getId()
       {
  -        return getConflictId() + ":" + getVersion();
  +        return getConflictId() + ( hasClassifier() ? ( ":" + getClassifier() 
) : "" ) + ":" + getVersion();
       }
   
       public String getConflictId()
       {
  -        return getGroupId() + ":" + getArtifactId() + ":" + getType()
  -            + ( hasClassifier() ? ( ":" + getClassifier() ) : "" );
  +        return getGroupId() + ":" + getArtifactId() + ":" + getType();
       }
   
       // ----------------------------------------------------------------------