2008-04-28 Andrew John Hughes <gnu_andrew@member.fsf.org>

	PR classpath/21869
	* util/XMLWriter.java,
	* xpath/ArithmeticExpr.java,
	* xpath/ConcatFunction.java,
	* xpath/Expr.java,
	* xpath/FunctionCall.java,
	* xpath/NormalizeSpaceFunction.java,
	* xpath/Selector.java,
	* xpath/Steps.java,
	* xpath/TranslateFunction.java,
	* xpath/VariableReference.java,
	* xpath/XPathTokenizer.java:
	Swap use of StringBuffer for CPStringBuilder.

11 files changed, 39 insertions, 17 deletions

diff --git a/gnu/xml/util/XMLWriter.java b/gnu/xml/util/XMLWriter.java
index 24b38923f..274594720 100644
--- a/gnu/xml/util/XMLWriter.java
+++ b/gnu/xml/util/XMLWriter.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.BufferedWriter;
 import java.io.CharConversionException;
 import java.io.IOException;
@@ -152,7 +154,7 @@ public class XMLWriter
     private String		eol = sysEOL;
 
     private short		dangerMask;
-    private StringBuffer	stringBuf;
+    private CPStringBuilder	stringBuf;
     private Locator		locator;
     private ErrorHandler	errHandler;
 
@@ -289,7 +291,7 @@ public class XMLWriter
 	    }
 
 	    if (dangerMask != 0)
-		stringBuf = new StringBuffer ();
+		stringBuf = new CPStringBuilder ();
 	}
 
 	this.encoding = encoding;
diff --git a/gnu/xml/xpath/ArithmeticExpr.java b/gnu/xml/xpath/ArithmeticExpr.java
index cbc1ee064..61098d6e4 100644
--- a/gnu/xml/xpath/ArithmeticExpr.java
+++ b/gnu/xml/xpath/ArithmeticExpr.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import javax.xml.namespace.QName;
 import org.w3c.dom.Node;
 
@@ -139,7 +141,7 @@ final class ArithmeticExpr
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     buf.append(lhs);
     buf.append(' ');
     switch (op)
