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

code simplification 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1592004 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2014-05-02 18:39:11 +00:00
parent a6eab7460b
commit 10d0a99bec
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
View File

@ -255,9 +255,8 @@ public class DefaultMojoAnnotationsScanner
try try
{ {
// @Mojo annotations // @Mojo annotation
MojoAnnotationVisitor mojoAnnotationVisitor = MojoAnnotationVisitor mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitor( Mojo.class );
mojoClassVisitor.getAnnotationVisitorMap().get( Mojo.class.getName() );
if ( mojoAnnotationVisitor != null ) if ( mojoAnnotationVisitor != null )
{ {
MojoAnnotationContent mojoAnnotationContent = new MojoAnnotationContent(); MojoAnnotationContent mojoAnnotationContent = new MojoAnnotationContent();
@ -265,8 +264,8 @@ public class DefaultMojoAnnotationsScanner
mojoAnnotatedClass.setMojo( mojoAnnotationContent ); mojoAnnotatedClass.setMojo( mojoAnnotationContent );
} }
// @Execute annotations // @Execute annotation
mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitorMap().get( Execute.class.getName() ); mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitor( Execute.class );
if ( mojoAnnotationVisitor != null ) if ( mojoAnnotationVisitor != null )
{ {
ExecuteAnnotationContent executeAnnotationContent = new ExecuteAnnotationContent(); ExecuteAnnotationContent executeAnnotationContent = new ExecuteAnnotationContent();
@ -275,8 +274,7 @@ public class DefaultMojoAnnotationsScanner
} }
// @Parameter annotations // @Parameter annotations
List<MojoFieldVisitor> mojoFieldVisitors = List<MojoFieldVisitor> mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotation( Parameter.class );
mojoClassVisitor.findFieldWithAnnotationClass( Parameter.class.getName() );
for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors ) for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors )
{ {
ParameterAnnotationContent parameterAnnotationContent = ParameterAnnotationContent parameterAnnotationContent =
@ -290,7 +288,7 @@ public class DefaultMojoAnnotationsScanner
} }
// @Component annotations // @Component annotations
mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotationClass( Component.class.getName() ); mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotation( Component.class );
for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors ) for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors )
{ {
ComponentAnnotationContent componentAnnotationContent = ComponentAnnotationContent componentAnnotationContent =

9
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
View File

@ -72,6 +72,11 @@ public class MojoClassVisitor
return annotationVisitorMap; return annotationVisitorMap;
} }
public MojoAnnotationVisitor getAnnotationVisitor( Class<?> annotation )
{
return annotationVisitorMap.get( annotation.getName() );
}
public void setAnnotationVisitorMap( Map<String, MojoAnnotationVisitor> annotationVisitorMap ) public void setAnnotationVisitorMap( Map<String, MojoAnnotationVisitor> annotationVisitorMap )
{ {
this.annotationVisitorMap = annotationVisitorMap; this.annotationVisitorMap = annotationVisitorMap;
@ -87,8 +92,10 @@ public class MojoClassVisitor
this.fieldVisitors = fieldVisitors; this.fieldVisitors = fieldVisitors;
} }
public List<MojoFieldVisitor> findFieldWithAnnotationClass( String annotationClassName ) public List<MojoFieldVisitor> findFieldWithAnnotation( Class<?> annotation )
{ {
String annotationClassName = annotation.getName();
List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<MojoFieldVisitor>(); List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<MojoFieldVisitor>();
for ( MojoFieldVisitor mojoFieldVisitor : this.fieldVisitors ) for ( MojoFieldVisitor mojoFieldVisitor : this.fieldVisitors )