From b8269c20165f92633895fb13c2be20f68ddc33ae Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 26 May 2012 21:39:02 +0000 Subject: [PATCH] code improvement git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1342976 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/resources/help-class-source.vm | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm index a39b0bf..5ec1885 100644 --- a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm +++ b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm @@ -178,12 +178,11 @@ public class HelpMojo for ( Xpp3Dom parameter : parameters ) { - Xpp3Dom name = parameter.getChild( "name" ); - Xpp3Dom fieldConfigurationElement = configurationElement.getChild( name.getValue() ); + String name = parameter.getChild( "name" ).getValue(); + Xpp3Dom fieldConfigurationElement = configurationElement.getChild( name ); if ( fieldConfigurationElement != null && fieldConfigurationElement.getValue() != null ) { - append( sb, name.getValue() + " (default: " + configurationElement.getChild( - name.getValue() ).getAttribute( "default-value" ) + ")", 2 ); + append( sb, name + " (default: " + configurationElement.getChild( name ).getAttribute( "default-value" ) + ")", 2 ); } append( sb, parameter.getChild( "description" ).getValue(), 3 ); @@ -234,9 +233,9 @@ public class HelpMojo */ private void append( StringBuilder sb, String description, int indent ) { - for ( Iterator it = toLines( description, indent, indentSize, lineLength ).iterator(); it.hasNext(); ) + for ( String line : toLines( description, indent, indentSize, lineLength ) ) { - sb.append( it.next().toString() ).append( '\n' ); + sb.append( line ).append( '\n' ); } } @@ -250,15 +249,17 @@ public class HelpMojo * @return The sequence of display lines, never null. * @throws NegativeArraySizeException if indent < 0 */ - private static List toLines( String text, int indent, int indentSize, int lineLength ) + private static List toLines( String text, int indent, int indentSize, int lineLength ) { List lines = new ArrayList(); String ind = repeat( "\t", indent ); + String[] plainLines = text.split( "(\r\n)|(\r)|(\n)" ); - for ( int i = 0; i < plainLines.length; i++ ) + + for ( String plainLine : plainLines ) { - toLines( lines, ind + plainLines[i], indentSize, lineLength ); + toLines( lines, ind + plainLine, indentSize, lineLength ); } return lines; @@ -276,11 +277,12 @@ public class HelpMojo { int lineIndent = getIndentLevel( line ); StringBuilder buf = new StringBuilder( 256 ); + String[] tokens = line.split( " +" ); - for ( int i = 0; i < tokens.length; i++ ) + + for ( String token : tokens ) { - String token = tokens[i]; - if ( i > 0 ) + if ( buf.length() > 0 ) { if ( buf.length() + token.length() >= lineLength ) { @@ -293,6 +295,7 @@ public class HelpMojo buf.append( ' ' ); } } + for ( int j = 0; j < token.length(); j++ ) { char c = token.charAt( j ); @@ -336,6 +339,4 @@ public class HelpMojo } return level; } - - }