diff --git a/gnu/xml/xpath/ConcatFunction.java b/gnu/xml/xpath/ConcatFunction.java
index fddd7ae25..12a5cfcc6 100644
--- a/gnu/xml/xpath/ConcatFunction.java
+++ b/gnu/xml/xpath/ConcatFunction.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -61,7 +63,7 @@ final class ConcatFunction
 
   public Object evaluate(Node context, int pos, int len)
   {
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     for (Iterator i = args.iterator(); i.hasNext(); )
       {
         Expr arg = (Expr) i.next();
@@ -96,7 +98,7 @@ final class ConcatFunction
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer("concat(");
+    CPStringBuilder buf = new CPStringBuilder("concat(");
     int len = args.size();
     for (int i = 0; i < len; i++)
       {
diff --git a/gnu/xml/xpath/Expr.java b/gnu/xml/xpath/Expr.java
index cafc83b0d..95fb5ccba 100644
--- a/gnu/xml/xpath/Expr.java
+++ b/gnu/xml/xpath/Expr.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -471,7 +473,7 @@ public abstract class Expr
    */
   public static String stringValue(Collection nodeSet)
   {
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     for (Iterator i = nodeSet.iterator(); i.hasNext(); )
       {
         buf.append(stringValue((Node) i.next()));
@@ -494,7 +496,7 @@ public abstract class Expr
       case Node.DOCUMENT_NODE: // 5.1 Root Node
       case Node.DOCUMENT_FRAGMENT_NODE:
       case Node.ELEMENT_NODE: // 5.2 Element Nodes
-        StringBuffer buf = new StringBuffer();
+        CPStringBuilder buf = new CPStringBuilder();
         for (Node ctx = node.getFirstChild(); ctx != null;
              ctx = ctx.getNextSibling())
           {
diff --git a/gnu/xml/xpath/FunctionCall.java b/gnu/xml/xpath/FunctionCall.java
index 669efbf18..70a436f6c 100644
--- a/gnu/xml/xpath/FunctionCall.java
+++ b/gnu/xml/xpath/FunctionCall.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -144,7 +146,7 @@ public final class FunctionCall
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     buf.append(name);
     buf.append('(');
     int len = args.size();
diff --git a/gnu/xml/xpath/NormalizeSpaceFunction.java b/gnu/xml/xpath/NormalizeSpaceFunction.java
index b7358e8d8..9e2eb337e 100644
--- a/gnu/xml/xpath/NormalizeSpaceFunction.java
+++ b/gnu/xml/xpath/NormalizeSpaceFunction.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.List;
 import java.util.StringTokenizer;
 import javax.xml.namespace.QName;
@@ -74,7 +76,7 @@ final class NormalizeSpaceFunction
     Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
     String s = _string(context, val);
     StringTokenizer st = new StringTokenizer(s, " \t\r\n");
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     if (st.hasMoreTokens())
       {
         buf.append(st.nextToken()); 
diff --git a/gnu/xml/xpath/Selector.java b/gnu/xml/xpath/Selector.java
index c7abb33e2..23c1bcf35 100644
--- a/gnu/xml/xpath/Selector.java
+++ b/gnu/xml/xpath/Selector.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -431,7 +433,7 @@ public final class Selector
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     switch (axis)
       {
       case ANCESTOR:
diff --git a/gnu/xml/xpath/Steps.java b/gnu/xml/xpath/Steps.java
index 9ef6cd35f..a1208938b 100644
--- a/gnu/xml/xpath/Steps.java
+++ b/gnu/xml/xpath/Steps.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -234,7 +236,7 @@ public final class Steps
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     Iterator i = path.iterator();
     Expr expr = (Expr) i.next();
     if (!(expr instanceof Root))
diff --git a/gnu/xml/xpath/TranslateFunction.java b/gnu/xml/xpath/TranslateFunction.java
index 54e8b9c37..53e6f45b5 100644
--- a/gnu/xml/xpath/TranslateFunction.java
+++ b/gnu/xml/xpath/TranslateFunction.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.List;
 import javax.xml.namespace.QName;
 import org.w3c.dom.Node;
@@ -86,7 +88,7 @@ final class TranslateFunction
     String string = _string(context, val1);
     String search = _string(context, val2);
     String replace = _string(context, val3);
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     int l1 = string.length();
     int l2 = search.length();
     int l3 = replace.length();
@@ -110,7 +112,7 @@ final class TranslateFunction
             buf.append(c);
           } 
       } 
-    return new String(buf);
+    return buf.toString();
   }
 
   public Expr clone(Object context)
diff --git a/gnu/xml/xpath/VariableReference.java b/gnu/xml/xpath/VariableReference.java
index 813a37f96..9ef6f160f 100644
--- a/gnu/xml/xpath/VariableReference.java
+++ b/gnu/xml/xpath/VariableReference.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import javax.xml.namespace.QName;
 import javax.xml.xpath.XPathVariableResolver;
 import org.w3c.dom.Node;
@@ -86,7 +88,7 @@ public class VariableReference
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer("$");
+    CPStringBuilder buf = new CPStringBuilder("$");
     String prefix = name.getPrefix();
     if (prefix != null && !"".equals(prefix))
       {
diff --git a/gnu/xml/xpath/XPathTokenizer.java b/gnu/xml/xpath/XPathTokenizer.java
index a28713782..78bbd9342 100644
--- a/gnu/xml/xpath/XPathTokenizer.java
+++ b/gnu/xml/xpath/XPathTokenizer.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.xpath;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
@@ -314,7 +316,7 @@ implements XPathParser.yyInput
   XPathToken consume_literal (int delimiter)
     throws IOException
   {
-    StringBuffer buf = new StringBuffer ();
+    CPStringBuilder buf = new CPStringBuilder ();
     while (true)
       {
         int c = in.read ();
@@ -336,7 +338,7 @@ implements XPathParser.yyInput
   XPathToken consume_digits (int c)
     throws IOException
   {
-    StringBuffer buf = new StringBuffer ();
+    CPStringBuilder buf = new CPStringBuilder ();
     buf.append ((char) c);
     while (true)
       {
@@ -357,7 +359,7 @@ implements XPathParser.yyInput
   XPathToken consume_name (int c)
     throws IOException
   {
-    StringBuffer buf = new StringBuffer ();
+    CPStringBuilder buf = new CPStringBuilder ();
     buf.append ((char) c);
     while (true)
       {