svn commit: r1041800 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java

[bentmann]

Author: bentmann
Date: Fri Dec  3 13:22:54 2010
New Revision: 1041800

URL: http://svn.apache.org/viewvc?rev=1041800&view=rev
Log:
[MNG-4923] [regression] java.lang.ClassNotFoundException: 
org.apache.maven.artifact.ArtifactStatus

Added:
    
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
      - copied, changed from r1002734, 
maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java

Copied: 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
 (from r1002734, 
maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java)
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java?p2=maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java&p1=maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java&r1=1002734&r2=1041800&rev=1041800&view=diff
==============================================================================
--- 
maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
 (original)
+++ 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java
 Fri Dec  3 13:22:54 2010
@@ -29,7 +29,7 @@ import java.util.Map;
  * @version $Id$
  */
 public final class ArtifactStatus
-    implements Comparable
+    implements Comparable<ArtifactStatus>
 {
     /**
      * No trust - no information about status.
@@ -65,7 +65,7 @@ public final class ArtifactStatus
 
     private final String key;
 
-    private static Map map;
+    private static Map<String, ArtifactStatus> map;
 
     private ArtifactStatus( String key, int rank )
     {
@@ -74,7 +74,7 @@ public final class ArtifactStatus
 
         if ( map == null )
         {
-            map = new HashMap();
+            map = new HashMap<String, ArtifactStatus>();
         }
         map.put( key, this );
     }
@@ -85,7 +85,7 @@ public final class ArtifactStatus
 
         if ( status != null )
         {
-            retVal = (ArtifactStatus) map.get( status );
+            retVal = map.get( status );
         }
 
         return retVal != null ? retVal : NONE;
@@ -118,9 +118,8 @@ public final class ArtifactStatus
         return key;
     }
 
-    public int compareTo( Object o )
+    public int compareTo( ArtifactStatus s )
     {
-        ArtifactStatus s = (ArtifactStatus) o;
         return rank - s.rank;
     }
 }