[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-ffa450edef68master
parent
6ca8252f0a
commit
8488b8267d
|
|
@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue