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

extracted addUl() methods to avoid copy/paste 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1340812 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-05-20 19:32:03 +00:00
parent f603ef639d
commit 776632fa7d
1 changed files with 40 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
View File

@ -271,11 +271,7 @@ public class PluginXdocGenerator
String value; String value;
if ( mojoDescriptor.isProjectRequired() ) if ( mojoDescriptor.isProjectRequired() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.projectRequired" ) ); w.writeMarkup( getString( "pluginxdoc.mojodescriptor.projectRequired" ) );
w.endElement(); //li w.endElement(); //li
@ -283,11 +279,7 @@ public class PluginXdocGenerator
if ( mojoDescriptor.isRequiresReports() ) if ( mojoDescriptor.isRequiresReports() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.reportingMojo" ) ); w.writeMarkup( getString( "pluginxdoc.mojodescriptor.reportingMojo" ) );
w.endElement(); // li w.endElement(); // li
@ -295,11 +287,7 @@ public class PluginXdocGenerator
if ( mojoDescriptor.isAggregator() ) if ( mojoDescriptor.isAggregator() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.aggregator" ) ); w.writeMarkup( getString( "pluginxdoc.mojodescriptor.aggregator" ) );
w.endElement(); //li w.endElement(); //li
@ -307,11 +295,7 @@ public class PluginXdocGenerator
if ( mojoDescriptor.isDirectInvocationOnly() ) if ( mojoDescriptor.isDirectInvocationOnly() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.directInvocationOnly" ) ); w.writeMarkup( getString( "pluginxdoc.mojodescriptor.directInvocationOnly" ) );
w.endElement(); //li w.endElement(); //li
@ -320,11 +304,7 @@ public class PluginXdocGenerator
value = mojoDescriptor.isDependencyResolutionRequired(); value = mojoDescriptor.isDependencyResolutionRequired();
if ( StringUtils.isNotEmpty( value ) ) if ( StringUtils.isNotEmpty( value ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( format( "pluginxdoc.mojodescriptor.dependencyResolutionRequired", value ) ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.dependencyResolutionRequired", value ) );
w.endElement(); //li w.endElement(); //li
@ -337,11 +317,7 @@ public class PluginXdocGenerator
value = extendedMojoDescriptor.getDependencyCollectionRequired(); value = extendedMojoDescriptor.getDependencyCollectionRequired();
if ( StringUtils.isNotEmpty( value ) ) if ( StringUtils.isNotEmpty( value ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( format( "pluginxdoc.mojodescriptor.dependencyCollectionRequired", value ) ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.dependencyCollectionRequired", value ) );
w.endElement(); //li w.endElement(); //li
@ -349,11 +325,7 @@ public class PluginXdocGenerator
if ( extendedMojoDescriptor.isThreadSafe() ) if ( extendedMojoDescriptor.isThreadSafe() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.threadSafe" ) ); w.writeMarkup( getString( "pluginxdoc.mojodescriptor.threadSafe" ) );
w.endElement(); //li w.endElement(); //li
@ -364,11 +336,7 @@ public class PluginXdocGenerator
value = mojoDescriptor.getSince(); value = mojoDescriptor.getSince();
if ( StringUtils.isNotEmpty( value ) ) if ( StringUtils.isNotEmpty( value ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( format( "pluginxdoc.mojodescriptor.since", value ) ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.since", value ) );
w.endElement(); //li w.endElement(); //li
@ -377,11 +345,7 @@ public class PluginXdocGenerator
value = mojoDescriptor.getPhase(); value = mojoDescriptor.getPhase();
if ( StringUtils.isNotEmpty( value ) ) if ( StringUtils.isNotEmpty( value ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( format( "pluginxdoc.mojodescriptor.phase", value ) ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.phase", value ) );
w.endElement(); //li w.endElement(); //li
@ -390,11 +354,7 @@ public class PluginXdocGenerator
value = mojoDescriptor.getExecutePhase(); value = mojoDescriptor.getExecutePhase();
if ( StringUtils.isNotEmpty( value ) ) if ( StringUtils.isNotEmpty( value ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( format( "pluginxdoc.mojodescriptor.executePhase", value ) ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.executePhase", value ) );
w.endElement(); //li w.endElement(); //li
@ -403,11 +363,7 @@ public class PluginXdocGenerator
value = mojoDescriptor.getExecuteGoal(); value = mojoDescriptor.getExecuteGoal();
if ( StringUtils.isNotEmpty( value ) ) if ( StringUtils.isNotEmpty( value ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( format( "pluginxdoc.mojodescriptor.executeGoal", value ) ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.executeGoal", value ) );
w.endElement(); //li w.endElement(); //li
@ -416,11 +372,7 @@ public class PluginXdocGenerator
value = mojoDescriptor.getExecuteLifecycle(); value = mojoDescriptor.getExecuteLifecycle();
if ( StringUtils.isNotEmpty( value ) ) if ( StringUtils.isNotEmpty( value ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( format( "pluginxdoc.mojodescriptor.executeLifecycle", value ) ); w.writeMarkup( format( "pluginxdoc.mojodescriptor.executeLifecycle", value ) );
w.endElement(); //li w.endElement(); //li
@ -428,11 +380,7 @@ public class PluginXdocGenerator
if ( mojoDescriptor.isOnlineRequired() ) if ( mojoDescriptor.isOnlineRequired() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.onlineRequired" ) ); w.writeMarkup( getString( "pluginxdoc.mojodescriptor.onlineRequired" ) );
w.endElement(); //li w.endElement(); //li
@ -440,11 +388,7 @@ public class PluginXdocGenerator
if ( !mojoDescriptor.isInheritedByDefault() ) if ( !mojoDescriptor.isInheritedByDefault() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
w.startElement( "li" ); w.startElement( "li" );
w.writeMarkup( getString( "pluginxdoc.mojodescriptor.inheritedByDefault" ) ); w.writeMarkup( getString( "pluginxdoc.mojodescriptor.inheritedByDefault" ) );
w.endElement(); //li w.endElement(); //li
@ -552,31 +496,19 @@ public class PluginXdocGenerator
w.endElement(); // div w.endElement(); // div
boolean addedUl = false; boolean addedUl = false;
if ( !addedUl && StringUtils.isNotEmpty( parameter.getType() ) ) addedUl = addUl( w, addedUl, parameter.getType() );
{
w.startElement( "ul" );
addedUl = true;
}
writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.type" ), parameter.getType(), w ); writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.type" ), parameter.getType(), w );
if ( StringUtils.isNotEmpty( parameter.getSince() ) ) if ( StringUtils.isNotEmpty( parameter.getSince() ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.since" ), parameter.getSince(), w ); writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.since" ), parameter.getSince(), w );
} }
else else
{ {
if ( StringUtils.isNotEmpty( mojoDescriptor.getSince() ) ) if ( StringUtils.isNotEmpty( mojoDescriptor.getSince() ) )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.since" ), mojoDescriptor.getSince(), writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.since" ), mojoDescriptor.getSince(),
w ); w );
} }
@ -584,30 +516,18 @@ public class PluginXdocGenerator
if ( parameter.isRequired() ) if ( parameter.isRequired() )
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.required" ), getString( "pluginxdoc.yes" ), writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.required" ), getString( "pluginxdoc.yes" ),
w ); w );
} }
else else
{ {
if ( !addedUl ) addedUl = addUl( w, addedUl );
{
w.startElement( "ul" );
addedUl = true;
}
writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.required" ), getString( "pluginxdoc.no" ), writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.required" ), getString( "pluginxdoc.no" ),
w ); w );
} }
if ( !addedUl && StringUtils.isNotEmpty( parameter.getExpression() ) ) addedUl = addUl( w, addedUl, parameter.getExpression() );
{
w.startElement( "ul" );
addedUl = true;
}
String expression = parameter.getExpression(); String expression = parameter.getExpression();
String property = getPropertyFromExpression( expression ); String property = getPropertyFromExpression( expression );
if ( property == null ) if ( property == null )
@ -619,11 +539,7 @@ public class PluginXdocGenerator
writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.property" ), property, w ); writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.property" ), property, w );
} }
if ( !addedUl && StringUtils.isNotEmpty( parameter.getDefaultValue() ) ) addedUl = addUl( w, addedUl, parameter.getDefaultValue() );
{
w.startElement( "ul" );
addedUl = true;
}
writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.default" ), writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.default" ),
escapeXml( parameter.getDefaultValue() ), w ); escapeXml( parameter.getDefaultValue() ), w );
@ -641,6 +557,25 @@ public class PluginXdocGenerator
w.endElement(); w.endElement();
} }
private boolean addUl( XMLWriter w, boolean addedUl, String content )
{
if ( StringUtils.isNotEmpty( content ) )
{
return addUl( w, addedUl );
}
return addedUl;
}
private boolean addUl( XMLWriter w, boolean addedUl )
{
if ( !addedUl )
{
w.startElement( "ul" );
addedUl = true;
}
return addedUl;
}
private String getPropertyFromExpression( String expression ) private String getPropertyFromExpression( String expression )
{ {
if ( StringUtils.isNotEmpty( expression ) && expression.startsWith( "${" ) && expression.endsWith( "}" ) if ( StringUtils.isNotEmpty( expression ) && expression.startsWith( "${" ) && expression.endsWith( "}" )