As subject.
ChangeLog:
2008-05-05 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* gnu/CORBA/BigDecimalHelper.java,
* gnu/CORBA/CDR/LittleEndianInputStream.java,
* gnu/CORBA/CDR/Vio.java,
* gnu/CORBA/CDR/gnuRuntime.java,
* gnu/CORBA/GIOP/MessageHeader.java,
* gnu/CORBA/GIOP/RequestHeader.java,
* gnu/CORBA/GIOP/v1_0/ReplyHeader.java,
* gnu/CORBA/GIOP/v1_0/RequestHeader.java,
* gnu/CORBA/IOR.java,
* gnu/CORBA/NamingService/NameParser.java,
* gnu/CORBA/NamingService/NameTransformer.java,
* gnu/CORBA/Poa/gnuPOA.java,
* gnu/CORBA/Poa/gnuServantObject.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/CORBA/BigDecimalHelper.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/BigDecimalHelper.java,v
retrieving revision 1.4
diff -u -r1.4 BigDecimalHelper.java
--- gnu/CORBA/BigDecimalHelper.java 7 Jan 2008 21:11:18 -0000 1.4
+++ gnu/CORBA/BigDecimalHelper.java 5 May 2008 00:24:07 -0000
@@ -38,6 +38,8 @@
package gnu.CORBA;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -135,7 +137,7 @@
public static void write(java.io.OutputStream out, BigDecimal x)
throws IOException, BadKind
{
- StringBuffer v = new StringBuffer(x.unscaledValue().toString());
+ CPStringBuilder v = new CPStringBuilder(x.unscaledValue().toString());
boolean negative = v.charAt(0) == '-';
@@ -165,7 +167,7 @@
*/
private static BigDecimal createFixed(int scale, byte[] d)
{
- StringBuffer s = new StringBuffer(2 * d.length);
+ CPStringBuilder s = new CPStringBuilder(2 * d.length);
int last = d.length - 1;
Index: gnu/CORBA/IOR.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/IOR.java,v
retrieving revision 1.13
diff -u -r1.13 IOR.java
--- gnu/CORBA/IOR.java 7 Jan 2008 21:11:18 -0000 1.13
+++ gnu/CORBA/IOR.java 5 May 2008 00:24:07 -0000
@@ -45,6 +45,8 @@
import gnu.CORBA.GIOP.CharSets_OSF;
import gnu.CORBA.GIOP.CodeSetServiceContext;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.CompletionStatus;
import org.omg.CORBA.MARSHAL;
@@ -126,7 +128,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
b.append("native " + name(native_set));
if (conversion != null && conversion.length > 0)
{
@@ -146,7 +148,7 @@
*/
public String toStringFormatted()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
b.append("\n Native set " + name(native_set));
if (conversion != null && conversion.length > 0)
{
@@ -282,7 +284,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
b.append(host);
b.append(":");
b.append(port);
@@ -591,7 +593,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
b.append(Id);
b.append(" at ");
b.append(Internet);
@@ -618,7 +620,7 @@
*/
public String toStringFormatted()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
b.append("\nObject Id:\n ");
b.append(Id);
b.append("\nObject is accessible at:\n ");
@@ -656,7 +658,7 @@
_write(out);
- StringBuffer b = new StringBuffer("IOR:");
+ CPStringBuilder b = new CPStringBuilder("IOR:");
byte[] binary = out.buffer.toByteArray();
String s;
@@ -819,4 +821,4 @@
}
return (int) adler.getValue();
}
-}
\ No newline at end of file
+}
Index: gnu/CORBA/CDR/LittleEndianInputStream.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/CORBA/CDR/LittleEndianInputStream.java,v
retrieving revision 1.4
diff -u -r1.4 LittleEndianInputStream.java
--- gnu/CORBA/CDR/LittleEndianInputStream.java 18 Sep 2007 21:52:26 -0000
1.4
+++ gnu/CORBA/CDR/LittleEndianInputStream.java 5 May 2008 00:24:08 -0000
@@ -38,6 +38,8 @@
package gnu.CORBA.CDR;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.EOFException;
import java.io.FilterInputStream;
import java.io.IOException;
@@ -360,7 +362,7 @@
public String readLine()
throws IOException
{
- StringBuffer strb = new StringBuffer();
+ CPStringBuilder strb = new CPStringBuilder();
while (true)
{
@@ -629,4 +631,4 @@
{
throw new InternalError();
}
-}
\ No newline at end of file
+}
Index: gnu/CORBA/CDR/Vio.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/CDR/Vio.java,v
retrieving revision 1.10
diff -u -r1.10 Vio.java
--- gnu/CORBA/CDR/Vio.java 21 Sep 2007 18:05:20 -0000 1.10
+++ gnu/CORBA/CDR/Vio.java 5 May 2008 00:24:09 -0000
@@ -41,6 +41,8 @@
import gnu.CORBA.Minor;
import gnu.CORBA.ObjectCreator;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.CustomMarshal;
import org.omg.CORBA.DataInputStream;
import org.omg.CORBA.DataOutputStream;
@@ -754,7 +756,7 @@
return "null";
else
{
- StringBuffer b = new StringBuffer("{");
+ CPStringBuilder b = new CPStringBuilder("{");
for (int i = 0; i < s.length; i++)
{
b.append(s[i]);
@@ -1469,4 +1471,4 @@
return VMVio.allocateObject(clazz, constructor.getDeclaringClass(),
constructor);
}
-}
\ No newline at end of file
+}
Index: gnu/CORBA/CDR/gnuRuntime.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/CDR/gnuRuntime.java,v
retrieving revision 1.4
diff -u -r1.4 gnuRuntime.java
--- gnu/CORBA/CDR/gnuRuntime.java 7 Jan 2008 21:11:19 -0000 1.4
+++ gnu/CORBA/CDR/gnuRuntime.java 5 May 2008 00:24:09 -0000
@@ -40,6 +40,8 @@
import gnu.CORBA.Minor;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.LocalObject;
import org.omg.CORBA.MARSHAL;
@@ -318,7 +320,7 @@
*/
public String dump()
{
- StringBuffer b = new StringBuffer(" Stream content: \n");
+ CPStringBuilder b = new CPStringBuilder(" Stream content: \n");
// Sort by position.
TreeSet t = new TreeSet(positions.keySet());
Index: gnu/CORBA/GIOP/MessageHeader.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/GIOP/MessageHeader.java,v
retrieving revision 1.12
diff -u -r1.12 MessageHeader.java
--- gnu/CORBA/GIOP/MessageHeader.java 21 Sep 2007 18:05:21 -0000 1.12
+++ gnu/CORBA/GIOP/MessageHeader.java 5 May 2008 00:24:09 -0000
@@ -47,6 +47,8 @@
import gnu.CORBA.CDR.AbstractDataInput;
import gnu.CORBA.CDR.AbstractDataOutput;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.MARSHAL;
import org.omg.CORBA.portable.IDLEntity;
@@ -286,7 +288,7 @@
int minor;
if (! Arrays.equals(xMagic, MAGIC))
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
if (r == - 1)
{
b.append("Immediate EOF");
@@ -460,4 +462,4 @@
throw m;
}
}
-}
\ No newline at end of file
+}
Index: gnu/CORBA/GIOP/RequestHeader.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/GIOP/RequestHeader.java,v
retrieving revision 1.5
diff -u -r1.5 RequestHeader.java
--- gnu/CORBA/GIOP/RequestHeader.java 28 Oct 2005 14:05:21 -0000 1.5
+++ gnu/CORBA/GIOP/RequestHeader.java 5 May 2008 00:24:09 -0000
@@ -41,6 +41,8 @@
import gnu.CORBA.CDR.AbstractCdrInput;
import gnu.CORBA.CDR.AbstractCdrOutput;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.portable.IDLEntity;
/**
@@ -123,7 +125,7 @@
*/
public String bytes(byte[] array)
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < array.length; i++)
{
b.append(Integer.toHexString(array[i] & 0xFF));
Index: gnu/CORBA/GIOP/v1_0/ReplyHeader.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/GIOP/v1_0/ReplyHeader.java,v
retrieving revision 1.4
diff -u -r1.4 ReplyHeader.java
--- gnu/CORBA/GIOP/v1_0/ReplyHeader.java 28 Oct 2005 14:05:21 -0000
1.4
+++ gnu/CORBA/GIOP/v1_0/ReplyHeader.java 5 May 2008 00:24:10 -0000
@@ -43,6 +43,8 @@
import gnu.CORBA.GIOP.ServiceContext;
import gnu.CORBA.GIOP.CodeSetServiceContext;
+import gnu.java.lang.CPStringBuilder;
+
/**
* The header of the standard reply.
*
@@ -80,7 +82,7 @@
*/
public String contexts()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < service_context.length; i++)
{
b.append(service_context [ i ].toString());
Index: gnu/CORBA/GIOP/v1_0/RequestHeader.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/GIOP/v1_0/RequestHeader.java,v
retrieving revision 1.5
diff -u -r1.5 RequestHeader.java
--- gnu/CORBA/GIOP/v1_0/RequestHeader.java 28 Oct 2005 14:05:21 -0000
1.5
+++ gnu/CORBA/GIOP/v1_0/RequestHeader.java 5 May 2008 00:24:10 -0000
@@ -43,6 +43,8 @@
import gnu.CORBA.GIOP.ServiceContext;
import gnu.CORBA.GIOP.CodeSetServiceContext;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.portable.IDLEntity;
/**
@@ -81,7 +83,7 @@
public String bytes(byte[] array)
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < array.length; i++)
{
b.append(Integer.toHexString(array [ i ] & 0xFF));
@@ -95,7 +97,7 @@
*/
public String contexts()
{
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
for (int i = 0; i < service_context.length; i++)
{
b.append(service_context [ i ].toString());
Index: gnu/CORBA/NamingService/NameParser.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/NamingService/NameParser.java,v
retrieving revision 1.9
diff -u -r1.9 NameParser.java
--- gnu/CORBA/NamingService/NameParser.java 18 Sep 2007 21:52:27 -0000
1.9
+++ gnu/CORBA/NamingService/NameParser.java 5 May 2008 00:24:10 -0000
@@ -44,6 +44,8 @@
import gnu.CORBA.Unexpected;
import gnu.CORBA.Version;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.DATA_CONVERSION;
import org.omg.CORBA.ORB;
@@ -301,7 +303,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++]);
@@ -394,7 +396,7 @@
{
InputStreamReader r = new InputStreamReader(u.openStream());
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
int c;
while ((c = r.read()) > 0)
@@ -465,7 +467,7 @@
+ "' found");
}
- StringBuffer bKey = new StringBuffer();
+ CPStringBuilder bKey = new CPStringBuilder();
p++;
while (p < t.length && !t[p].equals("#"))
Index: gnu/CORBA/NamingService/NameTransformer.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/CORBA/NamingService/NameTransformer.java,v
retrieving revision 1.3
diff -u -r1.3 NameTransformer.java
--- gnu/CORBA/NamingService/NameTransformer.java 7 Jan 2008 21:11:19
-0000 1.3
+++ gnu/CORBA/NamingService/NameTransformer.java 5 May 2008 00:24:10
-0000
@@ -38,6 +38,8 @@
package gnu.CORBA.NamingService;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.IntHolder;
import org.omg.CosNaming.NameComponent;
import org.omg.CosNaming.NamingContextPackage.InvalidName;
@@ -125,7 +127,7 @@
{
NameValidator.check(a_name);
- StringBuffer b = new StringBuffer();
+ CPStringBuilder b = new CPStringBuilder();
NameComponent n;
@@ -152,7 +154,7 @@
* @param b a buffer to append the contents to.
* @param s a string to append.
*/
- private void appEscaping(StringBuffer b, String s)
+ private void appEscaping(CPStringBuilder b, String s)
{
char c;
for (int i = 0; i < s.length(); i++)
@@ -271,7 +273,7 @@
*/
private String readPart(IntHolder p, String[] t)
{
- StringBuffer part = new StringBuffer();
+ CPStringBuilder part = new CPStringBuilder();
while (t [ p.value ] != null && !t [ p.value ].equals(".") &&
!t [ p.value ].equals("/")
Index: gnu/CORBA/Poa/gnuPOA.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/Poa/gnuPOA.java,v
retrieving revision 1.10
diff -u -r1.10 gnuPOA.java
--- gnu/CORBA/Poa/gnuPOA.java 7 Jan 2008 21:11:20 -0000 1.10
+++ gnu/CORBA/Poa/gnuPOA.java 5 May 2008 00:24:13 -0000
@@ -38,6 +38,8 @@
package gnu.CORBA.Poa;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -1604,7 +1606,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer(name);
+ CPStringBuilder b = new CPStringBuilder(name);
if (children.size() != 0)
{
Index: gnu/CORBA/Poa/gnuServantObject.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/CORBA/Poa/gnuServantObject.java,v
retrieving revision 1.10
diff -u -r1.10 gnuServantObject.java
--- gnu/CORBA/Poa/gnuServantObject.java 7 Jan 2008 21:11:20 -0000 1.10
+++ gnu/CORBA/Poa/gnuServantObject.java 5 May 2008 00:24:13 -0000
@@ -51,6 +51,8 @@
import gnu.CORBA.ResponseHandlerImpl;
import gnu.CORBA.StreamHolder;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.Any;
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.BAD_PARAM;
@@ -357,7 +359,7 @@
*/
public String toString()
{
- StringBuffer b = new StringBuffer("Servant object (");
+ CPStringBuilder b = new CPStringBuilder("Servant object (");
for (int i = 0; i < Id.length; i++)
{
b.append(Integer.toHexString(Id [ i ] & 0xFF));
@@ -820,4 +822,4 @@
}
return super._is_equivalent(other);
}
-}
\ No newline at end of file
+}
