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

more Java 5 syntax use 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1215442 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2011-12-17 08:28:53 +00:00
parent fb2232b54f
commit c5d1e65728
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
View File

@ -43,7 +43,6 @@ import org.codehaus.plexus.util.StringUtils;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@ -588,6 +587,8 @@ public class JavaMojoDescriptorExtractor
} }
/** /**
* extract fields that are either parameters or components.
*
* @param javaClass not null * @param javaClass not null
* @return map with Mojo parameters names as keys * @return map with Mojo parameters names as keys
*/ */
@ -612,10 +613,8 @@ public class JavaMojoDescriptorExtractor
if ( classFields != null ) if ( classFields != null )
{ {
for ( int i = 0; i < classFields.length; i++ ) for ( JavaField field : classFields )
{ {
JavaField field = classFields[i];
if ( field.getTagByName( JavaMojoAnnotation.PARAMETER ) != null if ( field.getTagByName( JavaMojoAnnotation.PARAMETER ) != null
|| field.getTagByName( JavaMojoAnnotation.COMPONENT ) != null ) || field.getTagByName( JavaMojoAnnotation.COMPONENT ) != null )
{ {
@ -641,13 +640,13 @@ public class JavaMojoDescriptorExtractor
List<MojoDescriptor> descriptors = new ArrayList<MojoDescriptor>(); List<MojoDescriptor> descriptors = new ArrayList<MojoDescriptor>();
for ( int i = 0; i < javaClasses.length; i++ ) for ( JavaClass javaClass : javaClasses )
{ {
DocletTag tag = javaClasses[i].getTagByName( GOAL ); DocletTag tag = javaClass.getTagByName( GOAL );
if ( tag != null ) if ( tag != null )
{ {
MojoDescriptor mojoDescriptor = createMojoDescriptor( javaClasses[i] ); MojoDescriptor mojoDescriptor = createMojoDescriptor( javaClass );
mojoDescriptor.setPluginDescriptor( request.getPluginDescriptor() ); mojoDescriptor.setPluginDescriptor( request.getPluginDescriptor() );
// Validate the descriptor as best we can before allowing it to be processed. // Validate the descriptor as best we can before allowing it to be processed.
@ -664,6 +663,7 @@ public class JavaMojoDescriptorExtractor
* @param request The plugin request. * @param request The plugin request.
* @return an array of java class * @return an array of java class
*/ */
@SuppressWarnings( "unchecked" )
protected JavaClass[] discoverClasses( final PluginToolsRequest request ) protected JavaClass[] discoverClasses( final PluginToolsRequest request )
{ {
JavaDocBuilder builder = new JavaDocBuilder(); JavaDocBuilder builder = new JavaDocBuilder();
@ -671,17 +671,16 @@ public class JavaMojoDescriptorExtractor
MavenProject project = request.getProject(); MavenProject project = request.getProject();
for ( @SuppressWarnings( "unchecked" ) for ( String source : (List<String>) project.getCompileSourceRoots() )
Iterator<String> i = project.getCompileSourceRoots().iterator(); i.hasNext(); )
{ {
builder.addSourceTree( new File( i.next() ) ); builder.addSourceTree( new File( source ) );
} }
// TODO be more dynamic // TODO be more dynamic
if ( !project.getCompileSourceRoots() File generatedPlugin = new File( project.getBasedir(), "target/generated-sources/plugin" );
.contains( new File( project.getBasedir(), "target/generated-sources/plugin" ).getAbsolutePath() ) ) if ( !project.getCompileSourceRoots().contains( generatedPlugin.getAbsolutePath() ) )
{ {
builder.addSourceTree( new File( project.getBasedir(), "target/generated-sources/plugin" ) ); builder.addSourceTree( generatedPlugin );
} }
return builder.getClasses(); return builder.getClasses();