1.1 --- a/lib/java/lang/reflect/Constructor.java	Tue Mar 11 03:01:19 2008 +0000
     1.2 +++ b/lib/java/lang/reflect/Constructor.java	Wed Jun 04 02:46:32 2008 +0100
     1.3 @@ -43,6 +43,8 @@
     1.4  package java.lang.reflect;
     1.5  
     1.6  import gnu.java.lang.ClassHelper;
     1.7 +import gnu.java.lang.CPStringBuilder;
     1.8 +
     1.9  import gnu.java.lang.reflect.MethodSignatureParser;
    1.10  import java.util.Arrays;
    1.11  import java.lang.annotation.Annotation;
    1.12 @@ -231,7 +233,7 @@
    1.13    public String toString()
    1.14    {
    1.15      // 128 is a reasonable buffer initial size for constructor
    1.16 -    StringBuilder sb = new StringBuilder(128);
    1.17 +    CPStringBuilder sb = new CPStringBuilder(128);
    1.18      Modifier.toString(getModifiers(), sb).append(' ');
    1.19      sb.append(getDeclaringClass().getName()).append('(');
    1.20      Class[] c = getParameterTypes();
    1.21 @@ -253,7 +255,7 @@
    1.22    }
    1.23  
    1.24    /* FIXME[GENERICS]: Add X extends GenericDeclaration and TypeVariable<X> */
    1.25 -  static void addTypeParameters(StringBuilder sb, TypeVariable[] typeArgs)
    1.26 +  static void addTypeParameters(CPStringBuilder sb, TypeVariable[] typeArgs)
    1.27    {
    1.28      if (typeArgs.length == 0)
    1.29        return;
    1.30 @@ -269,7 +271,7 @@
    1.31  
    1.32    public String toGenericString()
    1.33    {
    1.34 -    StringBuilder sb = new StringBuilder(128);
    1.35 +    CPStringBuilder sb = new CPStringBuilder(128);
    1.36      Modifier.toString(getModifiers(), sb).append(' ');
    1.37      addTypeParameters(sb, getTypeParameters());
    1.38      sb.append(getDeclaringClass().getName()).append('(');

     2.1 --- a/lib/java/lang/reflect/Field.java	Tue Mar 11 03:01:19 2008 +0000
     2.2 +++ b/lib/java/lang/reflect/Field.java	Wed Jun 04 02:46:32 2008 +0100
     2.3 @@ -44,6 +44,8 @@
     2.4  package java.lang.reflect;
     2.5  
     2.6  import gnu.java.lang.ClassHelper;
     2.7 +import gnu.java.lang.CPStringBuilder;
     2.8 +
     2.9  import gnu.java.lang.reflect.FieldSignatureParser;
    2.10  import java.lang.annotation.Annotation;
    2.11  
    2.12 @@ -204,7 +206,7 @@
    2.13    public String toString()
    2.14    {
    2.15      // 64 is a reasonable buffer initial size for field
    2.16 -    StringBuilder sb = new StringBuilder(64);
    2.17 +    CPStringBuilder sb = new CPStringBuilder(64);
    2.18      Modifier.toString(getModifiers(), sb).append(' ');
    2.19      sb.append(ClassHelper.getUserName(getType())).append(' ');
    2.20      sb.append(getDeclaringClass().getName()).append('.');
    2.21 @@ -214,7 +216,7 @@
    2.22   
    2.23    public String toGenericString()
    2.24    {
    2.25 -    StringBuilder sb = new StringBuilder(64);
    2.26 +    CPStringBuilder sb = new CPStringBuilder(64);
    2.27      Modifier.toString(getModifiers(), sb).append(' ');
    2.28      sb.append(getGenericType()).append(' ');
    2.29      sb.append(getDeclaringClass().getName()).append('.');

     3.1 --- a/lib/java/lang/reflect/Method.java	Tue Mar 11 03:01:19 2008 +0000
     3.2 +++ b/lib/java/lang/reflect/Method.java	Wed Jun 04 02:46:32 2008 +0100
     3.3 @@ -43,6 +43,8 @@
     3.4  package java.lang.reflect;
     3.5  
     3.6  import gnu.java.lang.ClassHelper;
     3.7 +import gnu.java.lang.CPStringBuilder;
     3.8 +
     3.9  import gnu.java.lang.reflect.MethodSignatureParser;
    3.10  import java.lang.annotation.Annotation;
    3.11  import java.util.Arrays;
    3.12 @@ -270,7 +272,7 @@
    3.13    public String toString()
    3.14    {
    3.15      // 128 is a reasonable buffer initial size for constructor
    3.16 -    StringBuilder sb = new StringBuilder(128);
    3.17 +    CPStringBuilder sb = new CPStringBuilder(128);
    3.18      Modifier.toString(getModifiers(), sb).append(' ');
    3.19      sb.append(ClassHelper.getUserName(getReturnType())).append(' ');
    3.20      sb.append(getDeclaringClass().getName()).append('.');
    3.21 @@ -296,7 +298,7 @@
    3.22    public String toGenericString()
    3.23    {
    3.24      // 128 is a reasonable buffer initial size for constructor
    3.25 -    StringBuilder sb = new StringBuilder(128);
    3.26 +    CPStringBuilder sb = new CPStringBuilder(128);
    3.27      Modifier.toString(getModifiers(), sb).append(' ');
    3.28      Constructor.addTypeParameters(sb, getTypeParameters());
    3.29      sb.append(getGenericReturnType()).append(' ');