2008-02-30 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* gnu/classpath/CPStringBuilder.java:
	Removed.
	* gnu/java/awt/font/OpenTypeFontPeer.java,
	* gnu/java/awt/font/autofit/Edge.java,
	* gnu/java/awt/font/autofit/LatinBlue.java,
	* gnu/java/awt/font/autofit/Segment.java,
	* gnu/java/awt/font/autofit/Width.java,
	* gnu/java/awt/font/opentype/truetype/Point.java,
	* gnu/java/awt/java2d/ActiveEdges.java,
	* gnu/java/awt/peer/GnomeDesktopPeer.java,
	* gnu/java/awt/peer/KDEDesktopPeer.java,
	* gnu/java/awt/peer/x/XFontPeer.java:
	Use CPStringBuilder.
	* gnu/java/lang/CPStringBuilder.java:
	Moved from gnu.classpath.
	* gnu/java/lang/ClassHelper.java,
	* gnu/java/lang/reflect/GenericSignatureParser.java,
	* gnu/java/lang/reflect/TypeSignature.java,
	* gnu/java/net/protocol/http/ChunkedInputStream.java,
	* gnu/java/net/protocol/http/Cookie.java,
	* gnu/java/net/protocol/http/HTTPConnection.java,
	* gnu/java/net/protocol/http/Headers.java,
	* gnu/java/net/protocol/http/Request.java:
	Use CPStringBuilder.
	* java/lang/reflect/Modifier.java:
	Corrected import to point to correct package.
	* java/util/Formatter.java:
	Use CPStringBuilder.
	* vm/reference/java/lang/reflect/Constructor.java,
	* vm/reference/java/lang/reflect/Field.java,
	* vm/reference/java/lang/reflect/Method.java:
	Corrected import to point to correct package.

25 files changed, 121 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index a8ba755e3..438c7d242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,40 @@
 2008-02-30  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	* gnu/classpath/CPStringBuilder.java:
+	Removed.
+	* gnu/java/awt/font/OpenTypeFontPeer.java,
+	* gnu/java/awt/font/autofit/Edge.java,
+	* gnu/java/awt/font/autofit/LatinBlue.java,
+	* gnu/java/awt/font/autofit/Segment.java,
+	* gnu/java/awt/font/autofit/Width.java,
+	* gnu/java/awt/font/opentype/truetype/Point.java,
+	* gnu/java/awt/java2d/ActiveEdges.java,
+	* gnu/java/awt/peer/GnomeDesktopPeer.java,
+	* gnu/java/awt/peer/KDEDesktopPeer.java,
+	* gnu/java/awt/peer/x/XFontPeer.java:
+	Use CPStringBuilder.
+	* gnu/java/lang/CPStringBuilder.java:
+	Moved from gnu.classpath.
+	* gnu/java/lang/ClassHelper.java,
+	* gnu/java/lang/reflect/GenericSignatureParser.java,
+	* gnu/java/lang/reflect/TypeSignature.java,
+	* gnu/java/net/protocol/http/ChunkedInputStream.java,
+	* gnu/java/net/protocol/http/Cookie.java,
+	* gnu/java/net/protocol/http/HTTPConnection.java,
+	* gnu/java/net/protocol/http/Headers.java,
+	* gnu/java/net/protocol/http/Request.java:
+	Use CPStringBuilder.
+	* java/lang/reflect/Modifier.java:
+	Corrected import to point to correct package.
+	* java/util/Formatter.java:
+	Use CPStringBuilder.
+	* vm/reference/java/lang/reflect/Constructor.java,
+	* vm/reference/java/lang/reflect/Field.java,
+	* vm/reference/java/lang/reflect/Method.java:
+	Corrected import to point to correct package.
+
+2008-02-30  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	* gnu/classpath/CPStringBuffer.java,
 	* gnu/classpath/CPStringBuilder.java:
 	Rename class to CPStringBuilder.
diff --git a/gnu/java/awt/font/OpenTypeFontPeer.java b/gnu/java/awt/font/OpenTypeFontPeer.java
index 2d898a448..e8124528e 100644
--- a/gnu/java/awt/font/OpenTypeFontPeer.java
+++ b/gnu/java/awt/font/OpenTypeFontPeer.java
@@ -37,6 +37,10 @@ exception statement from your version. */
 
 package gnu.java.awt.font;
 
+
+import gnu.java.awt.peer.ClasspathFontPeer;
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.font.FontRenderContext;
@@ -61,8 +65,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import gnu.java.awt.peer.ClasspathFontPeer;
-
 public class OpenTypeFontPeer
   extends ClasspathFontPeer
 {
@@ -422,7 +424,7 @@ public class OpenTypeFontPeer
    */
   static String encodeFont(String name, int style)
   {
-    StringBuilder key = new StringBuilder();
+    CPStringBuilder key = new CPStringBuilder();
     key.append(validName(name));
     key.append('/');
     switch (style)
diff --git a/gnu/java/awt/font/autofit/Edge.java b/gnu/java/awt/font/autofit/Edge.java
index d9736650b..6420fa1cb 100644
--- a/gnu/java/awt/font/autofit/Edge.java
+++ b/gnu/java/awt/font/autofit/Edge.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.awt.font.autofit;
 
+import gnu.java.lang.CPStringBuilder;
+
 class Edge
 {
   int fpos;
@@ -54,7 +56,7 @@ class Edge
 
   public String toString()
   {
-    StringBuilder s = new StringBuilder();
+    CPStringBuilder s = new CPStringBuilder();
     s.append("[Edge] id");
     s.append(hashCode());
     s.append(", fpos: ");
diff --git a/gnu/java/awt/font/autofit/LatinBlue.java b/gnu/java/awt/font/autofit/LatinBlue.java
index 694fb24fe..2cf68b75c 100644
--- a/gnu/java/awt/font/autofit/LatinBlue.java
+++ b/gnu/java/awt/font/autofit/LatinBlue.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.awt.font.autofit;
 
+import gnu.java.lang.CPStringBuilder;
+
 public class LatinBlue
 {
   static final int FLAG_BLUE_ACTIVE = 1 << 0;
@@ -48,7 +50,7 @@ public class LatinBlue
   int flags;
   public String toString()
   {
-    StringBuilder s = new StringBuilder();
+    CPStringBuilder s = new CPStringBuilder();
     s.append("[BlueZone]");
     s.append(" ref: ");
     s.append(ref.org);
diff --git a/gnu/java/awt/font/autofit/Segment.java b/gnu/java/awt/font/autofit/Segment.java
index 640e82ce2..9f9da6792 100644
--- a/gnu/java/awt/font/autofit/Segment.java
+++ b/gnu/java/awt/font/autofit/Segment.java
@@ -40,6 +40,8 @@ package gnu.java.awt.font.autofit;
 
 import gnu.java.awt.font.opentype.truetype.Point;
 
+import gnu.java.lang.CPStringBuilder;
+
 class Segment
 {
 
@@ -65,7 +67,7 @@ class Segment
 
   public String toString()
   {
-    StringBuilder s = new StringBuilder();
+    CPStringBuilder s = new CPStringBuilder();
     s.append("[Segment] id: ");
     s.append(hashCode());
     s.append(", len:");
diff --git a/gnu/java/awt/font/autofit/Width.java b/gnu/java/awt/font/autofit/Width.java
index c890cf3de..079f7b396 100644
--- a/gnu/java/awt/font/autofit/Width.java
+++ b/gnu/java/awt/font/autofit/Width.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.awt.font.autofit;
 
+import gnu.java.lang.CPStringBuilder;
+
 public class Width
 {
   int org;
@@ -50,7 +52,7 @@ public class Width
 
   public String toString()
   {
-    StringBuilder s = new StringBuilder();
+    CPStringBuilder s = new CPStringBuilder();
     s.append("[Width] org: ");
     s.append(org);
     s.append(", cur: ");
diff --git a/gnu/java/awt/font/opentype/truetype/Point.java b/gnu/java/awt/font/opentype/truetype/Point.java
index c9664d2dc..31c12037c 100644
--- a/gnu/java/awt/font/opentype/truetype/Point.java
+++ b/gnu/java/awt/font/opentype/truetype/Point.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.awt.font.opentype.truetype;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * Encapsulates information regarding one point on a glyph outline.
  */
@@ -234,7 +236,7 @@ public class Point
 
   public String toString()
   {
-    StringBuilder s = new StringBuilder();
+    CPStringBuilder s = new CPStringBuilder();
     s.append("[Point] origX: ");
     s.append(origX);
     s.append(", origY: ");
diff --git a/gnu/java/awt/java2d/ActiveEdges.java b/gnu/java/awt/java2d/ActiveEdges.java
index 4d1e777cc..efe1966e3 100644
--- a/gnu/java/awt/java2d/ActiveEdges.java
+++ b/gnu/java/awt/java2d/ActiveEdges.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.awt.java2d;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * A collection of active edges for scanline conversion.
  */
@@ -183,7 +185,7 @@ final class ActiveEdges
 
   public String toString()
   {
-    StringBuilder s = new StringBuilder();
+    CPStringBuilder s = new CPStringBuilder();
     s.append("[ActiveEdges] ");
     for (int i = 0; i < numActiveEdges; i++)
       {
diff --git a/gnu/java/awt/peer/GnomeDesktopPeer.java b/gnu/java/awt/peer/GnomeDesktopPeer.java
index be2163181..cc41f749d 100644
--- a/gnu/java/awt/peer/GnomeDesktopPeer.java
+++ b/gnu/java/awt/peer/GnomeDesktopPeer.java
@@ -37,6 +37,8 @@
 
 package gnu.java.awt.peer;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -124,7 +126,7 @@ public class GnomeDesktopPeer
   protected String execQuery(String command) throws IOException
   {
     InputStream in = null;
-    StringBuilder output = new StringBuilder();
+    CPStringBuilder output = new CPStringBuilder();
 
     try
       {
diff --git a/gnu/java/awt/peer/KDEDesktopPeer.java b/gnu/java/awt/peer/KDEDesktopPeer.java
index 30dd89ba7..8bc3e65b2 100644
--- a/gnu/java/awt/peer/KDEDesktopPeer.java
+++ b/gnu/java/awt/peer/KDEDesktopPeer.java
@@ -37,6 +37,8 @@
 
 package gnu.java.awt.peer;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -104,7 +106,7 @@ public class KDEDesktopPeer
   protected String execQuery(String command) throws IOException
   {
     InputStream in = null;
-    StringBuilder output = new StringBuilder();
+    CPStringBuilder output = new CPStringBuilder();
 
     try
       {
diff --git a/gnu/java/awt/peer/x/XFontPeer.java b/gnu/java/awt/peer/x/XFontPeer.java
index 0a96a613b..4372c965f 100644
--- a/gnu/java/awt/peer/x/XFontPeer.java
+++ b/gnu/java/awt/peer/x/XFontPeer.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.awt.peer.x;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTError;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -675,7 +677,7 @@ public class XFontPeer
    */
   static String encodeFont(String name, int style, int size)
   {
-    StringBuilder key = new StringBuilder();
+    CPStringBuilder key = new CPStringBuilder();
     key.append(validName(name));
     key.append('.');
     switch (style)
diff --git a/gnu/classpath/CPStringBuilder.java b/gnu/java/lang/CPStringBuilder.java
index 26278b98f..9ecdc4565 100644
--- a/gnu/classpath/CPStringBuilder.java
+++ b/gnu/java/lang/CPStringBuilder.java
@@ -36,7 +36,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package gnu.classpath;
+package gnu.java.lang;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
diff --git a/gnu/java/lang/ClassHelper.java b/gnu/java/lang/ClassHelper.java
index 49dce21ea..e190889de 100644
--- a/gnu/java/lang/ClassHelper.java
+++ b/gnu/java/lang/ClassHelper.java
@@ -102,7 +102,7 @@ public class ClassHelper
     String name = klass.getName();
     if (arrayCount == 0)
       return name;
-    StringBuilder b = new StringBuilder(name.length() + 2 * arrayCount);
+    CPStringBuilder b = new CPStringBuilder(name.length() + 2 * arrayCount);
     b.append(name);
     for (int i = 0; i < arrayCount; ++i)
       b.append("[]");
diff --git a/gnu/java/lang/reflect/GenericSignatureParser.java b/gnu/java/lang/reflect/GenericSignatureParser.java
index 10d7537b4..786b22c7c 100644
--- a/gnu/java/lang/reflect/GenericSignatureParser.java
+++ b/gnu/java/lang/reflect/GenericSignatureParser.java
@@ -38,7 +38,19 @@ exception statement from your version. */
 
 package gnu.java.lang.reflect;
 
-import java.lang.reflect.*;
+import gnu.java.lang.CPStringBuilder;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.GenericDeclaration;
+import java.lang.reflect.GenericSignatureFormatError;
+import java.lang.reflect.MalformedParameterizedTypeException;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -184,7 +196,7 @@ final class ParameterizedTypeImpl extends TypeImpl implements ParameterizedType
 
     public String toString()
     {
-        StringBuilder sb = new StringBuilder();
+        CPStringBuilder sb = new CPStringBuilder();
         if (owner != null)
         {
             sb.append(owner);
diff --git a/gnu/java/lang/reflect/TypeSignature.java b/gnu/java/lang/reflect/TypeSignature.java
index 78c171837..612058dbf 100644
--- a/gnu/java/lang/reflect/TypeSignature.java
+++ b/gnu/java/lang/reflect/TypeSignature.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.lang.reflect;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
@@ -239,7 +241,7 @@ public class TypeSignature
   public static String getEncodingOfMethod(Method m)
   {
     Class[] paramTypes = m.getParameterTypes();
-    StringBuilder buf = new StringBuilder("(");
+    CPStringBuilder buf = new CPStringBuilder("(");
     for (int i = 0; i < paramTypes.length; i++)
       buf.append(getEncodingOfClass(paramTypes[i].getName(), true));
     buf.append(')').append(getEncodingOfClass(m.getReturnType().getName(),
@@ -261,7 +263,7 @@ public class TypeSignature
   public static String getEncodingOfConstructor(Constructor c)
   {
     Class[] paramTypes = c.getParameterTypes();
-    StringBuilder buf = new StringBuilder("(");
+    CPStringBuilder buf = new CPStringBuilder("(");
     for (int i = 0; i < paramTypes.length; i++)
       buf.append(getEncodingOfClass(paramTypes[i].getName(), true));
     buf.append(")V");
diff --git a/gnu/java/net/protocol/http/ChunkedInputStream.java b/gnu/java/net/protocol/http/ChunkedInputStream.java
index 8abef71d5..8a30e51db 100644
--- a/gnu/java/net/protocol/http/ChunkedInputStream.java
+++ b/gnu/java/net/protocol/http/ChunkedInputStream.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.net.protocol.http;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.ProtocolException;
@@ -113,7 +115,7 @@ public class ChunkedInputStream
         // Read chunk header
         int c, last = 0;
         boolean seenSemi = false;
-        StringBuilder buf = new StringBuilder();
+        CPStringBuilder buf = new CPStringBuilder();
         do
           {
             c = in.read();
diff --git a/gnu/java/net/protocol/http/Cookie.java b/gnu/java/net/protocol/http/Cookie.java
index 0be7a097e..4482a121e 100644
--- a/gnu/java/net/protocol/http/Cookie.java
+++ b/gnu/java/net/protocol/http/Cookie.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.net.protocol.http;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.Date;
 
 /**
@@ -139,7 +141,7 @@ public class Cookie
   
   public String toString(boolean showPath, boolean showDomain)
   {
-    StringBuilder buf = new StringBuilder();
+    CPStringBuilder buf = new CPStringBuilder();
     buf.append(name);
     buf.append('=');
     buf.append(value);
diff --git a/gnu/java/net/protocol/http/HTTPConnection.java b/gnu/java/net/protocol/http/HTTPConnection.java
index 9d19bfbdb..44b1a608a 100644
--- a/gnu/java/net/protocol/http/HTTPConnection.java
+++ b/gnu/java/net/protocol/http/HTTPConnection.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 package gnu.java.net.protocol.http;
 
 import gnu.classpath.SystemProperties;
+
+import gnu.java.lang.CPStringBuilder;
 import gnu.java.net.EmptyX509TrustManager;
 
 import java.io.BufferedInputStream;
@@ -668,7 +670,7 @@ public class HTTPConnection
         Cookie[] cookies = cookieManager.getCookies(hostname, secure, path);
         if (cookies != null && cookies.length > 0)
           {
-            StringBuilder buf = new StringBuilder();
+            CPStringBuilder buf = new CPStringBuilder();
             buf.append("$Version=1");
             for (int i = 0; i < cookies.length; i++)
               {
@@ -827,7 +829,7 @@ public class HTTPConnection
    */
   protected String getURI()
   {
-    StringBuilder buf = new StringBuilder();
+    CPStringBuilder buf = new CPStringBuilder();
     buf.append(secure ? "https://" : "http://");
     buf.append(hostname);
     if (secure)
diff --git a/gnu/java/net/protocol/http/Headers.java b/gnu/java/net/protocol/http/Headers.java
index c8736bbac..690a0c65b 100644
--- a/gnu/java/net/protocol/http/Headers.java
+++ b/gnu/java/net/protocol/http/Headers.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.net.protocol.http;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.net.LineInputStream;
 
 import java.io.IOException;
@@ -280,7 +282,7 @@ class Headers implements Iterable<Headers.HeaderElement>
       (LineInputStream) in : new LineInputStream(in);
     
     String name = null;
-    StringBuilder value = new StringBuilder();
+    CPStringBuilder value = new CPStringBuilder();
     while (true)
       {
         String line = lin.readLine();
diff --git a/gnu/java/net/protocol/http/Request.java b/gnu/java/net/protocol/http/Request.java
index 90e3b7a0d..88e2fd077 100644
--- a/gnu/java/net/protocol/http/Request.java
+++ b/gnu/java/net/protocol/http/Request.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package gnu.java.net.protocol.http;
 
+import gnu.java.lang.CPStringBuilder;
 import gnu.java.net.LineInputStream;
 import gnu.java.util.Base64;
 
@@ -628,7 +629,7 @@ public class Request
   {
     int len = text.length();
     String key = null;
-    StringBuilder buf = new StringBuilder();
+    CPStringBuilder buf = new CPStringBuilder();
     Properties ret = new Properties();
     boolean inQuote = false;
     for (int i = 0; i < len; i++)
@@ -681,7 +682,7 @@ public class Request
   {
     int nc = connection.getNonceCount(nonce);
     String hex = Integer.toHexString(nc);
-    StringBuilder buf = new StringBuilder();
+    CPStringBuilder buf = new CPStringBuilder();
     for (int i = 8 - hex.length(); i > 0; i--)
       {
         buf.append('0');
@@ -752,7 +753,7 @@ public class Request
 
     int len = text.length();
     String attr = null;
-    StringBuilder buf = new StringBuilder();
+    CPStringBuilder buf = new CPStringBuilder();
     boolean inQuote = false;
     for (int i = 0; i <= len; i++)
       {
diff --git a/java/lang/reflect/Modifier.java b/java/lang/reflect/Modifier.java
index 20080eeb0..45d9b51a7 100644
--- a/java/lang/reflect/Modifier.java
+++ b/java/lang/reflect/Modifier.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.lang.reflect;
 
-import gnu.classpath.CPStringBuilder;
+import gnu.java.lang.CPStringBuilder;
 
 /**
  * Modifier is a helper class with static methods to determine whether an
diff --git a/java/util/Formatter.java b/java/util/Formatter.java
index 82130782e..cb6d84345 100644
--- a/java/util/Formatter.java
+++ b/java/util/Formatter.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -470,7 +472,7 @@ public final class Formatter
    * @param width the width of the numeric value.
    * @param isNegative true if the value is negative.
    */
-  private void applyLocalization(StringBuilder builder, int flags, int width,
+  private void applyLocalization(CPStringBuilder builder, int flags, int width,
 				 boolean isNegative)
   {
     DecimalFormatSymbols dfsyms;
@@ -741,9 +743,9 @@ public final class Formatter
    * @param conversion the conversion character.
    * @return the result.
    */
-  private StringBuilder basicIntegralConversion(Object arg, int flags,
-						int width, int precision,
-						int radix, char conversion)
+  private CPStringBuilder basicIntegralConversion(Object arg, int flags,
+						  int width, int precision,
+						  int radix, char conversion)
   {
     assert radix == 8 || radix == 10 || radix == 16;
     noPrecision(precision);
@@ -798,7 +800,7 @@ public final class Formatter
     else
       throw new IllegalFormatConversionException(conversion, arg.getClass());
 
-    return new StringBuilder(result);
+    return new CPStringBuilder(result);
   }
 
   /** 
@@ -819,9 +821,9 @@ public final class Formatter
   {
     assert radix == 8 || radix == 16;
 
-    StringBuilder builder = basicIntegralConversion(arg, flags, width,
-						    precision, radix,
-						    conversion);
+    CPStringBuilder builder = basicIntegralConversion(arg, flags, width,
+						      precision, radix,
+						      conversion);
     int insertPoint = 0;
 
     // Insert the sign.
@@ -897,9 +899,9 @@ public final class Formatter
 				 int precision, char conversion)
     throws IOException
   {
-    StringBuilder builder = basicIntegralConversion(arg, flags, width,
-						    precision, 10,
-						    conversion);
+    CPStringBuilder builder = basicIntegralConversion(arg, flags, width,
+						      precision, 10,
+						      conversion);
     boolean isNegative = false;
     if (builder.charAt(0) == '-')
       {
diff --git a/vm/reference/java/lang/reflect/Constructor.java b/vm/reference/java/lang/reflect/Constructor.java
index 05804675f..282e7680b 100644
--- a/vm/reference/java/lang/reflect/Constructor.java
+++ b/vm/reference/java/lang/reflect/Constructor.java
@@ -38,9 +38,8 @@ exception statement from your version. */
 
 package java.lang.reflect;
 
-import gnu.classpath.CPStringBuilder;
-
 import gnu.java.lang.ClassHelper;
+import gnu.java.lang.CPStringBuilder;
 
 import gnu.java.lang.reflect.MethodSignatureParser;
 
diff --git a/vm/reference/java/lang/reflect/Field.java b/vm/reference/java/lang/reflect/Field.java
index 1db1472c7..e0efb6f36 100644
--- a/vm/reference/java/lang/reflect/Field.java
+++ b/vm/reference/java/lang/reflect/Field.java
@@ -38,9 +38,8 @@ exception statement from your version. */
 
 package java.lang.reflect;
 
-import gnu.classpath.CPStringBuilder;
-
 import gnu.java.lang.ClassHelper;
+import gnu.java.lang.CPStringBuilder;
 
 import gnu.java.lang.reflect.FieldSignatureParser;
 
diff --git a/vm/reference/java/lang/reflect/Method.java b/vm/reference/java/lang/reflect/Method.java
index c70ea43bc..e95c54a8c 100644
--- a/vm/reference/java/lang/reflect/Method.java
+++ b/vm/reference/java/lang/reflect/Method.java
@@ -38,9 +38,8 @@ exception statement from your version. */
 
 package java.lang.reflect;
 
-import gnu.classpath.CPStringBuilder;
-
 import gnu.java.lang.ClassHelper;
+import gnu.java.lang.CPStringBuilder;
 
 import gnu.java.lang.reflect.MethodSignatureParser;