You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/06/30 15:27:37 UTC
svn commit: r1498116 - in
/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war:
AbstractWarMojo.java Overlay.java packaging/AbstractWarPackagingTask.java
packaging/WarProjectPackagingTask.java util/PathSet.java
Author: olamy
Date: Sun Jun 30 13:27:36 2013
New Revision: 1498116
URL: http://svn.apache.org/r1498116
Log:
more generics
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=1498116&r1=1498115&r2=1498116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Sun Jun 30 13:27:36 2013
@@ -503,7 +503,7 @@ public abstract class AbstractWarMojo
// Post packaging
final List<WarPostPackagingTask> postPackagingTasks = getPostPackagingTasks();
- for( WarPostPackagingTask task : postPackagingTasks )
+ for ( WarPostPackagingTask task : postPackagingTasks )
{
task.performPostPackaging( context );
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java?rev=1498116&r1=1498115&r2=1498116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java Sun Jun 30 13:27:36 2013
@@ -283,17 +283,16 @@ public class Overlay
final List<String> result = new ArrayList<String>();
if ( s == null )
{
- return (String[]) result.toArray( new String[result.size()] );
+ return result.toArray( new String[result.size()] );
}
else
{
String[] tokens = s.split( "," );
- for ( int i = 0; i < tokens.length; i++ )
+ for ( String token : tokens )
{
- String token = tokens[i];
result.add( token.trim() );
}
- return (String[]) result.toArray( new String[result.size()] );
+ return result.toArray( new String[result.size()] );
}
}
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=1498116&r1=1498115&r2=1498116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Sun Jun 30 13:27:36 2013
@@ -80,9 +80,8 @@ public abstract class AbstractWarPackagi
String targetPrefix, boolean filtered )
throws IOException, MojoExecutionException
{
- for ( Iterator iter = sourceFilesSet.iterator(); iter.hasNext(); )
+ for ( String fileToCopyName : sourceFilesSet.paths() )
{
- final String fileToCopyName = (String) iter.next();
final File sourceFile = new File( sourceBaseDir, fileToCopyName );
String destinationFileName;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=1498116&r1=1498115&r2=1498116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Sun Jun 30 13:27:36 2013
@@ -117,9 +117,8 @@ public class WarProjectPackagingTask
protected void handleWebResources( WarPackagingContext context )
throws MojoExecutionException
{
- for ( int i = 0; i < webResources.length; i++ )
+ for ( Resource resource : webResources )
{
- Resource resource = webResources[i];
// MWAR-246
if ( resource.getDirectory() == null )
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java?rev=1498116&r1=1498115&r2=1498116&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/PathSet.java Sun Jun 30 13:27:36 2013
@@ -46,7 +46,7 @@ public class PathSet
/**
* Set of normalized paths
*/
- private Set/* <String> */pathsSet = new LinkedHashSet();
+ private Set<String> pathsSet = new LinkedHashSet<String>();
/**
* The method normalizes the path.
@@ -80,7 +80,7 @@ public class PathSet
*
* @param paths to be added
*/
- public PathSet( Collection/*String>*/ paths )
+ public PathSet( Collection<String> paths )
{
addAll( paths );
}
@@ -113,11 +113,11 @@ public class PathSet
* @param paths - collection of strings to be added
* @param prefix added to all given paths
*/
- public void addAll( Collection/*<String>*/ paths, String prefix )
+ public void addAll( Collection<String> paths, String prefix )
{
- for ( Iterator iter = paths.iterator(); iter.hasNext(); )
+ for ( String val : paths )
{
- add( prefix + iter.next() );
+ add( prefix + val );
}
}
@@ -130,9 +130,9 @@ public class PathSet
*/
public void addAll( String[] paths, String prefix )
{
- for ( int i = 0; i < paths.length; i++ )
+ for ( String val : paths )
{
- add( prefix + paths[i] );
+ add( prefix + val );
}
}
@@ -157,7 +157,7 @@ public class PathSet
*
* @param paths - collection of strings to be added
*/
- public void addAll( Collection/*<String>*/ paths )
+ public void addAll( Collection<String> paths )
{
addAll( paths, "" );
}
@@ -214,11 +214,16 @@ public class PathSet
*
* @return iterator of normalized paths (strings)
*/
- public Iterator iterator()
+ public Iterator<String> iterator()
{
return pathsSet.iterator();
}
+ public Collection<String> paths()
+ {
+ return pathsSet;
+ }
+
/**
* Adds given prefix to all paths in the set.
* <p/>
@@ -228,10 +233,9 @@ public class PathSet
*/
public void addPrefix( String prefix )
{
- final Set/*<String>*/ newSet = new HashSet();
- for ( Iterator iter = pathsSet.iterator(); iter.hasNext(); )
+ final Set<String> newSet = new HashSet();
+ for ( String path : pathsSet )
{
- String path = (String) iter.next();
newSet.add( normalizeFilePath( prefix + path ) );
}
pathsSet = newSet;