svn commit: r312566 - in /jakarta/bcel/trunk/src/java/org/apache/bcel: classfile/ generic/ util/
[email protected] Mon, 10 Oct 2005 06:04:56 -0000
Newsgroups
gmane.comp.jakarta.bcel.devel
Message-ID
<[email protected] >
Author: dbrosius
Date: Sun Oct 9 23:04:21 2005
New Revision: 312566
URL: http://svn.apache.org/viewcvs?rev=312566&view=rev
Log:
more efficient string buffering
Modified:
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Code.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantPool.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Field.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/InnerClasses.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/JavaClass.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Method.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapEntry.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Synthetic.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConstantPoolGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionList.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MethodGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Select.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/CodeHTML.java
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Code.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Code.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Code.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Code.java Sun Oct 9 23:04:21 2005
@@ -287,23 +287,24 @@
public final String toString(boolean verbose) {
StringBuffer buf;
- buf = new StringBuffer("Code(max_stack = " + max_stack +
- ", max_locals = " + max_locals +
- ", code_length = " + code_length + ")\n" +
- Utility.codeToString(code, constant_pool, 0, -1, verbose));
+ buf = new StringBuffer(100);
+ buf.append("Code(max_stack = ").append(max_stack)
+ .append(", max_locals = ").append(max_locals)
+ .append(", code_length = ").append(code_length).append(")\n")
+ .append(Utility.codeToString(code, constant_pool, 0, -1, verbose));
if(exception_table_length > 0) {
- buf.append("\nException handler(s) = \n" + "From\tTo\tHandler\tType\n");
+ buf.append("\nException handler(s) = \n").append("From\tTo\tHandler\tType\n");
for(int i=0; i < exception_table_length; i++)
- buf.append(exception_table[i].toString(constant_pool, verbose) + "\n");
+ buf.append(exception_table[i].toString(constant_pool, verbose)).append("\n");
}
if(attributes_count > 0) {
buf.append("\nAttribute(s) = \n");
for(int i=0; i < attributes_count; i++)
- buf.append(attributes[i].toString() + "\n");
+ buf.append(attributes[i].toString()).append("\n");
}
return buf.toString();
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantPool.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantPool.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantPool.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantPool.java Sun Oct 9 23:04:21 2005
@@ -310,7 +310,7 @@
StringBuffer buf = new StringBuffer();
for(int i=1; i < constant_pool_count; i++)
- buf.append(i + ")" + constant_pool[i] + "\n");
+ buf.append(i).append(")").append(constant_pool[i]).append("\n");
return buf.toString();
}
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Field.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Field.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Field.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Field.java Sun Oct 9 23:04:21 2005
@@ -115,17 +115,18 @@
signature = Utility.signatureToString(getSignature());
name = getName();
- StringBuffer buf = new StringBuffer(access + signature + " " + name);
+ StringBuffer buf = new StringBuffer(64);
+ buf.append(access).append(signature).append(" ").append(name);
ConstantValue cv = getConstantValue();
if (cv != null)
- buf.append(" = " + cv);
+ buf.append(" = ").append(cv);
for (int i = 0; i < attributes_count; i++) {
Attribute a = attributes[i];
if (!(a instanceof ConstantValue))
- buf.append(" [" + a.toString() + "]");
+ buf.append(" [").append(a.toString()).append("]");
}
return buf.toString();
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/InnerClasses.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/InnerClasses.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/InnerClasses.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/InnerClasses.java Sun Oct 9 23:04:21 2005
@@ -124,7 +124,7 @@
StringBuffer buf = new StringBuffer();
for(int i=0; i < number_of_classes; i++)
- buf.append(inner_classes[i].toString(constant_pool) + "\n");
+ buf.append(inner_classes[i].toString(constant_pool)).append("\n");
return buf.toString();
}
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/JavaClass.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/JavaClass.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/JavaClass.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/JavaClass.java Sun Oct 9 23:04:21 2005
@@ -602,14 +602,14 @@
access = access.equals("") ? "" : (access + " ");
StringBuffer buf =
- new StringBuffer(
- access
- + Utility.classOrInterface(access_flags)
- + " "
- + class_name
- + " extends "
- + Utility.compactClassName(superclass_name, false)
- + '\n');
+ new StringBuffer(128);
+ buf.append(access)
+ .append(Utility.classOrInterface(access_flags))
+ .append(" ")
+ .append(class_name)
+ .append(" extends ")
+ .append(Utility.compactClassName(superclass_name, false))
+ .append('\n');
int size = interfaces.length;
if (size > 0) {
@@ -624,12 +624,12 @@
buf.append('\n');
}
- buf.append("filename\t\t" + file_name + '\n');
- buf.append("compiled from\t\t" + source_file_name + '\n');
- buf.append("compiler version\t" + major + "." + minor + '\n');
- buf.append("access flags\t\t" + access_flags + '\n');
- buf.append("constant pool\t\t" + constant_pool.getLength() + " entries\n");
- buf.append("ACC_SUPER flag\t\t" + isSuper() + "\n");
+ buf.append("filename\t\t").append(file_name).append('\n');
+ buf.append("compiled from\t\t").append(source_file_name).append('\n');
+ buf.append("compiler version\t").append(major).append(".").append(minor).append('\n');
+ buf.append("access flags\t\t").append(access_flags).append('\n');
+ buf.append("constant pool\t\t").append(constant_pool.getLength()).append(" entries\n");
+ buf.append("ACC_SUPER flag\t\t").append(isSuper()).append("\n");
if (attributes.length > 0) {
buf.append("\nAttribute(s):\n");
@@ -638,15 +638,15 @@
}
if (fields.length > 0) {
- buf.append("\n" + fields.length + " fields:\n");
+ buf.append("\n").append(fields.length).append(" fields:\n");
for (int i = 0; i < fields.length; i++)
- buf.append("\t" + fields[i] + '\n');
+ buf.append("\t").append(fields[i]).append('\n');
}
if (methods.length > 0) {
- buf.append("\n" + methods.length + " methods:\n");
+ buf.append("\n").append(methods.length).append(" methods:\n");
for (int i = 0; i < methods.length; i++)
- buf.append("\t" + methods[i] + '\n');
+ buf.append("\t").append(methods[i]).append('\n');
}
return buf.toString();
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Method.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Method.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Method.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Method.java Sun Oct 9 23:04:21 2005
@@ -185,14 +185,14 @@
Attribute a = attributes[i];
if (!((a instanceof Code) || (a instanceof ExceptionTable)))
- buf.append(" [" + a.toString() + "]");
+ buf.append(" [").append(a.toString()).append("]");
}
ExceptionTable e = getExceptionTable();
if (e != null) {
String str = e.toString();
if (!str.equals(""))
- buf.append("\n\t\tthrows " + str);
+ buf.append("\n\t\tthrows ").append(str);
}
return buf.toString();
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapEntry.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapEntry.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapEntry.java Sun Oct 9 23:04:21 2005
@@ -94,15 +94,16 @@
* @return String representation.
*/
public final String toString() {
- StringBuffer buf = new StringBuffer("(offset=" + byte_code_offset);
+ StringBuffer buf = new StringBuffer(64);
+ buf.append("(offset=").append(byte_code_offset);
if(number_of_locals > 0) {
buf.append(", locals={");
for(int i=0; i < number_of_locals; i++) {
- buf.append(types_of_locals[i]);
- if(i < number_of_locals - 1)
- buf.append(", ");
+ buf.append(types_of_locals[i]);
+ if(i < number_of_locals - 1)
+ buf.append(", ");
}
buf.append("}");
@@ -112,9 +113,9 @@
buf.append(", stack items={");
for(int i=0; i < number_of_stack_items; i++) {
- buf.append(types_of_stack_items[i]);
- if(i < number_of_stack_items - 1)
- buf.append(", ");
+ buf.append(types_of_stack_items[i]);
+ if(i < number_of_stack_items - 1)
+ buf.append(", ");
}
buf.append("}");
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Synthetic.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Synthetic.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Synthetic.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Synthetic.java Sun Oct 9 23:04:21 2005
@@ -121,7 +121,7 @@
StringBuffer buf = new StringBuffer("Synthetic");
if(length > 0)
- buf.append(" " + Utility.toHexString(bytes));
+ buf.append(" ").append(Utility.toHexString(bytes));
return buf.toString();
}
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java Sun Oct 9 23:04:21 2005
@@ -111,7 +111,7 @@
if(for_class && ((p == Constants.ACC_SUPER) || (p == Constants.ACC_INTERFACE)))
continue;
- buf.append(Constants.ACCESS_NAMES[i] + " ");
+ buf.append(Constants.ACCESS_NAMES[i]).append(" ");
}
}
@@ -153,7 +153,7 @@
for(int i=0; stream.available() > 0; i++) {
if((length < 0) || (i < length)) {
String indices = fillup(stream.getIndex() + ":", 6, true, ' ');
- buf.append(indices + codeToString(stream, constant_pool, verbose) + '\n');
+ buf.append(indices).append(codeToString(stream, constant_pool, verbose)).append('\n');
}
}
} catch(IOException e) {
@@ -220,8 +220,8 @@
offset = bytes.getIndex() - 12 - no_pad_bytes - 1;
default_offset += offset;
- buf.append("\tdefault = " + default_offset + ", low = " + low +
- ", high = " + high + "(");
+ buf.append("\tdefault = ").append(default_offset).append(", low = ").append(low)
+ .append(", high = ").append(high).append("(");
jump_table = new int[high - low + 1];
for(int i=0; i < jump_table.length; i++) {
@@ -246,15 +246,15 @@
jump_table = new int[npairs];
default_offset += offset;
- buf.append("\tdefault = " + default_offset + ", npairs = " + npairs +
- " (");
+ buf.append("\tdefault = ").append(default_offset).append(", npairs = ").append(npairs)
+ .append(" (");
for(int i=0; i < npairs; i++) {
match[i] = bytes.readInt();
jump_table[i] = offset + bytes.readInt();
- buf.append("(" + match[i] + ", " + jump_table[i] + ")");
+ buf.append("(").append(match[i]).append(", ").append(jump_table[i]).append(")");
if(i < npairs - 1)
buf.append(", ");
@@ -271,13 +271,13 @@
case Constants.IFNONNULL: case Constants.IFNULL: case Constants.IF_ACMPEQ:
case Constants.IF_ACMPNE: case Constants.IF_ICMPEQ: case Constants.IF_ICMPGE: case Constants.IF_ICMPGT:
case Constants.IF_ICMPLE: case Constants.IF_ICMPLT: case Constants.IF_ICMPNE:
- buf.append("\t\t#" + ((bytes.getIndex() - 1) + bytes.readShort()));
+ buf.append("\t\t#").append((bytes.getIndex() - 1) + bytes.readShort());
break;
/* 32-bit wide jumps
*/
case Constants.GOTO_W: case Constants.JSR_W:
- buf.append("\t\t#" + ((bytes.getIndex() - 1) + bytes.readInt()));
+ buf.append("\t\t#").append(((bytes.getIndex() - 1) + bytes.readInt()));
break;
/* Index byte references local variable (register)
@@ -292,7 +292,7 @@
else
vindex = bytes.readUnsignedByte();
- buf.append("\t\t%" + vindex);
+ buf.append("\t\t%").append(vindex);
break;
/*
@@ -308,16 +308,16 @@
/* Array of basic type.
*/
case Constants.NEWARRAY:
- buf.append("\t\t<" + Constants.TYPE_NAMES[bytes.readByte()] + ">");
+ buf.append("\t\t<").append(Constants.TYPE_NAMES[bytes.readByte()]).append(">");
break;
/* Access object/class fields.
*/
case Constants.GETFIELD: case Constants.GETSTATIC: case Constants.PUTFIELD: case Constants.PUTSTATIC:
index = bytes.readUnsignedShort();
- buf.append("\t\t" +
- constant_pool.constantToString(index, Constants.CONSTANT_Fieldref) +
- (verbose? " (" + index + ")" : ""));
+ buf.append("\t\t")
+ .append(constant_pool.constantToString(index, Constants.CONSTANT_Fieldref))
+ .append((verbose? " (" + index + ")" : ""));
break;
/* Operands are references to classes in constant pool
@@ -327,28 +327,26 @@
buf.append("\t");
case Constants.INSTANCEOF:
index = bytes.readUnsignedShort();
- buf.append("\t<" + constant_pool.constantToString(index,
- Constants.CONSTANT_Class) +
- ">" + (verbose? " (" + index + ")" : ""));
+ buf.append("\t<").append(constant_pool.constantToString(index, Constants.CONSTANT_Class))
+ .append(">").append((verbose? " (" + index + ")" : ""));
break;
/* Operands are references to methods in constant pool
*/
case Constants.INVOKESPECIAL: case Constants.INVOKESTATIC: case Constants.INVOKEVIRTUAL:
index = bytes.readUnsignedShort();
- buf.append("\t" + constant_pool.constantToString(index,
- Constants.CONSTANT_Methodref) +
- (verbose? " (" + index + ")" : ""));
+ buf.append("\t").append(constant_pool.constantToString(index,
+ Constants.CONSTANT_Methodref))
+ .append((verbose? " (" + index + ")" : ""));
break;
case Constants.INVOKEINTERFACE:
index = bytes.readUnsignedShort();
int nargs = bytes.readUnsignedByte(); // historical, redundant
- buf.append("\t" +
- constant_pool.constantToString(index,
- Constants.CONSTANT_InterfaceMethodref) +
- (verbose? " (" + index + ")\t" : "") + nargs + "\t" +
- bytes.readUnsignedByte()); // Last byte is a reserved space
+ buf.append("\t").append(constant_pool.constantToString(index,
+ Constants.CONSTANT_InterfaceMethodref))
+ .append(verbose? " (" + index + ")\t" : "").append(nargs).append("\t")
+ .append(bytes.readUnsignedByte()); // Last byte is a reserved space
break;
/* Operands are references to items in constant pool
@@ -356,18 +354,17 @@
case Constants.LDC_W: case Constants.LDC2_W:
index = bytes.readUnsignedShort();
- buf.append("\t\t" + constant_pool.constantToString
- (index, constant_pool.getConstant(index).getTag()) +
- (verbose? " (" + index + ")" : ""));
+ buf.append("\t\t").append(constant_pool.constantToString
+ (index, constant_pool.getConstant(index).getTag()))
+ .append((verbose? " (" + index + ")" : ""));
break;
case Constants.LDC:
index = bytes.readUnsignedByte();
- buf.append("\t\t" +
- constant_pool.constantToString
- (index, constant_pool.getConstant(index).getTag()) +
- (verbose? " (" + index + ")" : ""));
+ buf.append("\t\t").append(
+ constant_pool.constantToString(index, constant_pool.getConstant(index).getTag()))
+ .append((verbose? " (" + index + ")" : ""));
break;
/* Array of references.
@@ -375,9 +372,9 @@
case Constants.ANEWARRAY:
index = bytes.readUnsignedShort();
- buf.append("\t\t<" + compactClassName(constant_pool.getConstantString
- (index, Constants.CONSTANT_Class), false) +
- ">" + (verbose? " (" + index + ")": ""));
+ buf.append("\t\t<").append(compactClassName(constant_pool.getConstantString
+ (index, Constants.CONSTANT_Class), false))
+ .append(">").append((verbose? " (" + index + ")": ""));
break;
/* Multidimensional array of references.
@@ -386,9 +383,9 @@
index = bytes.readUnsignedShort();
int dimensions = bytes.readUnsignedByte();
- buf.append("\t<" + compactClassName(constant_pool.getConstantString
- (index, Constants.CONSTANT_Class), false) +
- ">\t" + dimensions + (verbose? " (" + index + ")" : ""));
+ buf.append("\t<").append(compactClassName(constant_pool.getConstantString
+ (index, Constants.CONSTANT_Class), false))
+ .append(">\t").append(dimensions).append((verbose? " (" + index + ")" : ""));
}
break;
@@ -404,7 +401,7 @@
vindex = bytes.readUnsignedByte();
constant = bytes.readByte();
}
- buf.append("\t\t%" + vindex + "\t" + constant);
+ buf.append("\t\t%").append(vindex).append("\t").append(constant);
break;
default:
@@ -535,7 +532,7 @@
str = getSignature(ret);
- buf.append(")" + str);
+ buf.append(")").append(str);
return buf.toString();
}
@@ -689,9 +686,9 @@
LocalVariable l = vars.getLocalVariable(var_index);
if(l != null)
- buf.append(" " + l.getName());
+ buf.append(" ").append(l.getName());
} else
- buf.append(" arg" + var_index);
+ buf.append(" arg").append(var_index);
if("double".equals(param_type) || "long".equals(param_type))
var_index += 2;
@@ -838,7 +835,6 @@
int n;
StringBuffer brackets;
String type;
- char ch;
int consumed_chars; // Shadows global var
brackets = new StringBuffer(); // Accumulate []'s
@@ -925,7 +921,7 @@
}
if(!found) // Class name
- buf.append('L' + type.replace('.', '/') + ';');
+ buf.append('L').append(type.replace('.', '/')).append(';');
return buf.toString();
}
@@ -1134,13 +1130,13 @@
for(int i=0; i < obj.length; i++) {
if(obj[i] != null) {
- buf.append((quote? "\"" : "") + obj[i].toString() + (quote? "\"" : ""));
+ buf.append((quote? "\"" : "")).append(obj[i].toString()).append((quote? "\"" : ""));
} else {
- buf.append("null");
+ buf.append("null");
}
if(i < obj.length - 1) {
- buf.append(", ");
+ buf.append(", ");
}
}
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConstantPoolGen.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConstantPoolGen.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConstantPoolGen.java Sun Oct 9 23:04:21 2005
@@ -686,7 +686,7 @@
StringBuffer buf = new StringBuffer();
for(int i=1; i < index; i++)
- buf.append(i + ")" + constants[i] + "\n");
+ buf.append(i).append(")").append(constants[i]).append("\n");
return buf.toString();
}
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldGen.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldGen.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldGen.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldGen.java Sun Oct 9 23:04:21 2005
@@ -277,11 +277,12 @@
signature = type.toString();
name = getName();
- StringBuffer buf = new StringBuffer(access + signature + " " + name);
+ StringBuffer buf = new StringBuffer(32);
+ buf.append(access).append(signature).append(" ").append(name);
String value = getInitValue();
if(value != null)
- buf.append(" = " + value);
+ buf.append(" = ").append(value);
return buf.toString();
}
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionList.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionList.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionList.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionList.java Sun Oct 9 23:04:21 2005
@@ -988,7 +988,7 @@
StringBuffer buf = new StringBuffer();
for(InstructionHandle ih=start; ih != null; ih = ih.next) {
- buf.append(ih.toString(verbose) + "\n");
+ buf.append(ih.toString(verbose)).append("\n");
}
return buf.toString();
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MethodGen.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MethodGen.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MethodGen.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MethodGen.java Sun Oct 9 23:04:21 2005
@@ -1068,7 +1068,7 @@
if (throws_vec.size() > 0) {
for (Iterator e = throws_vec.iterator(); e.hasNext();)
- buf.append("\n\t\tthrows " + e.next());
+ buf.append("\n\t\tthrows ").append(e.next());
}
return buf.toString();
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Select.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Select.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Select.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Select.java Sun Oct 9 23:04:21 2005
@@ -139,7 +139,7 @@
if(targets[i] != null)
s = targets[i].getInstruction().toString();
- buf.append("(" + match[i] + ", " + s + " = {" + indices[i] + "})");
+ buf.append("(").append(match[i]).append(", ").append(s).append(" = {").append(indices[i]).append("})");
}
}
else
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java Sun Oct 9 23:04:21 2005
@@ -226,7 +226,7 @@
else if ((pow == Constants.ACC_TRANSIENT) && (reason == FLAG_FOR_METHOD))
buf.append("ACC_VARARGS | ");
else
- buf.append("ACC_" + Constants.ACCESS_NAMES[i].toUpperCase() + " | ");
+ buf.append("ACC_").append(Constants.ACCESS_NAMES[i].toUpperCase()).append(" | ");
}
pow <<= 1;
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/util/CodeHTML.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/util/CodeHTML.java?rev=312566&r1=312565&r2=312566&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/util/CodeHTML.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/util/CodeHTML.java Sun Oct 9 23:04:21 2005
@@ -87,7 +87,8 @@
int[] jump_table;
int no_pad_bytes=0, offset;
- buf = new StringBuffer("<TT>" + OPCODE_NAMES[opcode] + "</TT></TD><TD>");
+ buf = new StringBuffer(256);
+ buf.append("<TT>").append(OPCODE_NAMES[opcode]).append("</TT></TD><TD>");
/* Special case: Skip (0-3) padding bytes, i.e., the
* following bytes are 4-byte-aligned
@@ -118,16 +119,16 @@
for(int i=0; i < jump_table.length; i++) {
jump_table[i] = offset + bytes.readInt();
- buf.append("<TH>" + (low + i) + "</TH>");
+ buf.append("<TH>").append(low + i).append("</TH>");
}
buf.append("<TH>default</TH></TR>\n<TR>");
// Print target and default indices in second row
for(int i=0; i < jump_table.length; i++)
- buf.append("<TD><A HREF=\"#code" + method_number + "@" +
- jump_table[i] + "\">" + jump_table[i] + "</A></TD>");
- buf.append("<TD><A HREF=\"#code" + method_number + "@" +
- default_offset + "\">" + default_offset + "</A></TD></TR>\n</TABLE>\n");
+ buf.append("<TD><A HREF=\"#code").append(method_number).append("@")
+ .append(jump_table[i]).append("\">").append(jump_table[i]).append("</A></TD>");
+ buf.append("<TD><A HREF=\"#code").append(method_number).append("@")
+ .append(default_offset).append("\">").append(default_offset).append("</A></TD></TR>\n</TABLE>\n");
break;
@@ -146,16 +147,16 @@
int match = bytes.readInt();
jump_table[i] = offset + bytes.readInt();
- buf.append("<TH>" + match + "</TH>");
+ buf.append("<TH>").append(match).append("</TH>");
}
buf.append("<TH>default</TH></TR>\n<TR>");
// Print target and default indices in second row
for(int i=0; i < npairs; i++)
- buf.append("<TD><A HREF=\"#code" + method_number + "@" +
- jump_table[i] + "\">" + jump_table[i] + "</A></TD>");
- buf.append("<TD><A HREF=\"#code" + method_number + "@" +
- default_offset + "\">" + default_offset + "</A></TD></TR>\n</TABLE>\n");
+ buf.append("<TD><A HREF=\"#code").append(method_number).append("@")
+ .append(jump_table[i]).append("\">").append(jump_table[i]).append("</A></TD>");
+ buf.append("<TD><A HREF=\"#code").append(method_number).append("@")
+ .append(default_offset).append("\">").append(default_offset).append("</A></TD></TR>\n</TABLE>\n");
break;
/* Two address bytes + offset from start of byte stream form the
@@ -169,15 +170,16 @@
index = (int)(bytes.getIndex() + bytes.readShort() - 1);
- buf.append("<A HREF=\"#code" + method_number + "@" + index + "\">" + index + "</A>");
+ buf.append("<A HREF=\"#code").append(method_number).append("@").append(index).append("\">")
+ .append(index).append("</A>");
break;
/* Same for 32-bit wide jumps
*/
case GOTO_W: case JSR_W:
int windex = bytes.getIndex() + bytes.readInt() - 1;
- buf.append("<A HREF=\"#code" + method_number + "@" + windex + "\">" +
- windex + "</A>");
+ buf.append("<A HREF=\"#code").append(method_number).append("@").append(windex).append("\">")
+ .append(windex).append("</A>");
break;
/* Index byte references local variable (register)
@@ -192,7 +194,7 @@
else
vindex = bytes.readUnsignedByte();
- buf.append("%" + vindex);
+ buf.append("%").append(vindex);
break;
/*
@@ -208,7 +210,7 @@
/* Array of basic type.
*/
case NEWARRAY:
- buf.append("<FONT COLOR=\"#00FF00\">" + TYPE_NAMES[bytes.readByte()] + "</FONT>");
+ buf.append("<FONT COLOR=\"#00FF00\">").append(TYPE_NAMES[bytes.readByte()]).append("</FONT>");
break;
/* Access object/class fields.
@@ -225,11 +227,11 @@
String field_name = constant_pool.constantToString(index, CONSTANT_NameAndType);
if(name.equals(class_name)) { // Local field
- buf.append("<A HREF=\"" + class_name + "_methods.html#field" + field_name +
- "\" TARGET=Methods>" + field_name + "</A>\n");
+ buf.append("<A HREF=\"").append(class_name).append("_methods.html#field").append(field_name)
+ .append("\" TARGET=Methods>").append(field_name).append("</A>\n");
}
else
- buf.append(constant_html.referenceConstant(class_index) + "." + field_name);
+ buf.append(constant_html.referenceConstant(class_index)).append(".").append(field_name);
break;
@@ -275,8 +277,8 @@
String[] args = Utility.methodSignatureArgumentTypes(signature, false);
String type = Utility.methodSignatureReturnType(signature, false);
- buf.append(name + ".<A HREF=\"" + class_name + "_cp.html#cp" + m_index +
- "\" TARGET=ConstantPool>" + str + "</A>" + "(");
+ buf.append(name).append(".<A HREF=\"").append(class_name).append("_cp.html#cp").append(m_index)
+ .append("\" TARGET=ConstantPool>").append(str).append("</A>").append("(");
// List arguments
for(int i=0; i < args.length; i++) {
@@ -286,7 +288,7 @@
buf.append(", ");
}
// Attach return type
- buf.append("):" + Class2HTML.referenceType(type));
+ buf.append("):").append(Class2HTML.referenceType(type));
break;
@@ -295,22 +297,22 @@
case LDC_W: case LDC2_W:
index = bytes.readShort();
- buf.append("<A HREF=\"" + class_name + "_cp.html#cp" + index +
- "\" TARGET=\"ConstantPool\">" +
- Class2HTML.toHTML(constant_pool.constantToString(index,
+ buf.append("<A HREF=\"").append(class_name).append("_cp.html#cp").append(index)
+ .append("\" TARGET=\"ConstantPool\">")
+ .append(Class2HTML.toHTML(constant_pool.constantToString(index,
constant_pool.
- getConstant(index).getTag()))+
- "</a>");
+ getConstant(index).getTag())))
+ .append("</a>");
break;
case LDC:
index = bytes.readUnsignedByte();
- buf.append("<A HREF=\"" + class_name + "_cp.html#cp" + index +
- "\" TARGET=\"ConstantPool\">" +
- Class2HTML.toHTML(constant_pool.constantToString(index,
+ buf.append("<A HREF=\"").append(class_name).append("_cp.html#cp").append(index)
+ .append("\" TARGET=\"ConstantPool\">")
+ .append(Class2HTML.toHTML(constant_pool.constantToString(index,
constant_pool.
- getConstant(index).getTag()))+
- "</a>");
+ getConstant(index).getTag())))
+ .append("</a>");
break;
/* Array of references.
@@ -326,7 +328,7 @@
case MULTIANEWARRAY:
index = bytes.readShort();
int dimensions = bytes.readByte();
- buf.append(constant_html.referenceConstant(index) + ":" + dimensions + "-dimensional");
+ buf.append(constant_html.referenceConstant(index)).append(":").append(dimensions).append("-dimensional");
break;
/* Increment local variable.
@@ -341,7 +343,7 @@
vindex = bytes.readUnsignedByte();
constant = bytes.readByte();
}
- buf.append("%" + vindex + " " + constant);
+ buf.append("%").append(vindex).append(" ").append(constant);
break;
default: