Author: hboutemy
Date: Sat Oct 29 02:13:19 2011
New Revision: 1190734
URL: http://svn.apache.org/viewvc?rev=1190734&view=rev
Log:
added missing Java 5 generics
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java?rev=1190734&r1=1190733&r2=1190734&view=diff
==============================================================================
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
Sat Oct 29 02:13:19 2011
@@ -21,7 +21,6 @@ package org.apache.maven.ant.tasks;
import java.io.File;
import java.util.LinkedHashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.maven.ant.tasks.support.SpecificScopesArtifactFilter;
@@ -97,17 +96,16 @@ public class DependencyFilesetsTask
MavenProject mavenProject = (MavenProject)
this.getProject().getReference( "maven.project" );
// Add filesets for depenedency artifacts
- Set depArtifacts = filterArtifacts( mavenProject.getArtifacts() );
+ @SuppressWarnings( "unchecked" )
+ Set<Artifact> depArtifacts = filterArtifacts(
mavenProject.getArtifacts() );
FileSet dependenciesFileSet = new FileSet();
dependenciesFileSet.setProject( getProject() );
ArtifactRepository localRepository = (ArtifactRepository)
getProject().getReference( "maven.local.repository" );
dependenciesFileSet.setDir( new File( localRepository.getBasedir() ) );
- for ( Iterator it = depArtifacts.iterator(); it.hasNext(); )
+ for ( Artifact artifact : depArtifacts )
{
- Artifact artifact = (Artifact) it.next();
-
String relativeArtifactPath = localRepository.pathOf( artifact );
dependenciesFileSet.createInclude().setName( relativeArtifactPath
);
@@ -175,7 +173,7 @@ public class DependencyFilesetsTask
* @param artifacts
* @return
*/
- public Set filterArtifacts( Set artifacts )
+ public Set<Artifact> filterArtifacts( Set<Artifact> artifacts )
{
if ( scopes == null )
{
@@ -201,10 +199,9 @@ public class DependencyFilesetsTask
filter.add( new TypesArtifactFilter( getTypes() ) );
}
- Set artifactsResult = new LinkedHashSet();
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+ Set<Artifact> artifactsResult = new LinkedHashSet<Artifact>();
+ for ( Artifact artifact : artifacts )
{
- Artifact artifact = (Artifact) iter.next();
if ( filter.include( artifact ) )
{
artifactsResult.add( artifact );
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java?rev=1190734&r1=1190733&r2=1190734&view=diff
==============================================================================
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java
Sat Oct 29 02:13:19 2011
@@ -32,7 +32,7 @@ import java.util.List;
public class TypesArtifactFilter
implements ArtifactFilter
{
- private List types = new ArrayList();
+ private List<String> types = new ArrayList<String>();
/**
* Accepts a comma separated list of types
@@ -43,10 +43,9 @@ public class TypesArtifactFilter
{
if ( !types.trim().equals( "" ) )
{
- String[] typesArray = types.split( "," );
- for ( int i = 0; i < typesArray.length; ++i )
+ for ( String type : types.split( "," ) )
{
- this.types.add( typesArray[i].trim() );
+ this.types.add( type.trim() );
}
}
}
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java?rev=1190734&r1=1190733&r2=1190734&view=diff
==============================================================================
---
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
(original)
+++
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
Sat Oct 29 02:13:19 2011
@@ -22,7 +22,6 @@ package org.apache.maven.ant.tasks.suppo
import java.io.File;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
import org.apache.tools.ant.util.FileNameMapper;
@@ -35,18 +34,17 @@ import org.codehaus.plexus.util.StringUt
* @version $Id$
*/
public class VersionMapper
- implements FileNameMapper, Comparator
+ implements FileNameMapper, Comparator<String>
{
- private List versions;
+ private List<String> versions;
private String to;
public String[] mapFileName( String sourceFileName )
{
String originalFileName = new File( sourceFileName ).getName();
- for ( Iterator iter = versions.iterator(); iter.hasNext(); )
+ for ( String version : versions )
{
- String version = (String) iter.next();
int index = originalFileName.indexOf( version );
if ( index >= 0 )
{
@@ -84,10 +82,8 @@ public class VersionMapper
this.to = to;
}
- public int compare( Object o1, Object o2 )
+ public int compare( String s1, String s2 )
{
- String s1 = (String) o1;
- String s2 = (String) o2;
int lengthDiff = s2.length() - s1.length();
return ( lengthDiff != 0 ) ? lengthDiff : s1.compareTo( s2 );
}
