Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MNG-2923/2929: Correct a version range restriction problem caused by work on MNG-1577 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543765 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2007-06-02 17:31:13 +00:00
parent 885409f569
commit eb9054adfd
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
View File

@ -221,6 +221,33 @@ public class VersionRange
return new VersionRange( new DefaultArtifactVersion( version ), Collections.EMPTY_LIST );
}
/**
* Creates and returns a new <code>VersionRange</code> that is a restriction of this
* version range and the specified version range.
* <p>
* Note: Precedence is given to the recommended version from this version range over the
* recommended version from the specified version range.
* </p>
* @param restriction the <code>VersionRange</code> that will be used to restrict this version
* range.
* @return the <code>VersionRange</code> that is a restriction of this version range and the
* specified version range.
* <p>
* The restrictions of the returned version range will be an intersection of the restrictions
* of this version range and the specified version range if both version ranges have
* restrictions. Otherwise, the restrictions on the returned range will be empty.
* </p>
* <p>
* The recommended version of the returned version range will be the recommended version of
* this version range, provided that ranges falls within the intersected restrictions. If
* the restrictions are empty, this version range's recommended version is used if it is not
* <code>null</code>. If it is <code>null</code>, the specified version range's recommended
* version is used (provided it is non-<code>null</code>). If no recommended version can be
* obtained, the returned version range's recommended version is set to <code>null</code>.
* </p>
* @throws NullPointerException if the specified <code>VersionRange</code> is
* <code>null</code>.
*/
public VersionRange restrict( VersionRange restriction )
{
List r1 = this.restrictions;
@ -257,11 +284,18 @@ public class VersionRange
}
}
}
// Either the original or the specified version ranges have no restructions
else if ( recommendedVersion != null )
{
// no range, so the recommended version is valid
// Use the original recommended version since it exists
version = recommendedVersion;
}
else if (restriction.recommendedVersion != null)
{
// Use the recommended version from the specified VersionRange since there is no
// original recommended version
version = restriction.recommendedVersion;
}
/* TODO: should throw this immediately, but need artifact
else
{