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 2008/02/10 22:14:34 UTC
svn commit: r620331 - in
/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact:
ArtifactUtils.java versioning/Restriction.java versioning/VersionRange.java
Author: carlos
Date: Sun Feb 10 13:14:33 2008
New Revision: 620331
URL: http://svn.apache.org/viewvc?rev=620331&view=rev
Log:
Merge 620325-620327 from https://svn.apache.org/repos/asf/maven/artifact/trunk
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?rev=620331&r1=620330&r2=620331&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java Sun Feb 10 13:14:33 2008
@@ -39,7 +39,7 @@
public static boolean isSnapshot( String version )
{
return version != null &&
- ( version.toUpperCase().endsWith( "SNAPSHOT" ) || Artifact.VERSION_FILE_PATTERN.matcher( version )
+ ( version.toUpperCase().endsWith( Artifact.SNAPSHOT_VERSION ) || Artifact.VERSION_FILE_PATTERN.matcher( version )
.matches() );
}
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java?rev=620331&r1=620330&r2=620331&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java Sun Feb 10 13:14:33 2008
@@ -1,5 +1,6 @@
package org.apache.maven.artifact.versioning;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -93,5 +94,24 @@
}
}
return true;
+ }
+
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer();
+
+ buf.append( isLowerBoundInclusive() ? "[" : "(" );
+ if ( getLowerBound() != null )
+ {
+ buf.append( getLowerBound().toString() );
+ }
+ buf.append( "," );
+ if ( getUpperBound() != null )
+ {
+ buf.append( getUpperBound().toString() );
+ }
+ buf.append( isUpperBoundInclusive() ? "]" : ")" );
+
+ return buf.toString();
}
}
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=620331&r1=620330&r2=620331&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java Sun Feb 10 13:14:33 2008
@@ -19,13 +19,13 @@
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+
/**
* Construct a version range from a specification.
*
@@ -504,17 +504,7 @@
{
Restriction r = (Restriction) i.next();
- buf.append( r.isLowerBoundInclusive() ? "[" : "(" );
- if ( r.getLowerBound() != null )
- {
- buf.append( r.getLowerBound().toString() );
- }
- buf.append( "," );
- if ( r.getUpperBound() != null )
- {
- buf.append( r.getUpperBound().toString() );
- }
- buf.append( r.isUpperBoundInclusive() ? "]" : ")" );
+ buf.append( r.toString() );
if ( i.hasNext() )
{
@@ -547,16 +537,15 @@
public boolean containsVersion( ArtifactVersion version )
{
- boolean matched = false;
- for ( Iterator i = restrictions.iterator(); i.hasNext() && !matched; )
+ for ( Iterator i = restrictions.iterator(); i.hasNext(); )
{
Restriction restriction = (Restriction) i.next();
if ( restriction.containsVersion( version ) )
{
- matched = true;
+ return true;
}
}
- return matched;
+ return false;
}
public boolean hasRestrictions()