Applying J. Lewis Muir's patch from CLI-151 fixing HelpFormatter so it wraps properly on multiple lines

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@654428 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

src/java/org/apache/commons/cli/HelpFormatter.java

@@ -809,7 +809,7 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width,
         while (true)
         {
             text = padding + text.substring(pos).trim();
-            pos = findWrapPos(text, width, nextLineTabStop);
+            pos = findWrapPos(text, width, 0);
 
             if (pos == -1)
             {

src/test/org/apache/commons/cli/HelpFormatterTest.java

@@ -83,6 +83,18 @@ public void testPrintWrapped()
       hf.renderWrappedText(sb, 12, 4, text);
       assertEquals("single line padded text", expected, sb.toString());
 
+      text = "  -p,--period <PERIOD>  PERIOD is time duration of form " +
+          "DATE[-DATE] where DATE has form YYYY[MM[DD]]";
+
+      sb.setLength(0);
+      expected = "  -p,--period <PERIOD>  PERIOD is time duration of" +
+                 hf.getNewLine() +
+                 "                        form DATE[-DATE] where DATE" +
+                 hf.getNewLine() +
+                 "                        has form YYYY[MM[DD]]";
+      hf.renderWrappedText(sb, 53, 24, text);
+      assertEquals("single line padded text 2", expected, sb.toString());
+
       text =
          "aaaa aaaa aaaa" + hf.getNewLine() +
          "aaaaaa" + hf.getNewLine() +