stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use generics 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1337613 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-05-12 19:17:00 +00:00
parent d660e7540a
commit b7d3437c2a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
View File

@ -45,7 +45,6 @@ import java.io.IOException;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Writer; import java.io.Writer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
@ -173,10 +172,10 @@ public class PluginDescriptorGenerator
if ( pluginDescriptor.getMojos() != null ) if ( pluginDescriptor.getMojos() != null )
{ {
for ( @SuppressWarnings( "unchecked" ) Iterator<MojoDescriptor> it = @SuppressWarnings( "unchecked" )
pluginDescriptor.getMojos().iterator(); it.hasNext(); ) List<MojoDescriptor> descriptors = pluginDescriptor.getMojos();
for ( MojoDescriptor descriptor : descriptors )
{ {
MojoDescriptor descriptor = it.next();
processMojoDescriptor( descriptor, w, cleanDescription ); processMojoDescriptor( descriptor, w, cleanDescription );
} }
} }
@ -281,18 +280,18 @@ public class PluginDescriptorGenerator
*/ */
private static String discoverPackageName( PluginDescriptor pluginDescriptor ) private static String discoverPackageName( PluginDescriptor pluginDescriptor )
{ {
Map packageNames = new HashMap(); Map<String, Integer> packageNames = new HashMap<String, Integer>();
for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) @SuppressWarnings( "unchecked" )
List<MojoDescriptor> descriptors = pluginDescriptor.getMojos();
for ( MojoDescriptor descriptor : descriptors )
{ {
MojoDescriptor descriptor = (MojoDescriptor) it.next();
String impl = descriptor.getImplementation(); String impl = descriptor.getImplementation();
if ( impl.lastIndexOf( '.' ) != -1 ) if ( impl.lastIndexOf( '.' ) != -1 )
{ {
String name = impl.substring( 0, impl.lastIndexOf( '.' ) ); String name = impl.substring( 0, impl.lastIndexOf( '.' ) );
if ( packageNames.get( name ) != null ) if ( packageNames.get( name ) != null )
{ {
int next = ( (Integer) packageNames.get( name ) ).intValue() + 1; int next = packageNames.get( name ).intValue() + 1;
packageNames.put( name, new Integer( next ) ); packageNames.put( name, new Integer( next ) );
} }
else else
@ -308,10 +307,10 @@ public class PluginDescriptorGenerator
String packageName = ""; String packageName = "";
int max = 0; int max = 0;
for ( Iterator it = packageNames.keySet().iterator(); it.hasNext(); ) for ( Map.Entry<String, Integer> entry : packageNames.entrySet() )
{ {
String key = it.next().toString(); String key = entry.getKey();
int value = ( (Integer) packageNames.get( key ) ).intValue(); int value = entry.getValue().intValue();
if ( value > max ) if ( value > max )
{ {
max = value; max = value;