You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2009/09/26 19:08:25 UTC
svn commit: r819177 - in /maven/maven-3/trunk/maven-compat/src:
main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
Author: hboutemy
Date: Sat Sep 26 17:08:24 2009
New Revision: 819177
URL: http://svn.apache.org/viewvc?rev=819177&view=rev
Log:
generified code
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java?rev=819177&r1=819176&r2=819177&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java Sat Sep 26 17:08:24 2009
@@ -53,11 +53,11 @@
*
* @see <a href="http://docs.codehaus.org/display/MAVEN/Versioning">"Versioning" on Maven Wiki</a>
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- * @author <a href="mailto:hboutemy@apache.org">Herve Boutemy</a>
+ * @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
* @version $Id$
*/
public class ComparableVersion
- implements Comparable
+ implements Comparable<ComparableVersion>
{
private String value;
@@ -147,7 +147,7 @@
{
private final static String[] QUALIFIERS = { "snapshot", "alpha", "beta", "milestone", "rc", "", "sp" };
- private final static List _QUALIFIERS = Arrays.asList( QUALIFIERS );
+ private final static List<String> _QUALIFIERS = Arrays.asList( QUALIFIERS );
private final static Properties ALIASES = new Properties();
static {
@@ -156,10 +156,10 @@
ALIASES.put( "cr", "rc" );
}
/**
- * A comparable for the empty-string qualifier. This one is used to determine if a given qualifier makes the
+ * A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes the
* version older than one without a qualifier, or more recent.
*/
- private static Comparable RELEASE_VERSION_INDEX = String.valueOf( _QUALIFIERS.indexOf( "" ) );
+ private static String RELEASE_VERSION_INDEX = String.valueOf( _QUALIFIERS.indexOf( "" ) );
private String value;
@@ -195,7 +195,7 @@
}
/**
- * Returns a comparable for a qualifier.
+ * Returns a comparable value for a qualifier.
*
* This method both takes into account the ordering of known qualifiers as well as lexical ordering for unknown
* qualifiers.
@@ -205,9 +205,9 @@
* so this is still fast. If more characters are needed then it requires a lexical sort anyway.
*
* @param qualifier
- * @return
+ * @return an equivalent value that can be used with lexical comparison
*/
- public static Comparable comparableQualifier( String qualifier )
+ public static String comparableQualifier( String qualifier )
{
int i = _QUALIFIERS.indexOf( qualifier );
@@ -248,7 +248,7 @@
* with '-(number)' in the version specification).
*/
private static class ListItem
- extends ArrayList
+ extends ArrayList<Item>
implements Item
{
public int getType()
@@ -263,9 +263,9 @@
void normalize()
{
- for( ListIterator iterator = listIterator( size() ); iterator.hasPrevious(); )
+ for( ListIterator<Item> iterator = listIterator( size() ); iterator.hasPrevious(); )
{
- Item item = (Item) iterator.previous();
+ Item item = iterator.previous();
if ( item.isNull() )
{
iterator.remove(); // remove null trailing items: 0, "", empty list
@@ -297,8 +297,8 @@
return 1; // 1-1 > 1-sp
case LIST_ITEM:
- Iterator left = iterator();
- Iterator right = ( (ListItem) item ).iterator();
+ Iterator<Item> left = iterator();
+ Iterator<Item> right = ( (ListItem) item ).iterator();
while ( left.hasNext() || right.hasNext() )
{
@@ -324,7 +324,7 @@
public String toString()
{
StringBuilder buffer = new StringBuilder( "(" );
- for( Iterator iter = iterator(); iter.hasNext(); )
+ for( Iterator<Item> iter = iterator(); iter.hasNext(); )
{
buffer.append( iter.next() );
if ( iter.hasNext() )
@@ -352,7 +352,7 @@
ListItem list = items;
- Stack stack = new Stack();
+ Stack<Item> stack = new Stack<Item>();
stack.push( list );
boolean isDigit = false;
@@ -442,9 +442,9 @@
return isDigit ? new IntegerItem( buf ) : new StringItem( buf, false );
}
- public int compareTo( Object o )
+ public int compareTo( ComparableVersion o )
{
- return items.compareTo( ( (ComparableVersion) o ).items );
+ return items.compareTo( o.items );
}
public String toString()
Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java?rev=819177&r1=819176&r2=819177&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java Sat Sep 26 17:08:24 2009
@@ -26,9 +26,10 @@
/**
* Test ComparableVersion.
*
- * @author <a href="mailto:hboutemy@apache.org">Herve Boutemy</a>
+ * @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
* @version $Id$
*/
+@SuppressWarnings( "unchecked" )
public class ComparableVersionTest
extends TestCase
{