You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/08/15 16:52:00 UTC

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

Author: jdcasey
Date: Wed Aug 15 07:51:59 2007
New Revision: 566205

URL: http://svn.apache.org/viewvc?view=rev&rev=566205
Log:
Changing internal setBaseVersion(..) calls to setBaseVersionInternal(..) to prevent side effects with extending implementations that disallow setting versions directly (as in maven-project).

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/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?view=diff&rev=566205&r1=566204&r2=566205
==============================================================================
--- 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 Wed Aug 15 07:51:59 2007
@@ -187,7 +187,7 @@
     public void setVersion( String version )
     {
         this.version = version;
-        this.setBaseVersion( version );
+        this.setBaseVersionInternal( version );
         this.versionRange = null;
     }
 
@@ -361,13 +361,18 @@
             {
                 throw new NullPointerException( "version was null for " + groupId + ":" + artifactId );
             }
-            setBaseVersion( version );
+            setBaseVersionInternal( version );
         }
         return baseVersion;
     }
 
     public void setBaseVersion( String baseVersion )
     {
+        setBaseVersionInternal( baseVersion );
+    }
+    
+    protected void setBaseVersionInternal( String baseVersion )
+    {
         Matcher m = VERSION_FILE_PATTERN.matcher( baseVersion );
         if ( m.matches() )
         {
@@ -495,7 +500,7 @@
     public void selectVersion( String version )
     {
         this.version = version;
-        setBaseVersion( version );
+        setBaseVersionInternal( version );
     }
 
     public void setGroupId( String groupId )