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 00:23:38 UTC
svn commit: r1340581 - in
/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main:
java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
resources/pluginxdoc.properties resources/pluginxdoc_fr.properties
Author: hboutemy
Date: Sat May 19 22:23:37 2012
New Revision: 1340581
URL: http://svn.apache.org/viewvc?rev=1340581&view=rev
Log:
[MPLUGIN-196] added property support to report
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?rev=1340581&r1=1340580&r2=1340581&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java Sat May 19 22:23:37 2012
@@ -110,11 +110,11 @@ public class PluginXdocGenerator
{
if ( request.getPluginDescriptor().getMojos() != null )
{
- for ( @SuppressWarnings( "unchecked" ) Iterator<MojoDescriptor> it =
- request.getPluginDescriptor().getMojos().iterator(); it.hasNext(); )
- {
- MojoDescriptor descriptor = it.next();
+ @SuppressWarnings( "unchecked" )
+ List<MojoDescriptor> mojos = request.getPluginDescriptor().getMojos();
+ for ( MojoDescriptor descriptor : mojos )
+ {
processMojoDescriptor( descriptor, destinationDirectory );
}
}
@@ -607,7 +607,18 @@ public class PluginXdocGenerator
w.startElement( "ul" );
addedUl = true;
}
- writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.expression" ), parameter.getExpression(), w );
+ String expression = parameter.getExpression();
+ if ( StringUtils.isNotEmpty( expression ) && expression.startsWith( "${" ) && expression.endsWith( "}" )
+ && !expression.substring( 2 ).contains( "${" ) )
+ {
+ // expression="${xxx}" -> property="xxx"
+ String property = expression.substring( 2, expression.length() - 1 );
+ writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.property" ), property, w );
+ }
+ else
+ {
+ writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.expression" ), parameter.getExpression(), w );
+ }
if ( !addedUl && StringUtils.isNotEmpty( parameter.getDefaultValue() ) )
{
Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties?rev=1340581&r1=1340580&r2=1340581&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties Sat May 19 22:23:37 2012
@@ -49,6 +49,7 @@ pluginxdoc.mojodescriptor.parameter.type
pluginxdoc.mojodescriptor.parameter.since=Since
pluginxdoc.mojodescriptor.parameter.required=Required
pluginxdoc.mojodescriptor.parameter.expression=Expression
+pluginxdoc.mojodescriptor.parameter.property=User Property
pluginxdoc.mojodescriptor.parameter.default=Default
pluginxdoc.mojodescriptor.parameter.defaultValue=<strong>Default value is</strong>: <code>{0}</code>.
pluginxdoc.mojodescriptor.requiredParameters=Required Parameters
Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties?rev=1340581&r1=1340580&r2=1340581&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties Sat May 19 22:23:37 2012
@@ -48,6 +48,7 @@ pluginxdoc.mojodescriptor.parameter.type
pluginxdoc.mojodescriptor.parameter.since=Depuis
pluginxdoc.mojodescriptor.parameter.required=Exig\u00e9
pluginxdoc.mojodescriptor.parameter.expression=Expression
+pluginxdoc.mojodescriptor.parameter.property=Propri\u00e9t\u00e9 utilisateur
pluginxdoc.mojodescriptor.parameter.default=D\u00e9faut
pluginxdoc.mojodescriptor.parameter.defaultValue=<strong>Valeur par d\u00e9faut est</strong> : <code>{0}</code>.
pluginxdoc.mojodescriptor.requiredParameters=Param\u00e8tres requis