ChangeLog:
2008-05-05 Andrew John Hughes <[EMAIL PROTECTED]>
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,
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: gnu/java/lang/CPStringBuilder.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/lang/CPStringBuilder.java,v
retrieving revision 1.5
diff -u -r1.5 CPStringBuilder.java
--- gnu/java/lang/CPStringBuilder.java 5 May 2008 18:42:06 -0000 1.5
+++ gnu/java/lang/CPStringBuilder.java 5 May 2008 22:04:07 -0000
@@ -1079,7 +1079,21 @@
}
/**
- * 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 @@
}
/**
- * 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.
Index: gnu/javax/naming/giop/CorbalocParser.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/naming/giop/CorbalocParser.java,v
retrieving revision 1.1
diff -u -r1.1 CorbalocParser.java
--- gnu/javax/naming/giop/CorbalocParser.java 7 Aug 2006 01:04:15 -0000
1.1
+++ gnu/javax/naming/giop/CorbalocParser.java 5 May 2008 22:04:08 -0000
@@ -43,6 +43,8 @@
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 @@
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 @@
{
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 @@
+ "' found");
}
- StringBuffer bKey = new StringBuffer();
+ CPStringBuilder bKey = new CPStringBuilder();
p++;
while (p < t.length && !t[p].equals("#"))
Index: gnu/javax/naming/giop/GiopNamingServiceFactory.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/naming/giop/GiopNamingServiceFactory.java,v
retrieving revision 1.1
diff -u -r1.1 GiopNamingServiceFactory.java
--- gnu/javax/naming/giop/GiopNamingServiceFactory.java 7 Aug 2006 01:04:15
-0000 1.1
+++ gnu/javax/naming/giop/GiopNamingServiceFactory.java 5 May 2008 22:04:08
-0000
@@ -40,6 +40,8 @@
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 @@
{
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;
Index: gnu/javax/naming/giop/ListBindingsEnumeration.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/naming/giop/ListBindingsEnumeration.java,v
retrieving revision 1.1
diff -u -r1.1 ListBindingsEnumeration.java
--- gnu/javax/naming/giop/ListBindingsEnumeration.java 7 Aug 2006 01:04:15
-0000 1.1
+++ gnu/javax/naming/giop/ListBindingsEnumeration.java 5 May 2008 22:04:09
-0000
@@ -38,6 +38,8 @@
package gnu.javax.naming.giop;
+import gnu.java.lang.CPStringBuilder;
+
import javax.naming.NamingEnumeration;
import org.omg.CosNaming.Binding;
@@ -92,7 +94,7 @@
*/
public Object convert(Binding binding)
{
- StringBuffer name = new StringBuffer();
+ CPStringBuilder name = new CPStringBuilder();
for (int i = 0; i < binding.binding_name.length; i++)
{
Index: gnu/javax/naming/giop/ListEnumeration.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/naming/giop/ListEnumeration.java,v
retrieving revision 1.1
diff -u -r1.1 ListEnumeration.java
--- gnu/javax/naming/giop/ListEnumeration.java 7 Aug 2006 01:04:15 -0000
1.1
+++ gnu/javax/naming/giop/ListEnumeration.java 5 May 2008 22:04:09 -0000
@@ -29,7 +29,7 @@
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 @@
package gnu.javax.naming.giop;
+import gnu.java.lang.CPStringBuilder;
+
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
@@ -85,7 +87,7 @@
*/
public Object convert(Binding binding)
{
- StringBuffer name = new StringBuffer();
+ CPStringBuilder name = new CPStringBuilder();
for (int i = 0; i < binding.binding_name.length; i++)
{
Index: gnu/javax/naming/ictxImpl/trans/GnuName.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/naming/ictxImpl/trans/GnuName.java,v
retrieving revision 1.1
diff -u -r1.1 GnuName.java
--- gnu/javax/naming/ictxImpl/trans/GnuName.java 4 Aug 2006 09:59:49
-0000 1.1
+++ gnu/javax/naming/ictxImpl/trans/GnuName.java 5 May 2008 22:04:09
-0000
@@ -37,6 +37,8 @@
package gnu.javax.naming.ictxImpl.trans;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Enumeration;
import java.util.NoSuchElementException;
@@ -455,7 +457,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < length; i++)
{
b.append(get(i));
Index: gnu/javax/net/ssl/PrivateCredentials.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/net/ssl/PrivateCredentials.java,v
retrieving revision 1.3
diff -u -r1.3 PrivateCredentials.java
--- gnu/javax/net/ssl/PrivateCredentials.java 1 Feb 2007 03:44:59 -0000
1.3
+++ gnu/javax/net/ssl/PrivateCredentials.java 5 May 2008 22:04:09 -0000
@@ -38,6 +38,8 @@
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 @@
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 @@
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();
Index: gnu/javax/net/ssl/Session.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/net/ssl/Session.java,v
retrieving revision 1.2
diff -u -r1.2 Session.java
--- gnu/javax/net/ssl/Session.java 10 Dec 2006 20:25:42 -0000 1.2
+++ gnu/javax/net/ssl/Session.java 5 May 2008 22:04:11 -0000
@@ -38,6 +38,8 @@
package gnu.javax.net.ssl;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
import java.security.Principal;
@@ -349,7 +351,7 @@
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 @@
return str.toString ();
}
}
-}
\ No newline at end of file
+}
Index: gnu/javax/net/ssl/provider/HelloRequest.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/net/ssl/provider/HelloRequest.java,v
retrieving revision 1.2
diff -u -r1.2 HelloRequest.java
--- gnu/javax/net/ssl/provider/HelloRequest.java 10 Dec 2006 20:25:42
-0000 1.2
+++ gnu/javax/net/ssl/provider/HelloRequest.java 5 May 2008 22:04:11
-0000
@@ -38,6 +38,8 @@
package gnu.javax.net.ssl.provider;
+import gnu.java.lang.CPStringBuilder;
+
/**
* The handshake body for a HelloRequest handshake message.
*
@@ -51,7 +53,7 @@
public String toString (final String prefix)
{
- StringBuffer str = new StringBuffer ();
+ CPStringBuilder str = new CPStringBuilder ();
if (prefix != null)
str.append (prefix);
str.append ("HelloRequest { };");
Index: gnu/javax/net/ssl/provider/Util.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/net/ssl/provider/Util.java,v
retrieving revision 1.2
diff -u -r1.2 Util.java
--- gnu/javax/net/ssl/provider/Util.java 10 Dec 2006 20:25:43 -0000
1.2
+++ gnu/javax/net/ssl/provider/Util.java 5 May 2008 22:04:11 -0000
@@ -38,6 +38,8 @@
package gnu.javax.net.ssl.provider;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -128,7 +130,7 @@
*/
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 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 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 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);
Index: gnu/javax/print/ipp/attribute/RequestedAttributes.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/print/ipp/attribute/RequestedAttributes.java,v
retrieving revision 1.1
diff -u -r1.1 RequestedAttributes.java
--- gnu/javax/print/ipp/attribute/RequestedAttributes.java 13 Mar 2006
18:56:15 -0000 1.1
+++ gnu/javax/print/ipp/attribute/RequestedAttributes.java 5 May 2008
22:04:11 -0000
@@ -38,6 +38,8 @@
package gnu.javax.print.ipp.attribute;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.ArrayList;
import java.util.List;
@@ -117,7 +119,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
if (attributes.size() > 0)
b.append(attributes.get(0));
Index: gnu/javax/rmi/CORBA/RmiUtilities.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/rmi/CORBA/RmiUtilities.java,v
retrieving revision 1.2
diff -u -r1.2 RmiUtilities.java
--- gnu/javax/rmi/CORBA/RmiUtilities.java 28 Oct 2005 13:01:52 -0000
1.2
+++ gnu/javax/rmi/CORBA/RmiUtilities.java 5 May 2008 22:04:11 -0000
@@ -46,6 +46,8 @@
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 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 @@
return "V";
else if (type.isArray())
{
- StringBuffer l = new StringBuffer("[");
+ CPStringBuilder l = new CPStringBuilder("[");
Class component = type.getComponentType();
while (component.isArray())
Index: gnu/javax/security/auth/callback/AWTCallbackHandler.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/security/auth/callback/AWTCallbackHandler.java,v
retrieving revision 1.1
diff -u -r1.1 AWTCallbackHandler.java
--- gnu/javax/security/auth/callback/AWTCallbackHandler.java 26 Jan 2006
02:25:10 -0000 1.1
+++ gnu/javax/security/auth/callback/AWTCallbackHandler.java 5 May 2008
22:04:11 -0000
@@ -38,6 +38,8 @@
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 @@
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)
Index: gnu/javax/security/auth/login/ConfigFileTokenizer.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java,v
retrieving revision 1.3
diff -u -r1.3 ConfigFileTokenizer.java
--- gnu/javax/security/auth/login/ConfigFileTokenizer.java 25 Jun 2006
22:45:26 -0000 1.3
+++ gnu/javax/security/auth/login/ConfigFileTokenizer.java 5 May 2008
22:04:11 -0000
@@ -38,6 +38,8 @@
package gnu.javax.security.auth.login;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Configuration;
import java.io.BufferedReader;
@@ -92,7 +94,7 @@
private BufferedReader br;
boolean initialised;
- private StringBuffer sb;
+ private CPStringBuilder sb;
private int sbNdx;
// Constructor(s)
@@ -185,7 +187,7 @@
private void init() throws IOException
{
- sb = new StringBuffer();
+ sb = new CPStringBuilder();
String line;
while ((line = br.readLine()) != null)
{
Index: gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java,v
retrieving revision 1.4
diff -u -r1.4 GstAudioFileReader.java
--- gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java 18 Sep
2007 21:52:32 -0000 1.4
+++ gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java 5 May
2008 22:04:12 -0000
@@ -37,6 +37,8 @@
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 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(
