You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/08/30 15:21:38 UTC

svn commit: r809332 - in /maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven: ProjectDependenciesResolver.java shared/artifact/resolver/DefaultProjectDependenciesResolver.java

Author: bentmann
Date: Sun Aug 30 13:21:38 2009
New Revision: 809332

URL: http://svn.apache.org/viewvc?rev=809332&view=rev
Log:
o Fixed generics to account for potential subclassing

Modified:
    maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
    maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java

Modified: maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/ProjectDependenciesResolver.java?rev=809332&r1=809331&r2=809332&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/ProjectDependenciesResolver.java (original)
+++ maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/ProjectDependenciesResolver.java Sun Aug 30 13:21:38 2009
@@ -51,7 +51,8 @@
      * @throws ArtifactNotFoundException In cases where one or more dependency artifacts cannot be found in the
      *          various repositories.
      */
-    public Set<Artifact> resolve( Collection<MavenProject> projects, Collection<String> scopes, MavenSession session )
+    public Set<Artifact> resolve( Collection<? extends MavenProject> projects, Collection<String> scopes,
+                                  MavenSession session )
         throws ArtifactResolutionException, ArtifactNotFoundException;
 
     /**

Modified: maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java?rev=809332&r1=809331&r2=809332&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java (original)
+++ maven/shared/trunk/maven-artifact-resolver/src/main/java/org/apache/maven/shared/artifact/resolver/DefaultProjectDependenciesResolver.java Sun Aug 30 13:21:38 2009
@@ -84,7 +84,8 @@
      * {@inheritDoc}
      */
     @SuppressWarnings( "unchecked" )
-    public Set<Artifact> resolve( final Collection<MavenProject> projects, final Collection<String> scopes, final MavenSession session )
+    public Set<Artifact> resolve( final Collection<? extends MavenProject> projects, final Collection<String> scopes,
+                                  final MavenSession session )
         throws ArtifactResolutionException, ArtifactNotFoundException
     {
         Set<Artifact> resolved = new LinkedHashSet<Artifact>();
@@ -186,7 +187,7 @@
         return resolve( projects, scopes, session );
     }
 
-    private Set<String> getProjectIds( final Collection<MavenProject> projects )
+    private Set<String> getProjectIds( final Collection<? extends MavenProject> projects )
     {
         Set<String> ids = new HashSet<String>();
         if ( projects != null && !projects.isEmpty() )