You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/05/20 16:10:39 UTC
svn commit: r1340728 -
/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
Author: hboutemy
Date: Sun May 20 14:10:38 2012
New Revision: 1340728
URL: http://svn.apache.org/viewvc?rev=1340728&view=rev
Log:
removed unused method parameters
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1340728&r1=1340727&r2=1340728&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java Sun May 20 14:10:38 2012
@@ -106,7 +106,7 @@ public class JavaAnnotationsMojoDescript
populateDataFromJavadoc( mojoAnnotatedClasses, javaClassesMap );
- return toMojoDescriptors( mojoAnnotatedClasses, request, javaClassesMap );
+ return toMojoDescriptors( mojoAnnotatedClasses, request.getPluginDescriptor() );
}
private Map<String, MojoAnnotatedClass> scanAnnotations( PluginToolsRequest request )
@@ -272,8 +272,7 @@ public class JavaAnnotationsMojoDescript
}
}
- Map<String, JavaField> fieldsMap =
- extractFieldParameterTags( javaClass, javaClassesMap, mojoAnnotatedClasses );
+ Map<String, JavaField> fieldsMap = extractFieldParameterTags( javaClass, javaClassesMap );
// populate parameters
Map<String, ParameterAnnotationContent> parameters =
@@ -362,8 +361,7 @@ public class JavaAnnotationsMojoDescript
* @return map with Mojo parameters names as keys
*/
private Map<String, JavaField> extractFieldParameterTags( JavaClass javaClass,
- Map<String, JavaClass> javaClassesMap,
- Map<String, MojoAnnotatedClass> mojoAnnotatedClasses )
+ Map<String, JavaClass> javaClassesMap )
{
Map<String, JavaField> rawParams = new TreeMap<String, com.thoughtworks.qdox.model.JavaField>();
@@ -375,13 +373,13 @@ public class JavaAnnotationsMojoDescript
{
if ( superClass.getFields().length > 0 )
{
- rawParams = extractFieldParameterTags( superClass, javaClassesMap, mojoAnnotatedClasses );
+ rawParams = extractFieldParameterTags( superClass, javaClassesMap );
}
// maybe sources comes from scan of sources artifact
superClass = javaClassesMap.get( superClass.getFullyQualifiedName() );
if ( superClass != null )
{
- rawParams = extractFieldParameterTags( superClass, javaClassesMap, mojoAnnotatedClasses );
+ rawParams = extractFieldParameterTags( superClass, javaClassesMap );
}
}
else
@@ -456,7 +454,7 @@ public class JavaAnnotationsMojoDescript
}
private List<MojoDescriptor> toMojoDescriptors( Map<String, MojoAnnotatedClass> mojoAnnotatedClasses,
- PluginToolsRequest request, Map<String, JavaClass> javaClassesMap )
+ PluginDescriptor pluginDescriptor )
throws DuplicateParameterException, InvalidParameterException
{
List<MojoDescriptor> mojoDescriptors = new ArrayList<MojoDescriptor>( mojoAnnotatedClasses.size() );
@@ -558,7 +556,7 @@ public class JavaAnnotationsMojoDescript
mojoDescriptor.addParameter( parameter );
}
- mojoDescriptor.setPluginDescriptor( request.getPluginDescriptor() );
+ mojoDescriptor.setPluginDescriptor( pluginDescriptor );
mojoDescriptors.add( mojoDescriptor );
}