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

[MPLUGIN-230] sync help-goal with goal-report: Use 'User property' instead of 'Expression' 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1405334 13f79535-47bb-0310-9956-ffa450edef68
master
Robert Scholte 2012-11-03 13:55:21 +00:00
parent 6ca8252f0a
commit 8488b8267d
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
maven-plugin-tools-generators/src/main/resources/help-class-source.vm
View File

@ -177,11 +177,11 @@ public class HelpMojo
List<Node> namedChild = findNamedChild( node, elementName ); List<Node> namedChild = findNamedChild( node, elementName );
if ( namedChild.isEmpty() ) if ( namedChild.isEmpty() )
{ {
throw new MojoExecutionException( "Could not find " + elementName + "in plugin-help.xml" ); throw new MojoExecutionException( "Could not find " + elementName + " in plugin-help.xml" );
} }
if ( namedChild.size() > 1 ) if ( namedChild.size() > 1 )
{ {
throw new MojoExecutionException( "Multiple " + elementName + "in plugin-help.xml" ); throw new MojoExecutionException( "Multiple " + elementName + " in plugin-help.xml" );
} }
Node node1 = namedChild.get( 0 ); Node node1 = namedChild.get( 0 );
return node1; return node1;
@ -285,7 +285,8 @@ public class HelpMojo
Node expression = findSingleChild( parameter, "expression" ); Node expression = findSingleChild( parameter, "expression" );
if ( ( expression != null ) && isNotEmpty( expression.getNodeValue() ) ) if ( ( expression != null ) && isNotEmpty( expression.getNodeValue() ) )
{ {
append( sb, "Expression: " + expression.getNodeValue(), 3 ); String property = getPropertyFromExpression( expression.getNodeValue() );
append( sb, "User property: " + property, 3 );
} }
append( sb, "", 0 ); append( sb, "", 0 );
@ -428,4 +429,16 @@ public class HelpMojo
} }
return level; return level;
} }
private String getPropertyFromExpression( String expression )
{
if ( expression != null && expression.startsWith( "${" ) && expression.endsWith( "}" )
&& !expression.substring( 2 ).contains( "${" ) )
{
// expression="${xxx}" -> property="xxx"
return expression.substring( 2, expression.length() - 1 );
}
// no property can be extracted
return null;
}
} }