svn commit: r1452606 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java

[hb...@apache.org]

Author: hboutemy
Date: Tue Mar  5 00:12:58 2013
New Revision: 1452606

URL: http://svn.apache.org/r1452606
Log:
Java 5 for loop construct

Modified:
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java?rev=1452606&r1=1452605&r2=1452606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java Tue Mar  5 00:12:58 2013
@@ -65,7 +65,7 @@ public class MinijarFilter
      *
      * @since 1.6
      */
-    @SuppressWarnings( { "unchecked", "rawtypes" } )
+    @SuppressWarnings( { "unchecked" } )
     public MinijarFilter( MavenProject project, Log log, List<SimpleFilter> simpleFilters )
         throws IOException
     {
@@ -148,20 +148,17 @@ public class MinijarFilter
         }
     }
 
-    @SuppressWarnings( "rawtypes" )
     private void removeSpecificallyIncludedClasses( MavenProject project, List<SimpleFilter> simpleFilters )
         throws IOException
     {
         //remove classes specifically included in filters
         Clazzpath checkCp = new Clazzpath();
-        for ( Iterator it = project.getArtifacts().iterator(); it.hasNext(); )
+        for ( Artifact dependency : project.getArtifacts() )
         {
-            Artifact dependency = (Artifact) it.next();
             File jar = dependency.getFile();
 
-            for ( Iterator<SimpleFilter> i = simpleFilters.iterator(); i.hasNext(); )
+            for ( SimpleFilter simpleFilter : simpleFilters )
             {
-                SimpleFilter simpleFilter = i.next();
                 if ( simpleFilter.canFilter( jar ) )
                 {
                     ClazzpathUnit depClazzpathUnit = addDependencyToClasspath( checkCp, dependency );
@@ -172,8 +169,8 @@ public class MinijarFilter
                         {
                             Clazz clazz = j.next();
 
-                            if ( depClazzpathUnit.getClazzes().contains( clazz ) && simpleFilter.isSpecificallyIncluded(
-                                clazz.getName().replace( '.', '/' ) ) )
+                            if ( depClazzpathUnit.getClazzes().contains( clazz )
+                                && simpleFilter.isSpecificallyIncluded( clazz.getName().replace( '.', '/' ) ) )
                             {
                                 log.info( clazz.getName() + " not removed because it was specifically included" );
                                 j.remove();