Replaced StringBuilder with StringBuffer wherever possible without breaking binary compatibility

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1214688 13f79535-47bb-0310-9956-ffa450edef68

Author: ebourg

src/main/java/org/apache/commons/cli/AmbiguousOptionException.java

@@ -66,23 +66,23 @@ public Collection<String> getMatchingOptions()
      */
     private static String createMessage(String option, Collection<String> matchingOptions)
     {
-        StringBuffer buff = new StringBuffer("Ambiguous option: '");
-        buff.append(option);
-        buff.append("'  (could be: ");
+        StringBuilder buf = new StringBuilder("Ambiguous option: '");
+        buf.append(option);
+        buf.append("'  (could be: ");
 
         Iterator<String> it = matchingOptions.iterator();
         while (it.hasNext())
         {
-            buff.append("'");
-            buff.append(it.next());
-            buff.append("'");
+            buf.append("'");
+            buf.append(it.next());
+            buf.append("'");
             if (it.hasNext())
             {
-                buff.append(", ");
+                buf.append(", ");
             }
         }
-        buff.append(")");
+        buf.append(")");
 
-        return buff.toString();
+        return buf.toString();
     }
 }

src/main/java/org/apache/commons/cli/CommandLine.java

@@ -321,7 +321,7 @@ public List<String> getArgList()
 
     /*
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
             
         buf.append("[ CommandLine: [ options: ");
         buf.append(options.toString());

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

@@ -804,7 +804,7 @@ protected StringBuffer renderOptions(StringBuffer sb, int width, Options options
         for (Iterator i = optList.iterator(); i.hasNext();)
         {
             Option option = (Option) i.next();
-            StringBuffer optBuf = new StringBuffer(prefixList.get(x++).toString());
+            StringBuilder optBuf = new StringBuilder(prefixList.get(x++).toString());
 
             if (optBuf.length() < max)
             {
@@ -894,7 +894,7 @@ protected StringBuffer renderWrappedText(StringBuffer sb, int width,
      * @param nextLineTabStop The position on the next line for the first tab.
      * @param text The text to be rendered.
      */
-    private StringBuffer renderWrappedTextBlock(StringBuffer sb, int width, int nextLineTabStop, String text)
+    private Appendable renderWrappedTextBlock(StringBuffer sb, int width, int nextLineTabStop, String text)
     {
         try
         {

src/main/java/org/apache/commons/cli/MissingOptionException.java

@@ -78,20 +78,20 @@ public List getMissingOptions()
      */
     private static String createMessage(List missingOptions)
     {
-        StringBuffer buff = new StringBuffer("Missing required option");
-        buff.append(missingOptions.size() == 1 ? "" : "s");
-        buff.append(": ");
+        StringBuilder buf = new StringBuilder("Missing required option");
+        buf.append(missingOptions.size() == 1 ? "" : "s");
+        buf.append(": ");
 
         Iterator it = missingOptions.iterator();
         while (it.hasNext())
         {
-            buff.append(it.next());
+            buf.append(it.next());
             if (it.hasNext())
             {
-                buff.append(", ");
+                buf.append(", ");
             }
         }
 
-        return buff.toString();
+        return buf.toString();
     }
 }

src/main/java/org/apache/commons/cli/Option.java

@@ -547,7 +547,7 @@ public List<String> getValuesList()
      */
     public String toString()
     {
-        StringBuffer buf = new StringBuffer().append("[ option: ");
+        StringBuilder buf = new StringBuilder().append("[ option: ");
 
         buf.append(opt);
 

src/main/java/org/apache/commons/cli/Options.java

@@ -294,7 +294,7 @@ public OptionGroup getOptionGroup(Option opt)
      */
     public String toString()
     {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         buf.append("[ Options: [ short ");
         buf.append(shortOpts.toString());