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:04:24 UTC
svn commit: r620327 - in
/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning:
Restriction.java VersionRange.java
Author: carlos
Date: Sun Feb 10 13:04:22 2008
New Revision: 620327
URL: http://svn.apache.org/viewvc?rev=620327&view=rev
Log:
Add toString method to Restriction, and small optimization
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java?rev=620327&r1=620326&r2=620327&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java Sun Feb 10 13:04:22 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
@@ -176,5 +177,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/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java?rev=620327&r1=620326&r2=620327&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java Sun Feb 10 13:04:22 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.
*
@@ -508,17 +508,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() )
{
@@ -551,16 +541,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()