svn commit: r1384332 [1/3] - in /maven/plugins/trunk: maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/ maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/

[ol...@apache.org]

Author: olamy
Date: Thu Sep 13 13:48:42 2012
New Revision: 1384332

URL: http://svn.apache.org/viewvc?rev=1384332&view=rev
Log:
use entrySet() to iterate on Map content

Modified:
    maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java

Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java?rev=1384332&r1=1384331&r2=1384332&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java Thu Sep 13 13:48:42 2012
@@ -56,7 +56,7 @@ public class ExpressionsMojo
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        Map m;
+        Map<String,Expression> m;
         try
         {
             m = ExpressionDocumenter.load();
@@ -77,10 +77,10 @@ public class ExpressionsMojo
             sb.append( "\n\n" );
         }
 
-        for ( Iterator it = m.keySet().iterator(); it.hasNext(); )
+        for ( Map.Entry<String,Expression> entry : m.entrySet() )
         {
-            String key = (String) it.next();
-            Expression expression = (Expression) m.get( key );
+            String key = entry.getKey();
+            Expression expression = entry.getValue();
 
             sb.append( "${" ).append( key ).append( "}: " );
             sb.append( trimCDATA( expression.getDescription() ) );