svn commit: r1363509 - /maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java

[hboutemy]

Author: hboutemy
Date: Thu Jul 19 19:56:20 2012
New Revision: 1363509

URL: http://svn.apache.org/viewvc?rev=1363509&view=rev
Log:
code simplification

Modified:
    
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java?rev=1363509&r1=1363508&r2=1363509&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
 Thu Jul 19 19:56:20 2012
@@ -192,38 +192,39 @@ public class DefaultMojoAnnotationsScann
 
         for ( String classFile : classFiles )
         {
+            if ( !classFile.endsWith( ".class" ) )
+            {
+                continue;
+            }
+
             InputStream is = new BufferedInputStream( new FileInputStream( new 
File( classDirectory, classFile ) ) );
             try
             {
+                MojoClassVisitor mojoClassVisitor = new MojoClassVisitor( 
getLogger() );
+                ClassReader rdr = new ClassReader( is );
+                rdr.accept( mojoClassVisitor,
+                            ClassReader.SKIP_FRAMES | ClassReader.SKIP_CODE | 
ClassReader.SKIP_DEBUG );
+                analyzeVisitors( mojoClassVisitor );
 
-                if ( classFile.endsWith( ".class" ) )
+                MojoAnnotatedClass mojoAnnotatedClass = 
mojoClassVisitor.getMojoAnnotatedClass();
+
+                if ( excludeMojo )
                 {
-                    MojoClassVisitor mojoClassVisitor = new MojoClassVisitor( 
getLogger() );
-                    ClassReader rdr = new ClassReader( is );
-                    rdr.accept( mojoClassVisitor,
-                                ClassReader.SKIP_FRAMES | 
ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG );
-                    analyzeVisitors( mojoClassVisitor );
-                    if ( excludeMojo )
-                    {
-                        mojoClassVisitor.getMojoAnnotatedClass().setMojo( null 
);
-                    }
-                    if ( isStoreClass( 
mojoClassVisitor.getMojoAnnotatedClass() ) != null )
-                    {
-                        getLogger().debug(
-                            "found MojoAnnotatedClass:" + 
mojoClassVisitor.getMojoAnnotatedClass().getClassName() + ":"
-                                + mojoClassVisitor.getMojoAnnotatedClass() );
-                        mojoClassVisitor.getMojoAnnotatedClass().setArtifact( 
artifact );
-                        mojoAnnotatedClasses.put( 
mojoClassVisitor.getMojoAnnotatedClass().getClassName(),
-                                                  
mojoClassVisitor.getMojoAnnotatedClass() );
-                    }
+                    mojoAnnotatedClass.setMojo( null );
+                }
 
+                if ( isStoreClass( mojoAnnotatedClass ) != null )
+                {
+                    getLogger().debug( "found MojoAnnotatedClass:" + 
mojoAnnotatedClass.getClassName() + ":"
+                                           + mojoAnnotatedClass );
+                    mojoAnnotatedClass.setArtifact( artifact );
+                    mojoAnnotatedClasses.put( 
mojoAnnotatedClass.getClassName(), mojoAnnotatedClass );
                 }
             }
             finally
             {
                 IOUtil.close( is );
             }
-
         }
         return mojoAnnotatedClasses;
     }