From b7d3437c2aeb649ffcc8700396bb0300b6e01927 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 12 May 2012 19:17:00 +0000 Subject: [PATCH] use generics git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1337613 13f79535-47bb-0310-9956-ffa450edef68 --- .../generator/PluginDescriptorGenerator.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java index 1d3e1af..cffba67 100644 --- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java +++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java @@ -45,7 +45,6 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -173,10 +172,10 @@ public class PluginDescriptorGenerator if ( pluginDescriptor.getMojos() != null ) { - for ( @SuppressWarnings( "unchecked" ) Iterator it = - pluginDescriptor.getMojos().iterator(); it.hasNext(); ) + @SuppressWarnings( "unchecked" ) + List descriptors = pluginDescriptor.getMojos(); + for ( MojoDescriptor descriptor : descriptors ) { - MojoDescriptor descriptor = it.next(); processMojoDescriptor( descriptor, w, cleanDescription ); } } @@ -281,18 +280,18 @@ public class PluginDescriptorGenerator */ private static String discoverPackageName( PluginDescriptor pluginDescriptor ) { - Map packageNames = new HashMap(); - for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); ) + Map packageNames = new HashMap(); + @SuppressWarnings( "unchecked" ) + List descriptors = pluginDescriptor.getMojos(); + for ( MojoDescriptor descriptor : descriptors ) { - MojoDescriptor descriptor = (MojoDescriptor) it.next(); - String impl = descriptor.getImplementation(); if ( impl.lastIndexOf( '.' ) != -1 ) { String name = impl.substring( 0, impl.lastIndexOf( '.' ) ); 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 ) ); } else @@ -308,10 +307,10 @@ public class PluginDescriptorGenerator String packageName = ""; int max = 0; - for ( Iterator it = packageNames.keySet().iterator(); it.hasNext(); ) + for ( Map.Entry entry : packageNames.entrySet() ) { - String key = it.next().toString(); - int value = ( (Integer) packageNames.get( key ) ).intValue(); + String key = entry.getKey(); + int value = entry.getValue().intValue(); if ( value > max ) { max = value;