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

[MNG-4912] Use of raw type should be Comparable<ArtifactVersion> 

Submitted by: Jesse Glick

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1039332 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-11-26 12:37:37 +00:00
parent 990f4519fe
commit a78ef2d826
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
View File

@ -27,7 +27,7 @@ package org.apache.maven.artifact.versioning;
* @version $Id$ * @version $Id$
*/ */
public interface ArtifactVersion public interface ArtifactVersion
extends Comparable extends Comparable<ArtifactVersion>
{ {
int getMajorVersion(); int getMajorVersion();

14
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
View File

@ -66,13 +66,19 @@ public class DefaultArtifactVersion
return false; return false;
} }
return compareTo( other ) == 0; return compareTo( (ArtifactVersion) other ) == 0;
} }
public int compareTo( Object o ) public int compareTo( ArtifactVersion otherVersion )
{ {
DefaultArtifactVersion otherVersion = (DefaultArtifactVersion) o; if ( otherVersion instanceof DefaultArtifactVersion )
return this.comparable.compareTo( otherVersion.comparable ); {
return this.comparable.compareTo( ( (DefaultArtifactVersion) otherVersion).comparable );
}
else
{
return compareTo( new DefaultArtifactVersion( otherVersion.toString() ) );
}
} }
public int getMajorVersion() public int getMajorVersion()

2
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java
View File

@ -30,7 +30,7 @@ import org.codehaus.plexus.component.annotations.Component;
* *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a> * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$ * @version $Id$
* @see ArtifactVersion#compareTo(Object) * @see ArtifactVersion#compareTo
* @since 3.0 * @since 3.0
*/ */
@Component( role = ConflictResolver.class, hint = "newest" ) @Component( role = ConflictResolver.class, hint = "newest" )

2
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java
View File

@ -30,7 +30,7 @@ import org.codehaus.plexus.component.annotations.Component;
* *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a> * @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$ * @version $Id$
* @see ArtifactVersion#compareTo(Object) * @see ArtifactVersion#compareTo
* @since 3.0 * @since 3.0
*/ */
@Component( role = ConflictResolver.class, hint = "oldest" ) @Component( role = ConflictResolver.class, hint = "oldest" )