Author: markt Date: Mon Aug 22 09:17:53 2016 New Revision: 1757123 URL: http://svn.apache.org/viewvc?rev=1757123&view=rev Log: Updating Tomcat's copy of BCEL as far as r1746380 (more to come)
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/ (props changed) tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 22 09:17:53 2016 @@ -1,3 +1,3 @@ /commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910 -/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1743695 +/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1746380 /jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511 Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java Mon Aug 22 09:17:53 2016 @@ -22,8 +22,8 @@ public class AnnotationElementValue exte // For annotation element values, this is the annotation private final AnnotationEntry annotationEntry; - AnnotationElementValue(int type, AnnotationEntry annotationEntry, - ConstantPool cpool) + AnnotationElementValue(final int type, final AnnotationEntry annotationEntry, + final ConstantPool cpool) { super(type, cpool); if (type != ANNOTATION) { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java Mon Aug 22 09:17:53 2016 @@ -41,12 +41,12 @@ public class AnnotationEntry { * @param constant_pool * @throws IOException */ - AnnotationEntry(DataInput input, ConstantPool constant_pool) throws IOException { + AnnotationEntry(final DataInput input, final ConstantPool constant_pool) throws IOException { this.constant_pool = constant_pool; type_index = input.readUnsignedShort(); - int num_element_value_pairs = input.readUnsignedShort(); + final int num_element_value_pairs = input.readUnsignedShort(); element_value_pairs = new ArrayList<>(num_element_value_pairs); for (int i = 0; i < num_element_value_pairs; i++) { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java Mon Aug 22 09:17:53 2016 @@ -31,7 +31,7 @@ public class Annotations { * @param input Input stream * @param constant_pool Array of constants */ - Annotations(DataInput input, ConstantPool constant_pool) throws IOException { + Annotations(final DataInput input, final ConstantPool constant_pool) throws IOException { final int annotation_table_length = input.readUnsignedShort(); annotation_table = new AnnotationEntry[annotation_table_length]; for (int i = 0; i < annotation_table_length; i++) { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java Mon Aug 22 09:17:53 2016 @@ -22,7 +22,7 @@ public class ArrayElementValue extends E // For array types, this is the array private final ElementValue[] evalues; - ArrayElementValue(int type, ElementValue[] datums, ConstantPool cpool) + ArrayElementValue(final int type, final ElementValue[] datums, final ConstantPool cpool) { super(type, cpool); if (type != ARRAY) { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java Mon Aug 22 09:17:53 2016 @@ -26,7 +26,7 @@ public class ClassElementValue extends E // For 'class' this points to the class entry in the cpool private final int idx; - ClassElementValue(int type, int idx, ConstantPool cpool) { + ClassElementValue(final int type, final int idx, final ConstantPool cpool) { super(type, cpool); this.idx = idx; } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java Mon Aug 22 09:17:53 2016 @@ -31,7 +31,7 @@ public class ClassFormatException extend } - public ClassFormatException(String s) { + public ClassFormatException(final String s) { super(s); } } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java Mon Aug 22 09:17:53 2016 @@ -56,7 +56,7 @@ public final class ClassParser { * * @param inputStream Input stream */ - public ClassParser(InputStream inputStream) { + public ClassParser(final InputStream inputStream) { this.dataInputStream = new DataInputStream(new BufferedInputStream(inputStream, BUFSIZE)); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Mon Aug 22 09:17:53 2016 @@ -42,7 +42,7 @@ public abstract class Constant { protected final byte tag; - Constant(byte tag) { + Constant(final byte tag) { this.tag = tag; } @@ -62,7 +62,7 @@ public abstract class Constant { * @param input Input stream * @return Constant object */ - static Constant readConstant(DataInput input) throws IOException, + static Constant readConstant(final DataInput input) throws IOException, ClassFormatException { byte b = input.readByte(); // Read tag byte int skipSize; Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java Mon Aug 22 09:17:53 2016 @@ -39,7 +39,7 @@ public final class ConstantClass extends * @param file Input stream * @throws IOException */ - ConstantClass(DataInput file) throws IOException { + ConstantClass(final DataInput file) throws IOException { super(Const.CONSTANT_Class); this.name_index = file.readUnsignedShort(); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java Mon Aug 22 09:17:53 2016 @@ -39,7 +39,7 @@ public final class ConstantDouble extend * @param file Input stream * @throws IOException */ - ConstantDouble(DataInput file) throws IOException { + ConstantDouble(final DataInput file) throws IOException { super(Const.CONSTANT_Double); this.bytes = file.readDouble(); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java Mon Aug 22 09:17:53 2016 @@ -39,7 +39,7 @@ public final class ConstantFloat extends * @param file Input stream * @throws IOException */ - ConstantFloat(DataInput file) throws IOException { + ConstantFloat(final DataInput file) throws IOException { super(Const.CONSTANT_Float); this.bytes = file.readFloat(); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java Mon Aug 22 09:17:53 2016 @@ -39,7 +39,7 @@ public final class ConstantInteger exten * @param file Input stream * @throws IOException */ - ConstantInteger(DataInput file) throws IOException { + ConstantInteger(final DataInput file) throws IOException { super(Const.CONSTANT_Integer); this.bytes = file.readInt(); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java Mon Aug 22 09:17:53 2016 @@ -39,7 +39,7 @@ public final class ConstantLong extends * @param file Input stream * @throws IOException */ - ConstantLong(DataInput input) throws IOException { + ConstantLong(final DataInput input) throws IOException { super(Const.CONSTANT_Long); this.bytes = input.readLong(); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java Mon Aug 22 09:17:53 2016 @@ -44,7 +44,7 @@ public class ConstantPool { * @throws IOException * @throws ClassFormatException */ - ConstantPool(DataInput input) throws IOException, ClassFormatException { + ConstantPool(final DataInput input) throws IOException, ClassFormatException { int constant_pool_count = input.readUnsignedShort(); constant_pool = new Constant[constant_pool_count]; /* constant_pool[0] is unused by the compiler and may be used freely @@ -76,7 +76,7 @@ public class ConstantPool { * @return Constant value * @see Constant */ - public Constant getConstant( int index ) { + public Constant getConstant( final int index ) { if (index >= constant_pool.length || index < 0) { throw new ClassFormatException("Invalid constant pool reference: " + index + ". Constant pool size is: " + constant_pool.length); @@ -95,7 +95,7 @@ public class ConstantPool { * @see Constant * @throws ClassFormatException If the constant is not of the expected type */ - public Constant getConstant( int index, byte tag ) throws ClassFormatException { + public Constant getConstant( final int index, final byte tag ) throws ClassFormatException { Constant c; c = getConstant(index); if (c == null) { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java Mon Aug 22 09:17:53 2016 @@ -33,7 +33,7 @@ public final class ConstantUtf8 extends private final String bytes; - static ConstantUtf8 getInstance(DataInput input) throws IOException { + static ConstantUtf8 getInstance(final DataInput input) throws IOException { return new ConstantUtf8(input.readUTF()); } @@ -41,7 +41,7 @@ public final class ConstantUtf8 extends /** * @param bytes Data */ - private ConstantUtf8(String bytes) { + private ConstantUtf8(final String bytes) { super(Const.CONSTANT_Utf8); if (bytes == null) { throw new IllegalArgumentException("bytes must not be null!"); Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java Mon Aug 22 09:17:53 2016 @@ -26,7 +26,7 @@ public abstract class ElementValue private final ConstantPool cpool; - ElementValue(int type, ConstantPool cpool) { + ElementValue(final int type, final ConstantPool cpool) { this.type = type; this.cpool = cpool; } @@ -47,7 +47,7 @@ public abstract class ElementValue public static final byte PRIMITIVE_SHORT = 'S'; public static final byte PRIMITIVE_BOOLEAN = 'Z'; - public static ElementValue readElementValue(DataInput input, ConstantPool cpool) throws IOException + public static ElementValue readElementValue(final DataInput input, final ConstantPool cpool) throws IOException { byte type = input.readByte(); switch (type) Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java Mon Aug 22 09:17:53 2016 @@ -35,7 +35,7 @@ public class ElementValuePair private final int elementNameIndex; - ElementValuePair(DataInput file, ConstantPool constantPool) throws IOException { + ElementValuePair(final DataInput file, final ConstantPool constantPool) throws IOException { this.constantPool = constantPool; this.elementNameIndex = file.readUnsignedShort(); this.elementValue = ElementValue.readElementValue(file, constantPool); Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java Mon Aug 22 09:17:53 2016 @@ -23,7 +23,7 @@ public class EnumElementValue extends El { private final int valueIdx; - EnumElementValue(int type, int valueIdx, ConstantPool cpool) { + EnumElementValue(final int type, final int valueIdx, final ConstantPool cpool) { super(type, cpool); if (type != ENUM_CONSTANT) throw new RuntimeException( Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Mon Aug 22 09:17:53 2016 @@ -43,9 +43,9 @@ public class JavaClass { * @param interfaces Implemented interfaces * @param runtimeVisibleAnnotations "RuntimeVisibleAnnotations" attribute defined on the Class, or null */ - JavaClass(String class_name, String superclass_name, - int access_flags, ConstantPool constant_pool, String[] interface_names, - Annotations runtimeVisibleAnnotations) { + JavaClass(final String class_name, final String superclass_name, + final int access_flags, final ConstantPool constant_pool, final String[] interface_names, + final Annotations runtimeVisibleAnnotations) { this.access_flags = access_flags; this.runtimeVisibleAnnotations = runtimeVisibleAnnotations; this.class_name = class_name; Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java Mon Aug 22 09:17:53 2016 @@ -23,7 +23,7 @@ public class SimpleElementValue extends { private final int index; - SimpleElementValue(int type, int index, ConstantPool cpool) { + SimpleElementValue(final int type, final int index, final ConstantPool cpool) { super(type, cpool); this.index = index; } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1757123&r1=1757122&r2=1757123&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Mon Aug 22 09:17:53 2016 @@ -40,11 +40,11 @@ final class Utility { * @param str The long class name * @return Compacted class name */ - static String compactClassName(String str) { + static String compactClassName(final String str) { return str.replace('/', '.'); // Is `/' on all systems, even DOS } - static String getClassName(ConstantPool constant_pool, int index) { + static String getClassName(final ConstantPool constant_pool, final int index) { Constant c = constant_pool.getConstant(index, Const.CONSTANT_Class); int i = ((ConstantClass) c).getNameIndex(); @@ -55,14 +55,14 @@ final class Utility { return compactClassName(name); } - static void skipFully(DataInput file, int length) throws IOException { + static void skipFully(final DataInput file, final int length) throws IOException { int total = file.skipBytes(length); if (total != length) { throw new EOFException(); } } - static void swallowFieldOrMethod(DataInput file) + static void swallowFieldOrMethod(final DataInput file) throws IOException { // file.readUnsignedShort(); // Unused access flags // file.readUnsignedShort(); // name index @@ -75,7 +75,7 @@ final class Utility { } } - static void swallowAttribute(DataInput file) + static void swallowAttribute(final DataInput file) throws IOException { //file.readUnsignedShort(); // Unused name index skipFully(file, 2); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org