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/07/22 11:21:13 UTC
svn commit: r796637 - in /maven/components/trunk:
maven-compat/src/main/java/org/apache/maven/artifact/resolver/
maven-core/src/main/java/org/apache/maven/project/
Author: bentmann
Date: Wed Jul 22 09:21:11 2009
New Revision: 796637
URL: http://svn.apache.org/viewvc?rev=796637&view=rev
Log:
o Generified code
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java?rev=796637&r1=796636&r2=796637&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java Wed Jul 22 09:21:11 2009
@@ -63,7 +63,7 @@
String type,
String classifier,
List<ArtifactRepository> remoteRepositories,
- List path )
+ List<String> path )
{
this( message, groupId, artifactId, version, type, classifier, remoteRepositories, path, null );
}
@@ -75,7 +75,7 @@
String type,
String classifier,
List<ArtifactRepository> remoteRepositories,
- List path,
+ List<String> path,
Throwable t )
{
super( constructMessageBase( message, groupId, artifactId, version, type, remoteRepositories, path ), t );
@@ -150,7 +150,7 @@
return this.path;
}
- public List getRemoteRepositories()
+ public List<ArtifactRepository> getRemoteRepositories()
{
return remoteRepositories;
}
@@ -160,7 +160,7 @@
return originalMessage;
}
- protected static String constructArtifactPath( List path,
+ protected static String constructArtifactPath( List<String> path,
String indentation )
{
StringBuilder sb = new StringBuilder();
@@ -172,7 +172,7 @@
sb.append( "Path to dependency: " );
sb.append( LS );
int num = 1;
- for ( Iterator i = path.iterator(); i.hasNext(); num++ )
+ for ( Iterator<String> i = path.iterator(); i.hasNext(); num++ )
{
sb.append( indentation );
sb.append( "\t" );
@@ -191,8 +191,8 @@
String artifactId,
String version,
String type,
- List remoteRepositories,
- List path )
+ List<ArtifactRepository> remoteRepositories,
+ List<String> path )
{
StringBuilder sb = new StringBuilder();
@@ -206,9 +206,9 @@
sb.append( "from the specified remote repositories:" );
sb.append( LS + " " );
- for ( Iterator i = new HashSet( remoteRepositories ).iterator(); i.hasNext(); )
+ for ( Iterator<ArtifactRepository> i = new HashSet<ArtifactRepository>( remoteRepositories ).iterator(); i.hasNext(); )
{
- ArtifactRepository remoteRepository = (ArtifactRepository) i.next();
+ ArtifactRepository remoteRepository = i.next();
sb.append( remoteRepository.getId() );
sb.append( " (" );
@@ -247,7 +247,7 @@
String type,
String classifier,
String downloadUrl,
- List path )
+ List<String> path )
{
StringBuilder sb = new StringBuilder( message );
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java?rev=796637&r1=796636&r2=796637&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java Wed Jul 22 09:21:11 2009
@@ -47,7 +47,7 @@
}
public ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type, String classifier, List<ArtifactRepository> remoteRepositories,
- String downloadUrl, List path, ResourceDoesNotExistException cause )
+ String downloadUrl, List<String> path, ResourceDoesNotExistException cause )
{
super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier, downloadUrl, path ), groupId, artifactId, version, type, classifier, remoteRepositories,
null, cause );
@@ -56,7 +56,7 @@
}
private ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type, String classifier, List<ArtifactRepository> remoteRepositories,
- String downloadUrl, List path )
+ String downloadUrl, List<String> path )
{
super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier, downloadUrl, path ), groupId, artifactId, version, type, classifier, remoteRepositories,
null );
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=796637&r1=796636&r2=796637&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java Wed Jul 22 09:21:11 2009
@@ -31,8 +31,9 @@
public class ArtifactResolutionException
extends AbstractArtifactResolutionException
{
- public ArtifactResolutionException( String message, String groupId, String artifactId, String version, String type, String classifier, List<ArtifactRepository> remoteRepositories, List path,
- Throwable t )
+ public ArtifactResolutionException( String message, String groupId, String artifactId, String version, String type,
+ String classifier, List<ArtifactRepository> remoteRepositories,
+ List<String> path, Throwable t )
{
super( message, groupId, artifactId, version, type, classifier, remoteRepositories, path, t );
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java?rev=796637&r1=796636&r2=796637&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java Wed Jul 22 09:21:11 2009
@@ -59,7 +59,7 @@
{
throw new IllegalArgumentException( "project building request missing" );
}
- this.projectBuildingRequest = projectBuildingRequest;
+ this.projectBuildingRequest = projectBuildingRequest;
this.remoteRepositories = projectBuildingRequest.getRemoteRepositories();
this.pluginRepositories = projectBuildingRequest.getPluginArtifactRepositories();
}