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

	PR classpath/21869
	* gnu/java/lang/CPStringBuilder.java:
	(substring(int)): Added.
	* gnu/javax/naming/giop/CorbalocParser.java,
	* gnu/javax/naming/giop/GiopNamingServiceFactory.java,
	* gnu/javax/naming/giop/ListBindingsEnumeration.java,
	* gnu/javax/naming/giop/ListEnumeration.java,
	* gnu/javax/naming/ictxImpl/trans/GnuName.java,
	* gnu/javax/net/ssl/PrivateCredentials.java,
	* gnu/javax/net/ssl/Session.java,
	* gnu/javax/net/ssl/provider/HelloRequest.java,
	* gnu/javax/net/ssl/provider/Util.java,
	* gnu/javax/print/ipp/attribute/RequestedAttributes.java,
	* gnu/javax/rmi/CORBA/RmiUtilities.java,
	* gnu/javax/security/auth/callback/AWTCallbackHandler.java,
	* gnu/javax/security/auth/login/ConfigFileTokenizer.java,
	* gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java:
	Swap use of StringBuffer for CPStringBuilder,

15 files changed, 69 insertions, 27 deletions

diff --git a/gnu/java/lang/CPStringBuilder.java b/gnu/java/lang/CPStringBuilder.java
index d6ddca2c5..5d60991cf 100644
--- a/gnu/java/lang/CPStringBuilder.java
+++ b/gnu/java/lang/CPStringBuilder.java
@@ -1079,7 +1079,21 @@ public final class CPStringBuilder
   }
 
   /**
-   * Creates a substring of this StringBuilder, starting at a specified index
+   * Creates a substring of this CPStringBuilder, starting at a specified index
+   * and ending at the end of this StringBuilder.
+   *
+   * @param beginIndex index to start substring (base 0)
+   * @return new String which is a substring of this StringBuilder
+   * @throws StringIndexOutOfBoundsException if beginIndex is out of bounds
+   * @see #substring(int, int)
+   */
+  public String substring(int beginIndex)
+  {
+    return substring(beginIndex, count);
+  }
+
+  /**
+   * Creates a substring of this CPStringBuilder, starting at a specified index
    * and ending at one character before a specified index.
    *
    * @param beginIndex index to start at (inclusive, base 0)
@@ -1099,7 +1113,7 @@ public final class CPStringBuilder
   }
 
   /**
-   * Convert this <code>StringBuilder</code> to a <code>String</code>. The
+   * Convert this <code>CPStringBuilder</code> to a <code>String</code>. The
    * String is composed of the characters currently in this StringBuilder. Note
    * that the result is not a copy, so future modifications to this buffer
    * do affect the String.
diff --git a/gnu/javax/naming/giop/CorbalocParser.java b/gnu/javax/naming/giop/CorbalocParser.java
index 397b1c7d9..95ebb8a06 100644
--- a/gnu/javax/naming/giop/CorbalocParser.java
+++ b/gnu/javax/naming/giop/CorbalocParser.java
@@ -43,6 +43,8 @@ import gnu.CORBA.Unexpected;
 import gnu.CORBA.Version;
 import gnu.CORBA.NamingService.NameTransformer;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -288,7 +290,7 @@ public class CorbalocParser
             ior.Internet.version = new Version(major, minor);
 
             // Then host data goes till '/' or ':'.
-            StringBuffer bhost = new StringBuffer(corbaloc.length());
+            CPStringBuilder bhost = new CPStringBuilder(corbaloc.length());
             while (!t[p].equals(":") && !t[p].equals("/") && !t[p].equals(","))
               bhost.append(t[p++]);
 
@@ -381,7 +383,7 @@ public class CorbalocParser
       {
         InputStreamReader r = new InputStreamReader(u.openStream());
 
-        StringBuffer b = new StringBuffer();
+        CPStringBuilder b = new CPStringBuilder();
         int c;
 
         while ((c = r.read()) > 0)
@@ -418,7 +420,7 @@ public class CorbalocParser
               + "' found");
         }
 
-    StringBuffer bKey = new StringBuffer();
+    CPStringBuilder bKey = new CPStringBuilder();
     p++;
 
     while (p < t.length && !t[p].equals("#"))
diff --git a/gnu/javax/naming/giop/GiopNamingServiceFactory.java b/gnu/javax/naming/giop/GiopNamingServiceFactory.java
index 84aa32413..6c221548f 100644
--- a/gnu/javax/naming/giop/GiopNamingServiceFactory.java
+++ b/gnu/javax/naming/giop/GiopNamingServiceFactory.java
@@ -40,6 +40,8 @@ package gnu.javax.naming.giop;
 
 import gnu.CORBA.OrbFunctional;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -161,7 +163,7 @@ public class GiopNamingServiceFactory
   {
      TreeMap map = new TreeMap();
      map.putAll(props);
-     StringBuffer b = new StringBuffer(50*props.size());
+     CPStringBuilder b = new CPStringBuilder(50*props.size());
      
      Iterator iter = map.entrySet().iterator();
      Map.Entry m;
diff --git a/gnu/javax/naming/giop/ListBindingsEnumeration.java b/gnu/javax/naming/giop/ListBindingsEnumeration.java
index 00f4a0779..68ba49b3f 100644
--- a/gnu/javax/naming/giop/ListBindingsEnumeration.java
+++ b/gnu/javax/naming/giop/ListBindingsEnumeration.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.javax.naming.giop;
 
+import gnu.java.lang.CPStringBuilder;
+
 import javax.naming.NamingEnumeration;
 
 import org.omg.CosNaming.Binding;
@@ -92,7 +94,7 @@ public class ListBindingsEnumeration extends GiopNamingEnumeration implements
    */
   public Object convert(Binding binding)
   {
-    StringBuffer name = new StringBuffer();
+    CPStringBuilder name = new CPStringBuilder();
 
     for (int i = 0; i < binding.binding_name.length; i++)
       {
diff --git a/gnu/javax/naming/giop/ListEnumeration.java b/gnu/javax/naming/giop/ListEnumeration.java
index 2e64e67d3..3fca1e0ab 100644
--- a/gnu/javax/naming/giop/ListEnumeration.java
+++ b/gnu/javax/naming/giop/ListEnumeration.java
@@ -29,7 +29,7 @@ executable, regardless of the license terms of these independent
 modules, and to copy and distribute the resulting executable under
 terms of your choice, provided that you also meet, for each linked
 independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
+odule.  An independent module is a module which is not derived from
 or based on this library.  If you modify this library, you may extend
 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
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.javax.naming.giop;
 
+import gnu.java.lang.CPStringBuilder;
+
 import javax.naming.NameClassPair;
 import javax.naming.NamingEnumeration;
 
@@ -85,7 +87,7 @@ public class ListEnumeration extends GiopNamingEnumeration implements
    */
   public Object convert(Binding binding)
   {
-    StringBuffer name = new StringBuffer();
+    CPStringBuilder name = new CPStringBuilder();
 
     for (int i = 0; i < binding.binding_name.length; i++)
       {
diff --git a/gnu/javax/naming/ictxImpl/trans/GnuName.java b/gnu/javax/naming/ictxImpl/trans/GnuName.java
index b20bfa4ea..b423c721b 100644
--- a/gnu/javax/naming/ictxImpl/trans/GnuName.java
+++ b/gnu/javax/naming/ictxImpl/trans/GnuName.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.javax.naming.ictxImpl.trans;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 
@@ -455,7 +457,7 @@ public class GnuName
    */
   public String toString()
   {
-    StringBuffer b = new StringBuffer();
+    CPStringBuilder b = new CPStringBuilder();
     for (int i = 0; i < length; i++)
       {
         b.append(get(i));
diff --git a/gnu/javax/net/ssl/PrivateCredentials.java b/gnu/javax/net/ssl/PrivateCredentials.java
index 4a37cd8b1..7fff253dd 100644
--- a/gnu/javax/net/ssl/PrivateCredentials.java
+++ b/gnu/javax/net/ssl/PrivateCredentials.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.EOFException;
 import java.io.InputStream;
 import java.io.IOException;
@@ -137,7 +139,7 @@ public class PrivateCredentials implements ManagerFactoryParameters
     boolean encrypted = false;
     String cipher = null;
     String salt = null;
-    StringBuffer base64 = new StringBuffer();
+    CPStringBuilder base64 = new CPStringBuilder();
     while (true)
       {
         line = readLine(privateKey);
@@ -235,7 +237,7 @@ public class PrivateCredentials implements ManagerFactoryParameters
   private String readLine(InputStream in) throws IOException
   {
     boolean eol_is_cr = System.getProperty("line.separator").equals("\r");
-    StringBuffer str = new StringBuffer();
+    CPStringBuilder str = new CPStringBuilder();
     while (true)
       {
         int i = in.read();
diff --git a/gnu/javax/net/ssl/Session.java b/gnu/javax/net/ssl/Session.java
index e2b21aa1e..09b50eef0 100644
--- a/gnu/javax/net/ssl/Session.java
+++ b/gnu/javax/net/ssl/Session.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 import java.security.Principal;
@@ -349,7 +351,7 @@ public abstract class Session implements SSLSession, Serializable
 
     public String toString()
     {
-      StringBuffer str = new StringBuffer (3 * id.length + 1);
+      CPStringBuilder str = new CPStringBuilder (3 * id.length + 1);
       for (int i = 0; i < id.length; i++)
         {
           int x = id[i] & 0xFF;
@@ -361,4 +363,4 @@ public abstract class Session implements SSLSession, Serializable
       return str.toString ();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/gnu/javax/net/ssl/provider/HelloRequest.java b/gnu/javax/net/ssl/provider/HelloRequest.java
index 0ffc26c2b..81dfce591 100644
--- a/gnu/javax/net/ssl/provider/HelloRequest.java
+++ b/gnu/javax/net/ssl/provider/HelloRequest.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * The handshake body for a HelloRequest handshake message.
  *
@@ -51,7 +53,7 @@ public final class HelloRequest implements Handshake.Body
 
   public String toString (final String prefix)
   {
-    StringBuffer str = new StringBuffer ();
+    CPStringBuilder str = new CPStringBuilder ();
     if (prefix != null)
       str.append (prefix);
     str.append ("HelloRequest { };");
diff --git a/gnu/javax/net/ssl/provider/Util.java b/gnu/javax/net/ssl/provider/Util.java
index ba8ea7db7..57f637c18 100644
--- a/gnu/javax/net/ssl/provider/Util.java
+++ b/gnu/javax/net/ssl/provider/Util.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
@@ -128,7 +130,7 @@ public final class Util
    */
   public static String toHexString(byte[] buf, int off, int len)
   {
-    StringBuffer str = new StringBuffer();
+    CPStringBuilder str = new CPStringBuilder();
     for (int i = 0; i < len; i++)
       {
         str.append(HEX.charAt(buf[i+off] >>> 4 & 0x0F));
@@ -157,7 +159,7 @@ public final class Util
    */
   public static String toHexString(byte[] buf, int off, int len, char sep)
   {
-    StringBuffer str = new StringBuffer();
+    CPStringBuilder str = new CPStringBuilder();
     for (int i = 0; i < len; i++)
       {
         str.append(HEX.charAt(buf[i+off] >>> 4 & 0x0F));
@@ -194,7 +196,7 @@ public final class Util
   public static String hexDump(byte[] buf, int off, int len, String prefix)
   {
     String nl = getProperty("line.separator");
-    StringBuffer str = new StringBuffer();
+    CPStringBuilder str = new CPStringBuilder();
     int i = 0;
     while (i < len)
       {
@@ -294,7 +296,7 @@ public final class Util
   public static String formatInt(int i, int radix, int len)
   {
     String s = Integer.toString(i, radix);
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     for (int j = 0; j < len - s.length(); j++)
       buf.append("0");
     buf.append(s);
diff --git a/gnu/javax/print/ipp/attribute/RequestedAttributes.java b/gnu/javax/print/ipp/attribute/RequestedAttributes.java
index ae9d32dfd..814fe2d0a 100644
--- a/gnu/javax/print/ipp/attribute/RequestedAttributes.java
+++ b/gnu/javax/print/ipp/attribute/RequestedAttributes.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.javax.print.ipp.attribute;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -117,7 +119,7 @@ public final class RequestedAttributes implements Attribute
    */
   public String toString()
   {
-    StringBuffer b = new StringBuffer();
+    CPStringBuilder b = new CPStringBuilder();
     
     if (attributes.size() > 0)
       b.append(attributes.get(0));
diff --git a/gnu/javax/rmi/CORBA/RmiUtilities.java b/gnu/javax/rmi/CORBA/RmiUtilities.java
index 91bfa3776..df87187ff 100644
--- a/gnu/javax/rmi/CORBA/RmiUtilities.java
+++ b/gnu/javax/rmi/CORBA/RmiUtilities.java
@@ -46,6 +46,8 @@ import gnu.CORBA.CDR.gnuRuntime;
 import gnu.CORBA.CDR.gnuValueStream;
 import gnu.CORBA.CDR.HeadlessInput;
 
+import gnu.java.lang.CPStringBuilder;
+
 import org.omg.CORBA.MARSHAL;
 import org.omg.CORBA.StringValueHelper;
 import org.omg.CORBA.WStringValueHelper;
@@ -393,7 +395,7 @@ public class RmiUtilities
    */
   public static String toHex(long l)
   {
-    StringBuffer b = new StringBuffer();
+    CPStringBuilder b = new CPStringBuilder();
     b.append(Long.toHexString(l).toUpperCase());
     while (b.length() < 16)
       b.insert(0, '0');
@@ -425,7 +427,7 @@ public class RmiUtilities
       return "V";
     else if (type.isArray())
       {
-        StringBuffer l = new StringBuffer("[");
+        CPStringBuilder l = new CPStringBuilder("[");
         Class component = type.getComponentType();
 
         while (component.isArray())
diff --git a/gnu/javax/security/auth/callback/AWTCallbackHandler.java b/gnu/javax/security/auth/callback/AWTCallbackHandler.java
index 539c4a17e..d75ce4104 100644
--- a/gnu/javax/security/auth/callback/AWTCallbackHandler.java
+++ b/gnu/javax/security/auth/callback/AWTCallbackHandler.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.javax.security.auth.callback;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.BorderLayout;
 import java.awt.Button;
 import java.awt.Dialog;
@@ -238,8 +240,8 @@ public class AWTCallbackHandler extends AbstractCallbackHandler
     int defind = 0;
     for (int i = 0; i < locales.length; i++)
       {
-        StringBuffer lang =
-          new StringBuffer(locales[i].getDisplayLanguage(locales[i]));
+        CPStringBuilder lang =
+          new CPStringBuilder(locales[i].getDisplayLanguage(locales[i]));
         String country = locales[i].getDisplayCountry(locales[i]);
         String variant = locales[i].getDisplayVariant(locales[i]);
         if (country.length() > 0 && variant.length() > 0)
diff --git a/gnu/javax/security/auth/login/ConfigFileTokenizer.java b/gnu/javax/security/auth/login/ConfigFileTokenizer.java
index 06a1d2c7c..0235c6971 100644
--- a/gnu/javax/security/auth/login/ConfigFileTokenizer.java
+++ b/gnu/javax/security/auth/login/ConfigFileTokenizer.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.javax.security.auth.login;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.security.Configuration;
 
 import java.io.BufferedReader;
@@ -92,7 +94,7 @@ public class ConfigFileTokenizer
 
   private BufferedReader br;
   boolean initialised;
-  private StringBuffer sb;
+  private CPStringBuilder sb;
   private int sbNdx;
 
   // Constructor(s)
@@ -185,7 +187,7 @@ public class ConfigFileTokenizer
 
   private void init() throws IOException
   {
-    sb = new StringBuffer();
+    sb = new CPStringBuilder();
     String line;
     while ((line = br.readLine()) != null)
       {
diff --git a/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java b/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
index b90caef24..0514c937a 100644
--- a/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
+++ b/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.javax.sound.sampled.gstreamer.io;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.javax.sound.sampled.gstreamer.GStreamerMixer;
 
 import java.io.BufferedInputStream;
@@ -65,7 +67,7 @@ public class GstAudioFileReader
   public AudioFileFormat getAudioFileFormat(File file)
       throws UnsupportedAudioFileException, IOException
   {
-    StringBuffer name = new StringBuffer(file.getName());
+    CPStringBuilder name = new CPStringBuilder(file.getName());
     String _name = name.substring(name.lastIndexOf(".") + 1);
     
     return getAudioFileFormat(