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

removed unused method parameters 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1340728 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-05-20 14:10:38 +00:00
parent 8569bbeb56
commit 2bc4e52ac7
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
View File

@ -106,7 +106,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
populateDataFromJavadoc( mojoAnnotatedClasses, javaClassesMap ); populateDataFromJavadoc( mojoAnnotatedClasses, javaClassesMap );
return toMojoDescriptors( mojoAnnotatedClasses, request, javaClassesMap ); return toMojoDescriptors( mojoAnnotatedClasses, request.getPluginDescriptor() );
} }
private Map<String, MojoAnnotatedClass> scanAnnotations( PluginToolsRequest request ) private Map<String, MojoAnnotatedClass> scanAnnotations( PluginToolsRequest request )
@ -272,8 +272,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
} }
} }
Map<String, JavaField> fieldsMap = Map<String, JavaField> fieldsMap = extractFieldParameterTags( javaClass, javaClassesMap );
extractFieldParameterTags( javaClass, javaClassesMap, mojoAnnotatedClasses );
// populate parameters // populate parameters
Map<String, ParameterAnnotationContent> parameters = Map<String, ParameterAnnotationContent> parameters =
@ -362,8 +361,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
* @return map with Mojo parameters names as keys * @return map with Mojo parameters names as keys
*/ */
private Map<String, JavaField> extractFieldParameterTags( JavaClass javaClass, private Map<String, JavaField> extractFieldParameterTags( JavaClass javaClass,
Map<String, JavaClass> javaClassesMap, Map<String, JavaClass> javaClassesMap )
Map<String, MojoAnnotatedClass> mojoAnnotatedClasses )
{ {
Map<String, JavaField> rawParams = new TreeMap<String, com.thoughtworks.qdox.model.JavaField>(); Map<String, JavaField> rawParams = new TreeMap<String, com.thoughtworks.qdox.model.JavaField>();
@ -375,13 +373,13 @@ public class JavaAnnotationsMojoDescriptorExtractor
{ {
if ( superClass.getFields().length > 0 ) if ( superClass.getFields().length > 0 )
{ {
rawParams = extractFieldParameterTags( superClass, javaClassesMap, mojoAnnotatedClasses ); rawParams = extractFieldParameterTags( superClass, javaClassesMap );
} }
// maybe sources comes from scan of sources artifact // maybe sources comes from scan of sources artifact
superClass = javaClassesMap.get( superClass.getFullyQualifiedName() ); superClass = javaClassesMap.get( superClass.getFullyQualifiedName() );
if ( superClass != null ) if ( superClass != null )
{ {
rawParams = extractFieldParameterTags( superClass, javaClassesMap, mojoAnnotatedClasses ); rawParams = extractFieldParameterTags( superClass, javaClassesMap );
} }
} }
else else
@ -456,7 +454,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
} }
private List<MojoDescriptor> toMojoDescriptors( Map<String, MojoAnnotatedClass> mojoAnnotatedClasses, private List<MojoDescriptor> toMojoDescriptors( Map<String, MojoAnnotatedClass> mojoAnnotatedClasses,
PluginToolsRequest request, Map<String, JavaClass> javaClassesMap ) PluginDescriptor pluginDescriptor )
throws DuplicateParameterException, InvalidParameterException throws DuplicateParameterException, InvalidParameterException
{ {
List<MojoDescriptor> mojoDescriptors = new ArrayList<MojoDescriptor>( mojoAnnotatedClasses.size() ); List<MojoDescriptor> mojoDescriptors = new ArrayList<MojoDescriptor>( mojoAnnotatedClasses.size() );
@ -558,7 +556,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
mojoDescriptor.addParameter( parameter ); mojoDescriptor.addParameter( parameter );
} }
mojoDescriptor.setPluginDescriptor( request.getPluginDescriptor() ); mojoDescriptor.setPluginDescriptor( pluginDescriptor );
mojoDescriptors.add( mojoDescriptor ); mojoDescriptors.add( mojoDescriptor );
} }