svn commit: r819726 - in /maven/maven-3/trunk: maven-compat/src/main/java/org/apache/maven/artifact/versioning/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/java/org/apache/m...

[ol...@apache.org]

Author: olamy
Date: Mon Sep 28 20:43:23 2009
New Revision: 819726

URL: http://svn.apache.org/viewvc?rev=819726&view=rev
Log:
add generics.
remove unused imports.

Modified:
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java?rev=819726&r1=819725&r2=819726&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java Mon Sep 28 20:43:23 2009
@@ -23,10 +23,12 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.maven.artifact.Artifact;
+
 public class ManagedVersionMap
-    extends HashMap
+    extends HashMap<String, Artifact>
 {
-    public ManagedVersionMap( Map map )
+    public ManagedVersionMap( Map<String, Artifact> map )
     {
         super();
         if ( map != null )
@@ -38,10 +40,10 @@
     public String toString()
     {
         StringBuilder buffer = new StringBuilder( "ManagedVersionMap (" + size() + " entries)\n" );
-        Iterator iter = keySet().iterator();
+        Iterator<String> iter = keySet().iterator();
         while ( iter.hasNext() )
         {
-            String key = (String) iter.next();
+            String key = iter.next();
             buffer.append( key ).append( "=" ).append( get( key ) );
             if ( iter.hasNext() )
             {

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=819726&r1=819725&r2=819726&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java Mon Sep 28 20:43:23 2009
@@ -64,7 +64,7 @@
         return this;
     }
 
-    public List getTopologicallySortedProjects()
+    public List<MavenProject> getTopologicallySortedProjects()
     {
         return topologicallySortedProjects;
     }

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java?rev=819726&r1=819725&r2=819726&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java Mon Sep 28 20:43:23 2009
@@ -17,11 +17,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
 
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.RepositoryRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.execution.MavenSession;

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java?rev=819726&r1=819725&r2=819726&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/settings/validation/SettingsValidationResult.java Mon Sep 28 20:43:23 2009
@@ -31,14 +31,14 @@
 {
     private final static String NEWLINE = System.getProperty( "line.separator" );
 
-    private List messages;
+    private List<String> messages;
 
     /**
      * Default constructor
      */
     public SettingsValidationResult()
     {
-        messages = new ArrayList();
+        messages = new ArrayList<String>();
     }
 
     /**
@@ -61,7 +61,7 @@
     /**
      * @return
      */
-    public List getMessages()
+    public List<String> getMessages()
     {
         return Collections.unmodifiableList( messages );
     }