Author: markt Date: Mon Oct 10 18:49:14 2011 New Revision: 1181133 URL: http://svn.apache.org/viewvc?rev=1181133&view=rev Log: Update copy of Commons BCEL to latest code from Commons BCEL trunk
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java (contents, props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java (contents, props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java (contents, props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java (contents, props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256 ,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java Mon Oct 10 18:49:14 2011 @@ -45,9 +45,7 @@ public class AnnotationElementValue exte @Override public String stringifyValue() { - StringBuffer sb = new StringBuffer(); - sb.append(annotationEntry.toString()); - return sb.toString(); + return annotationEntry.toString(); } @Override Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java Mon Oct 10 18:49:14 2011 @@ -37,8 +37,8 @@ public class AnnotationEntry implements private static final long serialVersionUID = 1L; - private int type_index; - private ConstantPool constant_pool; + private final int type_index; + private final ConstantPool constant_pool; private List<ElementValuePair> element_value_pairs; @@ -47,6 +47,7 @@ public class AnnotationEntry implements * * @param file * @param constant_pool + * @return the entry * @throws IOException */ public static AnnotationEntry read(DataInputStream file, ConstantPool constant_pool) throws IOException { @@ -78,19 +79,17 @@ public class AnnotationEntry implements * @return the element value pairs in this annotation entry */ public ElementValuePair[] getElementValuePairs() { - // TOFO return List + // TODO return List return element_value_pairs.toArray(new ElementValuePair[element_value_pairs.size()]); } - - public void dump(DataOutputStream dos) throws IOException - { - dos.writeShort(type_index); // u2 index of type name in cpool - dos.writeShort(element_value_pairs.size()); // u2 element_value pair count - for (int i = 0 ; i<element_value_pairs.size();i++) { - ElementValuePair envp = element_value_pairs.get(i); + public void dump(DataOutputStream dos) throws IOException { + dos.writeShort(type_index); // u2 index of type name in cpool + dos.writeShort(element_value_pairs.size()); // u2 element_value pair + // count + for (int i = 0; i < element_value_pairs.size(); i++) { + final ElementValuePair envp = element_value_pairs.get(i); envp.dump(dos); } } - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java Mon Oct 10 18:49:14 2011 @@ -82,7 +82,8 @@ public abstract class Annotations extend return; } dos.writeShort(annotation_table.length); - for (int i = 0; i < annotation_table.length; i++) + for (int i = 0; i < annotation_table.length; i++) { annotation_table[i].dump(dos); + } } } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java Mon Oct 10 18:49:14 2011 @@ -28,7 +28,7 @@ public class ArrayElementValue extends E @Override public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("{"); for (int i = 0; i < evalues.length; i++) { @@ -63,7 +63,7 @@ public class ArrayElementValue extends E @Override public String stringifyValue() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("["); for (int i = 0; i < evalues.length; i++) { @@ -79,6 +79,4 @@ public class ArrayElementValue extends E { return evalues; } - - } Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AttributeReader.java Mon Oct 10 18:49:14 2011 @@ -52,6 +52,6 @@ public interface AttributeReader { it to construct an attribute. In the case of errors, a null can be returned which will cause the parsing of the class file to fail. */ - public Attribute createAttribute( int name_index, int length, java.io.DataInputStream file, + Attribute createAttribute( int name_index, int length, java.io.DataInputStream file, ConstantPool constant_pool ); } Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java Mon Oct 10 18:49:14 2011 @@ -193,6 +193,7 @@ public final class Code extends Attribut public final void setCode( byte[] code ) { this.code = code; code_length = (code == null) ? 0 : code.length; + length = calculateLength(); // Adjust length } @@ -202,6 +203,7 @@ public final class Code extends Attribut public final void setExceptionTable( CodeException[] exception_table ) { this.exception_table = exception_table; exception_table_length = (exception_table == null) ? 0 : exception_table.length; + length = calculateLength(); // Adjust length } @@ -209,8 +211,7 @@ public final class Code extends Attribut * @return String representation of code chunk. */ public final String toString( boolean verbose ) { - StringBuffer buf; - buf = new StringBuffer(100); + StringBuilder buf = new StringBuilder(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)); Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java Mon Oct 10 18:49:14 2011 @@ -42,6 +42,4 @@ public final class ConstantFieldref exte ConstantFieldref(DataInputStream file) throws IOException { super(Constants.CONSTANT_Fieldref, file); } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java Mon Oct 10 18:49:14 2011 @@ -86,6 +86,4 @@ public final class ConstantFloat extends public final String toString() { return super.toString() + "(bytes = " + bytes + ")"; } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java Mon Oct 10 18:49:14 2011 @@ -86,6 +86,4 @@ public final class ConstantInteger exten public final String toString() { return super.toString() + "(bytes = " + bytes + ")"; } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java Mon Oct 10 18:49:14 2011 @@ -42,6 +42,4 @@ public final class ConstantInterfaceMeth ConstantInterfaceMethodref(DataInputStream file) throws IOException { super(Constants.CONSTANT_InterfaceMethodref, file); } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java Mon Oct 10 18:49:14 2011 @@ -86,6 +86,4 @@ public final class ConstantLong extends public final String toString() { return super.toString() + "(bytes = " + bytes + ")"; } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java Mon Oct 10 18:49:14 2011 @@ -42,6 +42,4 @@ public final class ConstantMethodref ext ConstantMethodref(DataInputStream file) throws IOException { super(Constants.CONSTANT_Methodref, file); } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java Mon Oct 10 18:49:14 2011 @@ -27,5 +27,4 @@ package org.apache.tomcat.util.bcel.clas */ public interface ConstantObject { - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java Mon Oct 10 18:49:14 2011 @@ -131,7 +131,7 @@ public class ConstantPool implements Clo private static final String escape( String str ) { int len = str.length(); - StringBuffer buf = new StringBuffer(len + 5); + StringBuilder buf = new StringBuilder(len + 5); char[] ch = str.toCharArray(); for (int i = 0; i < len; i++) { switch (ch[i]) { @@ -265,7 +265,7 @@ public class ConstantPool implements Clo */ @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 1; i < constant_pool_count; i++) { buf.append(i).append(")").append(constant_pool[i]).append("\n"); } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java Mon Oct 10 18:49:14 2011 @@ -86,6 +86,4 @@ public final class ConstantString extend public final String toString() { return super.toString() + "(string_index = " + string_index + ")"; } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java Mon Oct 10 18:49:14 2011 @@ -130,6 +130,4 @@ public abstract class ElementValue "Unexpected element value kind in annotation: " + type); } } - - } Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java Mon Oct 10 18:49:14 2011 @@ -55,5 +55,4 @@ public class EnumElementValue extends El Constants.CONSTANT_Utf8); return cu8.getBytes(); } - } Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java Mon Oct 10 18:49:14 2011 @@ -105,7 +105,7 @@ public final class ExceptionTable extend */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); String str; for (int i = 0; i < number_of_exceptions; i++) { str = constant_pool.getConstantString(exception_index_table[i], Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java Mon Oct 10 18:49:14 2011 @@ -89,7 +89,7 @@ public final class Field extends FieldOr access = access.equals("") ? "" : (access + " "); signature = Utility.signatureToString(getSignature()); name = getName(); - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append(access).append(signature).append(" ").append(name); ConstantValue cv = getConstantValue(); if (cv != null) { Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java Mon Oct 10 18:49:14 2011 @@ -103,7 +103,7 @@ public final class InnerClasses extends */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < number_of_classes; i++) { buf.append(inner_classes[i].toString(constant_pool)).append("\n"); } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Mon Oct 10 18:49:14 2011 @@ -186,7 +186,7 @@ public class JavaClass extends AccessFla public String toString() { String access = Utility.accessToString(access_flags, true); access = access.equals("") ? "" : (access + " "); - StringBuffer buf = new StringBuffer(128); + StringBuilder buf = new StringBuilder(128); buf.append(access).append(Utility.classOrInterface(access_flags)).append(" ").append( class_name).append(" extends ").append( Utility.compactClassName(superclass_name, false)).append('\n'); @@ -237,7 +237,7 @@ public class JavaClass extends AccessFla private static final String indent( Object obj ) { StringTokenizer tok = new StringTokenizer(obj.toString(), "\n"); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); while (tok.hasMoreTokens()) { buf.append("\t").append(tok.nextToken()).append("\n"); } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java Mon Oct 10 18:49:14 2011 @@ -102,8 +102,8 @@ public final class LineNumberTable exten */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(); - StringBuffer line = new StringBuffer(); + StringBuilder buf = new StringBuilder(); + StringBuilder line = new StringBuilder(); String newLine = System.getProperty("line.separator", "\n"); for (int i = 0; i < line_number_table_length; i++) { line.append(line_number_table[i].toString()); @@ -134,6 +134,4 @@ public final class LineNumberTable exten c.constant_pool = _constant_pool; return c; } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java Mon Oct 10 18:49:14 2011 @@ -119,7 +119,7 @@ public class LocalVariableTable extends */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < local_variable_table_length; i++) { buf.append(local_variable_table[i].toString()); if (i < local_variable_table_length - 1) { @@ -143,6 +143,4 @@ public class LocalVariableTable extends c.constant_pool = _constant_pool; return c; } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java Mon Oct 10 18:49:14 2011 @@ -93,7 +93,7 @@ private int local_variable_t */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(""); + StringBuilder buf = new StringBuilder(); for(int i=0; i < local_variable_type_table_length; i++) { buf.append(local_variable_type_table[i].toString()); Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java Mon Oct 10 18:49:14 2011 @@ -122,7 +122,7 @@ public final class Method extends FieldO public final String toString() { ConstantUtf8 c; String name, signature, access; // Short cuts to constant pool - StringBuffer buf; + StringBuilder buf; access = Utility.accessToString(access_flags); // Get name and signature from constant pool c = (ConstantUtf8) constant_pool.getConstant(signature_index, Constants.CONSTANT_Utf8); @@ -131,7 +131,7 @@ public final class Method extends FieldO name = c.getBytes(); signature = Utility.methodSignatureToString(signature, name, access, true, getLocalVariableTable()); - buf = new StringBuffer(signature); + buf = new StringBuilder(signature); for (int i = 0; i < attributes_count; i++) { Attribute a = attributes[i]; if (!((a instanceof Code) || (a instanceof ExceptionTable))) { Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java Mon Oct 10 18:49:14 2011 @@ -77,5 +77,4 @@ public abstract class ParameterAnnotatio ? 0 : parameter_annotation_table.length; } - } Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Mon Oct 10 18:49:14 2011 @@ -1 +1 @@ -"Author Date Id Revision" +Author Date Id Revision Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java Mon Oct 10 18:49:14 2011 @@ -106,7 +106,7 @@ public final class StackMap extends Attr */ @Override public final String toString() { - StringBuffer buf = new StringBuffer("StackMap("); + StringBuilder buf = new StringBuilder("StackMap("); for (int i = 0; i < map_length; i++) { buf.append(map[i].toString()); if (i < map_length - 1) { Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java Mon Oct 10 18:49:14 2011 @@ -97,7 +97,7 @@ public final class StackMapEntry impleme */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("(offset=").append(byte_code_offset); if (number_of_locals > 0) { buf.append(", locals={"); Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java Mon Oct 10 18:49:14 2011 @@ -106,7 +106,7 @@ public final class StackMapTable extends */ @Override public final String toString() { - StringBuffer buf = new StringBuffer("StackMapTable("); + StringBuilder buf = new StringBuilder("StackMapTable("); for (int i = 0; i < map_length; i++) { buf.append(map[i].toString()); if (i < map_length - 1) { Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java Mon Oct 10 18:49:14 2011 @@ -154,7 +154,7 @@ public final class StackMapTableEntry im */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(64); + StringBuilder buf = new StringBuilder(64); buf.append("("); if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) { buf.append("SAME"); @@ -209,6 +209,4 @@ public final class StackMapTableEntry im } return null; } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java Mon Oct 10 18:49:14 2011 @@ -95,7 +95,7 @@ public final class Synthetic extends Att */ @Override public final String toString() { - StringBuffer buf = new StringBuffer("Synthetic"); + StringBuilder buf = new StringBuilder("Synthetic"); if (length > 0) { buf.append(" ").append(Utility.toHexString(bytes)); } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Mon Oct 10 18:49:14 2011 @@ -36,14 +36,14 @@ public abstract class Utility { private static void wrap( ThreadLocal<Integer> tl, int value ) { - tl.set(new Integer(value)); + tl.set(Integer.valueOf(value)); } private static ThreadLocal<Integer> consumed_chars = new ThreadLocal<Integer>() { @Override protected Integer initialValue() { - return new Integer(0); + return Integer.valueOf(0); } };/* How many chars have been consumed * during parsing in signatureToString(). @@ -85,7 +85,7 @@ public abstract class Utility { * @return String representation of flags */ public static final String accessToString( int access_flags, boolean for_class ) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); int p = 0; for (int i = 0; p < Constants.MAX_ACC_FLAG; i++) { // Loop through known flags p = pow2(i); @@ -131,7 +131,7 @@ public abstract class Utility { */ public static final String codeToString( byte[] code, ConstantPool constant_pool, int index, int length, boolean verbose ) { - StringBuffer buf = new StringBuffer(code.length * 20); // Should be sufficient + StringBuilder buf = new StringBuilder(code.length * 20); // Should be sufficient ByteSequence stream = new ByteSequence(code); try { for (int i = 0; i < index; i++) { @@ -171,7 +171,7 @@ public abstract class Utility { int index, vindex, constant; int[] match, jump_table; int no_pad_bytes = 0, offset; - StringBuffer buf = new StringBuffer(Constants.OPCODE_NAMES[opcode]); + StringBuilder buf = new StringBuilder(Constants.OPCODE_NAMES[opcode]); /* Special case: Skip (0-3) padding bytes, i.e., the * following bytes are 4-byte-aligned */ @@ -489,7 +489,7 @@ public abstract class Utility { */ public static final String methodSignatureToString( String signature, String name, String access, boolean chopit, LocalVariableTable vars ) throws ClassFormatException { - StringBuffer buf = new StringBuffer("("); + StringBuilder buf = new StringBuilder("("); String type; int index; int var_index = (access.indexOf("static") >= 0) ? 0 : 1; @@ -646,10 +646,10 @@ public abstract class Utility { return "boolean"; case '[': { // Array declaration int n; - StringBuffer brackets; + StringBuilder brackets; String type; int consumed_chars; // Shadows global var - brackets = new StringBuffer(); // Accumulate []'s + brackets = new StringBuilder(); // Accumulate []'s // Count opening brackets and look for optional size argument for (n = 0; signature.charAt(n) == '['; n++) { brackets.append("[]"); @@ -689,7 +689,7 @@ public abstract class Utility { * @return bytes as hexadecimal string, e.g. 00 FA 12 ... */ public static final String toHexString( byte[] bytes ) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < bytes.length; i++) { short b = byteToShort(bytes[i]); String hex = Integer.toString(b, 0x10); @@ -753,7 +753,7 @@ public abstract class Utility { */ public static final String convertString( String label ) { char[] ch = label.toCharArray(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < ch.length; i++) { switch (ch[i]) { case '\n': @@ -778,6 +778,4 @@ public abstract class Utility { } return buf.toString(); } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java Mon Oct 10 18:49:14 2011 @@ -33,7 +33,7 @@ public interface BCELComparator { * @param THAT * @return true if and only if THIS equals THAT */ - public boolean equals( Object THIS, Object THAT ); + boolean equals( Object THIS, Object THAT ); /** @@ -42,5 +42,5 @@ public interface BCELComparator { * @param THIS * @return hashcode for THIS.hashCode() */ - public int hashCode( Object THIS ); + int hashCode( Object THIS ); } Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1181133&r1=1181132&r2=1181133&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Oct 10 18:49:14 2011 @@ -79,6 +79,10 @@ <bug>51972</bug>: Correctly handle protocol relative URLs when used with <code>sendRedirect()</code>. (markt) </fix> + <update> + Update the package re-named copy of Commons BCEL (formerly Jakarta BCEL) + to the latest code from Commons BCEL trunk. (markt) + </update> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org