svn commit: r726614 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven: DefaultMavenTools.java MavenTools.java

[jvanzyl]

Author: jvanzyl
Date: Sun Dec 14 19:51:38 2008
New Revision: 726614

URL: http://svn.apache.org/viewvc?rev=726614&view=rev
Log:
o starting to add generics

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java?rev=726614&r1=726613&r2=726614&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
 Sun Dec 14 19:51:38 2008
@@ -78,15 +78,13 @@
     // but just trying to collect it all in one place right now.
     // 
----------------------------------------------------------------------------
 
-    public List buildArtifactRepositories( List repositories )
+    public List<ArtifactRepository> buildArtifactRepositories( 
List<Repository> repositories )
         throws InvalidRepositoryException
     {
-        List repos = new ArrayList();
+        List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
 
-        for ( Iterator i = repositories.iterator(); i.hasNext(); )
+        for( Repository mavenRepo : repositories )
         {
-            Repository mavenRepo = (Repository) i.next();
-
             ArtifactRepository artifactRepo = buildArtifactRepository( 
mavenRepo );
 
             if ( !repos.contains( artifactRepo ) )
@@ -94,6 +92,7 @@
                 repos.add( artifactRepo );
             }
         }
+        
         return repos;
     }
 
@@ -105,8 +104,7 @@
             String id = repo.getId();
             String url = repo.getUrl();
 
-            return 
artifactRepositoryFactory.createDeploymentArtifactRepository( id, url, 
repo.getLayout(),
-                                                                               
  repo.isUniqueVersion() );
+            return 
artifactRepositoryFactory.createDeploymentArtifactRepository( id, url, 
repo.getLayout(), repo.isUniqueVersion() );
         }
         else
         {
@@ -207,8 +205,7 @@
         return url;
     }
 
-    public ArtifactRepository createRepository( String url,
-                                                String repositoryId )
+    public ArtifactRepository createRepository( String url, String 
repositoryId )
     {
         // snapshots vs releases
         // offline = to turning the update policy off
@@ -291,7 +288,7 @@
         }
     }
 
-    public List buildArtifactRepositories( Model model )
+    public List<ArtifactRepository> buildArtifactRepositories( Model model )
         throws ProjectBuildingException
     {
         try

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java?rev=726614&r1=726613&r2=726614&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java
 Sun Dec 14 19:51:38 2008
@@ -41,7 +41,7 @@
     // Methods taken from ProjectUtils
     // 
----------------------------------------------------------------------------
 
-    List buildArtifactRepositories( List repositories )
+    List<ArtifactRepository> buildArtifactRepositories( List<Repository> 
repositories )
         throws InvalidRepositoryException;
 
     ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository 
repo )