You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/12/23 03:30:27 UTC
svn commit: r489830 - in
/maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src:
main/java/org/apache/maven/tools/plugin/extractor/java/
test/java/org/apache/maven/tools/plugin/extractor/java/
Author: brett
Date: Fri Dec 22 18:30:26 2006
New Revision: 489830
URL: http://svn.apache.org/viewvc?view=rev&rev=489830
Log:
merge r470596 from trunk
Modified:
maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
Modified: maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?view=diff&rev=489830&r1=489829&r2=489830
==============================================================================
--- maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java (original)
+++ maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Fri Dec 22 18:30:26 2006
@@ -24,6 +24,8 @@
import com.thoughtworks.qdox.model.JavaClass;
import com.thoughtworks.qdox.model.JavaField;
import com.thoughtworks.qdox.model.JavaSource;
+import com.thoughtworks.qdox.model.Type;
+
import org.apache.maven.plugin.descriptor.InvalidParameterException;
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -365,9 +367,27 @@
JavaField field = (JavaField) entry.getValue();
+ Type type = field.getType();
+
Parameter pd = new Parameter();
- pd.setType( field.getType().getValue() );
+ if ( !type.isArray() )
+ {
+ pd.setType( type.getValue() );
+ }
+ else
+ {
+ StringBuffer value = new StringBuffer( type.getValue() );
+
+ int remaining = type.getDimensions();
+
+ while ( remaining-- > 0 )
+ {
+ value.append( "[]" );
+ }
+
+ pd.setType( value.toString() );
+ }
pd.setDescription( field.getComment() );
Modified: maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java?view=diff&rev=489830&r1=489829&r2=489830
==============================================================================
--- maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java (original)
+++ maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractorTest.java Fri Dec 22 18:30:26 2006
@@ -57,6 +57,15 @@
pluginDescriptor.setGoalPrefix( "test" );
List results = extractor.execute( project, pluginDescriptor );
assertEquals( "Extracted mojos", 2, results.size() );
+
+ for ( int i = 0; i < 2; i++ )
+ {
+ MojoDescriptor mojoDescriptor = (MojoDescriptor) results.get( i );
+ assertEquals( 1, mojoDescriptor.getParameters().size() );
+ Parameter parameter = (Parameter) mojoDescriptor.getParameters().get( 0 );
+ assertEquals( "project", parameter.getName() );
+ assertEquals( "java.lang.String[]", parameter.getType() );
+ }
}
private File fileOf( String classpathResource )