3 files changed, 11 insertions, 5 deletions
diff --git a/libjava/classpath/gnu/xml/util/DoParse.java b/libjava/classpath/gnu/xml/util/DoParse.java
index 5da086e..a8f5096 100644
--- a/libjava/classpath/gnu/xml/util/DoParse.java
+++ b/libjava/classpath/gnu/xml/util/DoParse.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.xml.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 
 import org.xml.sax.ErrorHandler;
@@ -271,7 +273,7 @@ final public class DoParse
 	String			label,
 	SAXParseException	e
     ) {
-	StringBuffer	buf = new StringBuffer ();
+	CPStringBuilder	buf = new CPStringBuilder ();
 	int		temp;
 
 	buf.append ("** ");
diff --git a/libjava/classpath/gnu/xml/util/XCat.java b/libjava/classpath/gnu/xml/util/XCat.java
index f3704cd..93127f4 100644
--- a/libjava/classpath/gnu/xml/util/XCat.java
+++ b/libjava/classpath/gnu/xml/util/XCat.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.xml.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
@@ -623,7 +625,7 @@ public class XCat implements EntityResolver2
     private static String normalizePublicId (boolean full, String publicId)
     {
 	if (publicId.startsWith ("urn:publicid:")) {
-	    StringBuffer	buf = new StringBuffer ();
+	    CPStringBuilder	buf = new CPStringBuilder ();
 	    char		chars [] = publicId.toCharArray ();
 boolean hasbug = false;
 
@@ -814,7 +816,7 @@ System.err.println ("nyet unhexing public id: " + publicId);
 		    replace = (String) rewrites.get (temp);
 		}
 		if (prefix != null) {
-		    StringBuffer	buf = new StringBuffer (replace);
+		    CPStringBuilder	buf = new CPStringBuilder (replace);
 		    buf.append (uri.substring (prefixLen));
 		    // IF the URI is accessible ...
 		    return new InputSource (buf.toString ());
diff --git a/libjava/classpath/gnu/xml/util/XMLWriter.java b/libjava/classpath/gnu/xml/util/XMLWriter.java
index 24b3892..2745947 100644
--- a/libjava/classpath/gnu/xml/util/XMLWriter.java
+++ b/libjava/classpath/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;