Author: markt
Date: Sun Dec 6 01:03:55 2009
New Revision: 887625
URL: http://svn.apache.org/viewvc?rev=887625&view=rev
Log:
Last cleanup of unused code for today. Still more todo.
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PopInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/UnconditionalBranch.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassQueue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Sun Dec 6 01:03:55 2009
@@ -24,13 +24,9 @@
*/
public interface Constants {
- /** Maximum value for an unsigned short.
- */
- public final static int MAX_SHORT = 65535; // 2^16 - 1
+
- /** Maximum value for an unsigned byte.
- */
- public final static int MAX_BYTE = 255; // 2^8 - 1
+
/** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
@@ -135,29 +131,6 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ALOAD = 25;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ILOAD_0 = 26;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LLOAD_0 = 30;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FLOAD_0 = 34;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DLOAD_0 = 38;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ALOAD_0 = 42;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ALOAD_3 = 45;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
@@ -174,29 +147,6 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ASTORE = 58;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ISTORE_0 = 59;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LSTORE_0 = 63;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FSTORE_0 = 67;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DSTORE_0 = 71;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ASTORE_0 = 75;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ASTORE_3 = 78;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
@@ -321,16 +271,10 @@
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short JSR_W = 201;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
- public static final short BREAKPOINT = 202;
-
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
- public static final short IMPDEP1 = 254;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
- public static final short IMPDEP2 = 255;
+
+
+
+
/** Illegal opcode. */
public static final short UNDEFINED = -1;
@@ -362,16 +306,13 @@
/** Void data type (non-standard). */
public static final byte T_VOID = 12; // Non-standard
- /** Array data type. */
- public static final byte T_ARRAY = 13;
+
/** Object data type. */
public static final byte T_OBJECT = 14;
- /** Reference data type (deprecated). */
- public static final byte T_REFERENCE = 14; // Deprecated
+
/** Unknown data type. */
public static final byte T_UNKNOWN = 15;
- /** Address data type. */
- public static final byte T_ADDRESS = 16;
+
/** The primitive type names corresponding to the T_XX constants,
* e.g., TYPE_NAMES[T_INT] = "int"
@@ -578,117 +519,9 @@
ILLEGAL_OPCODE, "impdep1", "impdep2"
};
- /**
- * Number of words consumed on operand stack by instructions.
- * Indexed by opcode. CONSUME_STACK[FALOAD] = number of words
- * consumed from the stack by a faload instruction.
- */
- public static final int[] CONSUME_STACK = {
- 0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, 0/*iconst_1*/,
- 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, 0/*iconst_5*/, 0/*lconst_0*/,
- 0/*lconst_1*/, 0/*fconst_0*/, 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/,
- 0/*dconst_1*/, 0/*bipush*/, 0/*sipush*/, 0/*ldc*/, 0/*ldc_w*/, 0/*ldc2_w*/, 0/*iload*/,
- 0/*lload*/, 0/*fload*/, 0/*dload*/, 0/*aload*/, 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/,
- 0/*iload_3*/, 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/, 0/*fload_0*/,
- 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/, 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/,
- 0/*dload_3*/, 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/, 2/*iaload*/,
- 2/*laload*/, 2/*faload*/, 2/*daload*/, 2/*aaload*/, 2/*baload*/, 2/*caload*/, 2/*saload*/,
- 1/*istore*/, 2/*lstore*/, 1/*fstore*/, 2/*dstore*/, 1/*astore*/, 1/*istore_0*/,
- 1/*istore_1*/, 1/*istore_2*/, 1/*istore_3*/, 2/*lstore_0*/, 2/*lstore_1*/,
- 2/*lstore_2*/, 2/*lstore_3*/, 1/*fstore_0*/, 1/*fstore_1*/, 1/*fstore_2*/,
- 1/*fstore_3*/, 2/*dstore_0*/, 2/*dstore_1*/, 2/*dstore_2*/, 2/*dstore_3*/,
- 1/*astore_0*/, 1/*astore_1*/, 1/*astore_2*/, 1/*astore_3*/, 3/*iastore*/, 4/*lastore*/,
- 3/*fastore*/, 4/*dastore*/, 3/*aastore*/, 3/*bastore*/, 3/*castore*/, 3/*sastore*/,
- 1/*pop*/, 2/*pop2*/, 1/*dup*/, 2/*dup_x1*/, 3/*dup_x2*/, 2/*dup2*/, 3/*dup2_x1*/,
- 4/*dup2_x2*/, 2/*swap*/, 2/*iadd*/, 4/*ladd*/, 2/*fadd*/, 4/*dadd*/, 2/*isub*/, 4/*lsub*/,
- 2/*fsub*/, 4/*dsub*/, 2/*imul*/, 4/*lmul*/, 2/*fmul*/, 4/*dmul*/, 2/*idiv*/, 4/*ldiv*/,
- 2/*fdiv*/, 4/*ddiv*/, 2/*irem*/, 4/*lrem*/, 2/*frem*/, 4/*drem*/, 1/*ineg*/, 2/*lneg*/,
- 1/*fneg*/, 2/*dneg*/, 2/*ishl*/, 3/*lshl*/, 2/*ishr*/, 3/*lshr*/, 2/*iushr*/, 3/*lushr*/,
- 2/*iand*/, 4/*land*/, 2/*ior*/, 4/*lor*/, 2/*ixor*/, 4/*lxor*/, 0/*iinc*/,
- 1/*i2l*/, 1/*i2f*/, 1/*i2d*/, 2/*l2i*/, 2/*l2f*/, 2/*l2d*/, 1/*f2i*/, 1/*f2l*/,
- 1/*f2d*/, 2/*d2i*/, 2/*d2l*/, 2/*d2f*/, 1/*i2b*/, 1/*i2c*/, 1/*i2s*/,
- 4/*lcmp*/, 2/*fcmpl*/, 2/*fcmpg*/, 4/*dcmpl*/, 4/*dcmpg*/, 1/*ifeq*/, 1/*ifne*/,
- 1/*iflt*/, 1/*ifge*/, 1/*ifgt*/, 1/*ifle*/, 2/*if_icmpeq*/, 2/*if_icmpne*/, 2/*if_icmplt*/,
- 2 /*if_icmpge*/, 2/*if_icmpgt*/, 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/,
- 0/*goto*/, 0/*jsr*/, 0/*ret*/, 1/*tableswitch*/, 1/*lookupswitch*/, 1/*ireturn*/,
- 2/*lreturn*/, 1/*freturn*/, 2/*dreturn*/, 1/*areturn*/, 0/*return*/, 0/*getstatic*/,
- UNPREDICTABLE/*putstatic*/, 1/*getfield*/, UNPREDICTABLE/*putfield*/,
- UNPREDICTABLE/*invokevirtual*/, UNPREDICTABLE/*invokespecial*/,
- UNPREDICTABLE/*invokestatic*/,
- UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 0/*new*/, 1/*newarray*/, 1/*anewarray*/,
- 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 1/*monitorenter*/,
- 1/*monitorexit*/, 0/*wide*/, UNPREDICTABLE/*multianewarray*/, 1/*ifnull*/, 1/*ifnonnull*/,
- 0/*goto_w*/, 0/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/
- };
+
- /**
- * Number of words produced onto operand stack by instructions.
- * Indexed by opcode. CONSUME_STACK[DALOAD] = number of words
- * consumed from the stack by a daload instruction.
- */
- public static final int[] PRODUCE_STACK = {
- 0/*nop*/, 1/*aconst_null*/, 1/*iconst_m1*/, 1/*iconst_0*/, 1/*iconst_1*/,
- 1/*iconst_2*/, 1/*iconst_3*/, 1/*iconst_4*/, 1/*iconst_5*/, 2/*lconst_0*/,
- 2/*lconst_1*/, 1/*fconst_0*/, 1/*fconst_1*/, 1/*fconst_2*/, 2/*dconst_0*/,
- 2/*dconst_1*/, 1/*bipush*/, 1/*sipush*/, 1/*ldc*/, 1/*ldc_w*/, 2/*ldc2_w*/, 1/*iload*/,
- 2/*lload*/, 1/*fload*/, 2/*dload*/, 1/*aload*/, 1/*iload_0*/, 1/*iload_1*/, 1/*iload_2*/,
- 1/*iload_3*/, 2/*lload_0*/, 2/*lload_1*/, 2/*lload_2*/, 2/*lload_3*/, 1/*fload_0*/,
- 1/*fload_1*/, 1/*fload_2*/, 1/*fload_3*/, 2/*dload_0*/, 2/*dload_1*/, 2/*dload_2*/,
- 2/*dload_3*/, 1/*aload_0*/, 1/*aload_1*/, 1/*aload_2*/, 1/*aload_3*/, 1/*iaload*/,
- 2/*laload*/, 1/*faload*/, 2/*daload*/, 1/*aaload*/, 1/*baload*/, 1/*caload*/, 1/*saload*/,
- 0/*istore*/, 0/*lstore*/, 0/*fstore*/, 0/*dstore*/, 0/*astore*/, 0/*istore_0*/,
- 0/*istore_1*/, 0/*istore_2*/, 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/,
- 0/*lstore_2*/, 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/,
- 0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/, 0/*dstore_3*/,
- 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/, 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/,
- 0/*fastore*/, 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/, 0/*sastore*/,
- 0/*pop*/, 0/*pop2*/, 2/*dup*/, 3/*dup_x1*/, 4/*dup_x2*/, 4/*dup2*/, 5/*dup2_x1*/,
- 6/*dup2_x2*/, 2/*swap*/, 1/*iadd*/, 2/*ladd*/, 1/*fadd*/, 2/*dadd*/, 1/*isub*/, 2/*lsub*/,
- 1/*fsub*/, 2/*dsub*/, 1/*imul*/, 2/*lmul*/, 1/*fmul*/, 2/*dmul*/, 1/*idiv*/, 2/*ldiv*/,
- 1/*fdiv*/, 2/*ddiv*/, 1/*irem*/, 2/*lrem*/, 1/*frem*/, 2/*drem*/, 1/*ineg*/, 2/*lneg*/,
- 1/*fneg*/, 2/*dneg*/, 1/*ishl*/, 2/*lshl*/, 1/*ishr*/, 2/*lshr*/, 1/*iushr*/, 2/*lushr*/,
- 1/*iand*/, 2/*land*/, 1/*ior*/, 2/*lor*/, 1/*ixor*/, 2/*lxor*/,
- 0/*iinc*/, 2/*i2l*/, 1/*i2f*/, 2/*i2d*/, 1/*l2i*/, 1/*l2f*/, 2/*l2d*/, 1/*f2i*/,
- 2/*f2l*/, 2/*f2d*/, 1/*d2i*/, 2/*d2l*/, 1/*d2f*/,
- 1/*i2b*/, 1/*i2c*/, 1/*i2s*/, 1/*lcmp*/, 1/*fcmpl*/, 1/*fcmpg*/,
- 1/*dcmpl*/, 1/*dcmpg*/, 0/*ifeq*/, 0/*ifne*/, 0/*iflt*/, 0/*ifge*/, 0/*ifgt*/, 0/*ifle*/,
- 0/*if_icmpeq*/, 0/*if_icmpne*/, 0/*if_icmplt*/, 0/*if_icmpge*/, 0/*if_icmpgt*/,
- 0/*if_icmple*/, 0/*if_acmpeq*/, 0/*if_acmpne*/, 0/*goto*/, 1/*jsr*/, 0/*ret*/,
- 0/*tableswitch*/, 0/*lookupswitch*/, 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/,
- 0/*dreturn*/, 0/*areturn*/, 0/*return*/, UNPREDICTABLE/*getstatic*/, 0/*putstatic*/,
- UNPREDICTABLE/*getfield*/, 0/*putfield*/, UNPREDICTABLE/*invokevirtual*/,
- UNPREDICTABLE/*invokespecial*/, UNPREDICTABLE/*invokestatic*/,
- UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 1/*new*/, 1/*newarray*/, 1/*anewarray*/,
- 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 0/*monitorenter*/,
- 0/*monitorexit*/, 0/*wide*/, 1/*multianewarray*/, 0/*ifnull*/, 0/*ifnonnull*/,
- 0/*goto_w*/, 1/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/
- };
+
/** Attributes and their corresponding names.
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java Sun Dec 6 01:03:55 2009
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import org.apache.tomcat.util.bcel.Constants;
-
/**
* Super class for all objects that have modifiers like private, final, ...
* I.e. classes, fields, and methods.
@@ -103,9 +101,7 @@
- public final boolean isInterface() {
- return (access_flags & Constants.ACC_INTERFACE) != 0;
- }
+
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=887625&r1=887624&r2=887625&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 Sun Dec 6 01:03:55 2009
@@ -42,7 +42,7 @@
*/
public Annotations(byte annotation_type, int name_index, int length, DataInputStream file,
ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {
- this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool, isRuntimeVisible);
+ this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool);
annotation_table_length = (file.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
@@ -59,7 +59,7 @@
* @param constant_pool Array of constants
*/
public Annotations(byte annotation_type, int name_index, int length,
- AnnotationEntry[] annotation_table, ConstantPool constant_pool , boolean isRuntimeVisible) {
+ AnnotationEntry[] annotation_table, ConstantPool constant_pool) {
super(annotation_type, name_index, length, constant_pool);
setAnnotationTable(annotation_table);
}
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=887625&r1=887624&r2=887625&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 Sun Dec 6 01:03:55 2009
@@ -159,9 +159,7 @@
}
// Return the information we have gathered in a new object
return new JavaClass(class_name_index, superclass_name_index, file_name, major, minor,
- access_flags, constant_pool, interfaces, fields, methods, attributes, is_zip
- ? JavaClass.ZIP
- : JavaClass.FILE);
+ access_flags, constant_pool, interfaces, fields, methods, attributes);
}
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=887625&r1=887624&r2=887625&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 Sun Dec 6 01:03:55 2009
@@ -18,13 +18,9 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import java.util.StringTokenizer;
-import java.util.TreeSet;
import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.util.BCELComparator;
-import org.apache.tomcat.util.bcel.util.ClassQueue;
-import org.apache.tomcat.util.bcel.util.SyntheticRepository;
/**
* Represents a Java class, i.e., the data structures, constant pool,
@@ -75,13 +71,6 @@
return THIS.getClassName().hashCode();
}
};
- /**
- * In cases where we go ahead and create something,
- * use the default SyntheticRepository, because we
- * don't know any better.
- */
- private transient org.apache.tomcat.util.bcel.util.Repository repository = SyntheticRepository
- .getInstance();
/**
@@ -104,7 +93,7 @@
*/
public JavaClass(int class_name_index, int superclass_name_index, String file_name, int major,
int minor, int access_flags, ConstantPool constant_pool, int[] interfaces,
- Field[] fields, Method[] methods, Attribute[] attributes, byte source) {
+ Field[] fields, Method[] methods, Attribute[] attributes) {
if (interfaces == null) {
interfaces = new int[0];
}
@@ -213,55 +202,6 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /**
- * @return Names of implemented interfaces.
- */
- public String[] getInterfaceNames() {
- return interface_names;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /**
- * @return Superclass name.
- */
- public String getSuperclassName() {
- return superclass_name;
- }
-
-
/**
* @return String representing class contents.
*/
@@ -334,120 +274,6 @@
return (access_flags & Constants.ACC_SUPER) != 0;
}
-
-
-
-
-
-
-
- /**
- * Sets the ClassRepository which loaded the JavaClass.
- * Should be called immediately after parsing is done.
- */
- public void setRepository( org.apache.tomcat.util.bcel.util.Repository repository ) {
- this.repository = repository;
- }
-
-
-
-
-
- /**
- * @return true, if this class is an implementation of interface inter
- * @throws ClassNotFoundException if superclasses or superinterfaces
- * of this class can't be found
- */
- public boolean implementationOf( JavaClass inter ) throws ClassNotFoundException {
- if (!inter.isInterface()) {
- throw new IllegalArgumentException(inter.getClassName() + " is no interface");
- }
- if (this.equals(inter)) {
- return true;
- }
- JavaClass[] super_interfaces = getAllInterfaces();
- for (int i = 0; i < super_interfaces.length; i++) {
- if (super_interfaces[i].equals(inter)) {
- return true;
- }
- }
- return false;
- }
-
-
- /**
- * @return the superclass for this JavaClass object, or null if this
- * is java.lang.Object
- * @throws ClassNotFoundException if the superclass can't be found
- */
- public JavaClass getSuperClass() throws ClassNotFoundException {
- if ("java.lang.Object".equals(getClassName())) {
- return null;
- }
- return repository.loadClass(getSuperclassName());
- }
-
-
- /**
- * @return list of super classes of this class in ascending order, i.e.,
- * java.lang.Object is always the last element
- * @throws ClassNotFoundException if any of the superclasses can't be found
- */
- public JavaClass[] getSuperClasses() throws ClassNotFoundException {
- JavaClass clazz = this;
- List allSuperClasses = new ArrayList();
- for (clazz = clazz.getSuperClass(); clazz != null; clazz = clazz.getSuperClass()) {
- allSuperClasses.add(clazz);
- }
- return (JavaClass[]) allSuperClasses.toArray(new JavaClass[allSuperClasses.size()]);
- }
-
-
- /**
- * Get interfaces directly implemented by this JavaClass.
- */
- public JavaClass[] getInterfaces() throws ClassNotFoundException {
- String[] _interfaces = getInterfaceNames();
- JavaClass[] classes = new JavaClass[_interfaces.length];
- for (int i = 0; i < _interfaces.length; i++) {
- classes[i] = repository.loadClass(_interfaces[i]);
- }
- return classes;
- }
-
-
- /**
- * Get all interfaces implemented by this JavaClass (transitively).
- */
- public JavaClass[] getAllInterfaces() throws ClassNotFoundException {
- ClassQueue queue = new ClassQueue();
- Set allInterfaces = new TreeSet();
- queue.enqueue(this);
- while (!queue.empty()) {
- JavaClass clazz = queue.dequeue();
- JavaClass souper = clazz.getSuperClass();
- JavaClass[] _interfaces = clazz.getInterfaces();
- if (clazz.isInterface()) {
- allInterfaces.add(clazz);
- } else {
- if (souper != null) {
- queue.enqueue(souper);
- }
- }
- for (int i = 0; i < _interfaces.length; i++) {
- queue.enqueue(_interfaces[i]);
- }
- }
- return (JavaClass[]) allInterfaces.toArray(new JavaClass[allInterfaces.size()]);
- }
-
-
-
-
-
-
-
-
/**
* Return value as defined by given BCELComparator strategy.
* By default two JavaClass objects are said to be equal when
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java Sun Dec 6 01:03:55 2009
@@ -45,7 +45,7 @@
* @throws IOException
*/
StackMapEntry(DataInputStream file, ConstantPool constant_pool) throws IOException {
- this(file.readShort(), file.readShort(), null, -1, null, constant_pool);
+ this(file.readShort(), file.readShort(), null, -1, null);
types_of_locals = new StackMapType[number_of_locals];
for (int i = 0; i < number_of_locals; i++) {
types_of_locals[i] = new StackMapType(file, constant_pool);
@@ -60,7 +60,7 @@
public StackMapEntry(int byte_code_offset, int number_of_locals,
StackMapType[] types_of_locals, int number_of_stack_items,
- StackMapType[] types_of_stack_items, ConstantPool constant_pool) {
+ StackMapType[] types_of_stack_items) {
this.byte_code_offset = byte_code_offset;
this.number_of_locals = number_of_locals;
this.types_of_locals = types_of_locals;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java Sun Dec 6 01:03:55 2009
@@ -48,7 +48,7 @@
* @throws IOException
*/
StackMapTableEntry(DataInputStream file, ConstantPool constant_pool) throws IOException {
- this(file.read(), -1, -1, null, -1, null, constant_pool);
+ this(file.read(), -1, -1, null, -1, null);
if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) {
byte_code_offset_delta = frame_type - Constants.SAME_FRAME;
@@ -94,7 +94,7 @@
public StackMapTableEntry(int tag, int byte_code_offset_delta, int number_of_locals,
StackMapType[] types_of_locals, int number_of_stack_items,
- StackMapType[] types_of_stack_items, ConstantPool constant_pool) {
+ StackMapType[] types_of_stack_items) {
this.frame_type = tag;
this.byte_code_offset_delta = byte_code_offset_delta;
this.number_of_locals = number_of_locals;
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=887625&r1=887624&r2=887625&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 Sun Dec 6 01:03:55 2009
@@ -705,45 +705,7 @@
- /**
- * Return type of signature as a byte value as defined in <em>Constants</em>
- *
- * @param signature in format described above
- * @return type of signature
- * @see Constants
- */
- public static final byte typeOfSignature( String signature ) throws ClassFormatException {
- try {
- switch (signature.charAt(0)) {
- case 'B':
- return Constants.T_BYTE;
- case 'C':
- return Constants.T_CHAR;
- case 'D':
- return Constants.T_DOUBLE;
- case 'F':
- return Constants.T_FLOAT;
- case 'I':
- return Constants.T_INT;
- case 'J':
- return Constants.T_LONG;
- case 'L':
- return Constants.T_REFERENCE;
- case '[':
- return Constants.T_ARRAY;
- case 'V':
- return Constants.T_VOID;
- case 'Z':
- return Constants.T_BOOLEAN;
- case 'S':
- return Constants.T_SHORT;
- default:
- throw new ClassFormatException("Invalid method signature: " + signature);
- }
- } catch (StringIndexOutOfBoundsException e) {
- throw new ClassFormatException("Invalid method signature: " + signature, e);
- }
- }
+
@@ -834,12 +796,7 @@
- /** @return true, if character is one of (a, ... z, A, ... Z, 0, ... 9, _)
- */
- public static boolean isJavaIdentifierPart( char ch ) {
- return ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z'))
- || ((ch >= '0') && (ch <= '9')) || (ch == '_');
- }
+
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java Sun Dec 6 01:03:55 2009
@@ -40,30 +40,7 @@
}
- public static final BasicType getType( byte type ) {
- switch (type) {
- case Constants.T_VOID:
- return VOID;
- case Constants.T_BOOLEAN:
- return BOOLEAN;
- case Constants.T_BYTE:
- return BYTE;
- case Constants.T_SHORT:
- return SHORT;
- case Constants.T_CHAR:
- return CHAR;
- case Constants.T_INT:
- return INT;
- case Constants.T_LONG:
- return LONG;
- case Constants.T_DOUBLE:
- return DOUBLE;
- case Constants.T_FLOAT:
- return FLOAT;
- default:
- throw new ClassGenException("Invalid type: " + type);
- }
- }
+
/** @return a hash code value for the object.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java Sun Dec 6 01:03:55 2009
@@ -68,22 +68,6 @@
}
- protected int updatePosition( int offset, int max_offset ) {
- int x = bi.updatePosition(offset, max_offset);
- i_position = bi.position;
- return x;
- }
-
-
-
-
-
-
-
-
-
-
-
/**
* Set new contents. Old instruction is disposed and may not be used anymore.
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java Sun Dec 6 01:03:55 2009
@@ -18,7 +18,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* Abstract super class for branching instructions like GOTO, IFEQ, etc..
@@ -95,22 +94,6 @@
/**
- * Called by InstructionList.setPositions when setting the position for every
- * instruction. In the presence of variable length instructions `setPositions'
- * performs multiple passes over the instruction list to calculate the
- * correct (byte) positions and offsets by calling this function.
- *
- * @param offset additional offset caused by preceding (variable length) instructions
- * @param max_offset the maximum offset that may be caused by these instructions
- * @return additional offset caused by possible change of this instruction's length
- */
- protected int updatePosition( int offset, int max_offset ) {
- position += offset;
- return 0;
- }
-
-
- /**
* Long output format:
*
* <position in byte code>
@@ -145,31 +128,6 @@
/**
- * Read needed data (e.g. index) from file. Conversion to a InstructionHandle
- * is done in InstructionList(byte[]).
- *
- * @param bytes input stream
- * @param wide wide prefix?
- * @see InstructionList
- */
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
- length = 3;
- index = bytes.readShort();
- }
-
-
-
-
-
- /**
- * @return target of branch instruction
- */
- public InstructionHandle getTarget() {
- return target;
- }
-
-
- /**
* Set branch target
* @param target branch target
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java Sun Dec 6 01:03:55 2009
@@ -45,7 +45,6 @@
protected int size;
protected Constant[] constants;
protected int index = 1; // First entry (0) used by JVM
- private static final String NAT_DELIM = "%";
private static class Index implements java.io.Serializable {
@@ -84,21 +83,6 @@
}
}
- private Map class_table = new HashMap();
-
-
- /**
- * Look for ConstantClass in ConstantPool named `str'.
- *
- * @param str String to search for
- * @return index on success, -1 otherwise
- */
- public int lookupClass( String str ) {
- Index index = (Index) class_table.get(str.replace('.', '/'));
- return (index != null) ? index.index : -1;
- }
-
-
/**
* Look for ConstantInteger in ConstantPool.
*
@@ -285,22 +269,6 @@
return ret;
}
- private Map n_a_t_table = new HashMap();
-
-
- /**
- * Look for ConstantNameAndType in ConstantPool.
- *
- * @param name of variable/method
- * @param signature of variable/method
- * @return index on success, -1 otherwise
- */
- public int lookupNameAndType( String name, String signature ) {
- Index _index = (Index) n_a_t_table.get(name + NAT_DELIM + signature);
- return (_index != null) ? _index.index : -1;
- }
-
-
/**
* @param i index in constant pool
* @return constant pool entry at index i
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java Sun Dec 6 01:03:55 2009
@@ -28,5 +28,5 @@
public int getIndex();
- public void setIndex( int index );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java Sun Dec 6 01:03:55 2009
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.io.Serializable;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.ConstantPool;
-import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* Abstract super class for all Java byte codes.
@@ -93,61 +91,6 @@
/**
- * @return mnemonic for instruction with sumbolic references resolved
- */
- public String toString( ConstantPool cp ) {
- return toString(false);
- }
-
-
-
-
-
- /**
- * Read needed data (e.g. index) from file.
- *
- * @param bytes byte sequence to read from
- * @param wide "wide" instruction flag
- */
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
- }
-
-
-
-
- /**
- * This method also gives right results for instructions whose
- * effect on the stack depends on the constant pool entry they
- * reference.
- * @return Number of words consumed from stack by this instruction,
- * or Constants.UNPREDICTABLE, if this can not be computed statically
- */
- public int consumeStack( ConstantPoolGen cpg ) {
- return Constants.CONSUME_STACK[opcode];
- }
-
-
- /**
- * This method also gives right results for instructions whose
- * effect on the stack depends on the constant pool entry they
- * reference.
- * @return Number of words produced onto stack by this instruction,
- * or Constants.UNPREDICTABLE, if this can not be computed statically
- */
- public int produceStack( ConstantPoolGen cpg ) {
- return Constants.PRODUCE_STACK[opcode];
- }
-
-
- /**
- * @return this instructions opcode
- */
- public short getOpcode() {
- return opcode;
- }
-
-
- /**
* @return length (in bytes) of instruction
*/
public int getLength() {
@@ -160,13 +103,6 @@
void dispose() {
}
-
-
-
-
-
-
-
/** Check for equality, delegated to comparator
* @return true if that is an Instruction and has the same opcode
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java Sun Dec 6 01:03:55 2009
@@ -40,20 +40,16 @@
*/
public class InstructionHandle implements java.io.Serializable {
- InstructionHandle next, prev; // Will be set from the outside
+ InstructionHandle next; // Will be set from the outside
Instruction instruction;
protected int i_position = -1; // byte code offset of instruction
private Set targeters;
- public final InstructionHandle getNext() {
- return next;
- }
+
- public final InstructionHandle getPrev() {
- return prev;
- }
+
public final Instruction getInstruction() {
@@ -88,26 +84,6 @@
private static InstructionHandle ih_list = null; // List of reusable handles
-
-
-
-
- /**
- * Called by InstructionList.setPositions when setting the position for every
- * instruction. In the presence of variable length instructions `setPositions()'
- * performs multiple passes over the instruction list to calculate the
- * correct (byte) positions and offsets by calling this function.
- *
- * @param offset additional offset caused by preceding (variable length) instructions
- * @param max_offset the maximum offset that may be caused by these instructions
- * @return additional offset caused by possible change of this instruction's length
- */
- protected int updatePosition( int offset, int max_offset ) {
- i_position += offset;
- return 0;
- }
-
-
/** @return the position, i.e., the byte code offset of the contained
* instruction. This is accurate only after
* InstructionList.setPositions() has been called.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java Sun Dec 6 01:03:55 2009
@@ -51,30 +51,6 @@
- /**
- * Search for given Instruction reference, start at beginning of list.
- *
- * @param i instruction to search for
- * @return instruction found on success, null otherwise
- */
- private InstructionHandle findInstruction1( Instruction i ) {
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- if (ih.instruction == i) {
- return ih;
- }
- }
- return null;
- }
-
-
- public boolean contains( Instruction i ) {
- return findInstruction1(i) != null;
- }
-
-
-
-
-
public String toString() {
return toString(true);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java Sun Dec 6 01:03:55 2009
@@ -18,7 +18,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* NEWARRAY - Create new array of basic type (int, short, ...)
@@ -75,16 +74,4 @@
public String toString( boolean verbose ) {
return super.toString(verbose) + " " + org.apache.tomcat.util.bcel.Constants.TYPE_NAMES[type];
}
-
-
- /**
- * Read needed data (e.g. index) from file.
- */
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
- type = bytes.readByte();
- length = 2;
- }
-
-
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java Sun Dec 6 01:03:55 2009
@@ -26,9 +26,7 @@
*/
public abstract class ReferenceType extends Type {
- protected ReferenceType(byte t, String s) {
- super(t, s);
- }
+
/** Class is non-abstract but not instantiable from the outside
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java Sun Dec 6 01:03:55 2009
@@ -18,7 +18,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* Select - Abstract super class for LOOKUPSWITCH and TABLESWITCH instructions.
@@ -51,32 +50,6 @@
-
-
- /**
- * Since this is a variable length instruction, it may shift the following
- * instructions which then need to update their position.
- *
- * Called by InstructionList.setPositions when setting the position for every
- * instruction. In the presence of variable length instructions `setPositions'
- * performs multiple passes over the instruction list to calculate the
- * correct (byte) positions and offsets by calling this function.
- *
- * @param offset additional offset caused by preceding (variable length) instructions
- * @param max_offset the maximum offset that may be caused by these instructions
- * @return additional offset caused by possible change of this instruction's length
- */
- protected int updatePosition( int offset, int max_offset ) {
- position += offset; // Additional offset caused by preceding SWITCHs, GOTOs, etc.
- short old_length = length;
- /* Alignment on 4-byte-boundary, + 1, because of tag byte.
- */
- padding = (4 - ((position + 1) % 4)) % 4;
- length = (short) (fixed_length + padding); // Update length
- return length - old_length;
- }
-
-
/**
* Dump instruction as byte code to stream out.
* @param out Output stream
@@ -92,19 +65,6 @@
/**
- * Read needed data (e.g. index) from file.
- */
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
- padding = (4 - (bytes.getIndex() % 4)) % 4; // Compute number of pad bytes
- for (int i = 0; i < padding; i++) {
- bytes.readByte();
- }
- // Default branch target common for both cases (TABLESWITCH, LOOKUPSWITCH)
- index = bytes.readInt();
- }
-
-
- /**
* @return mnemonic for instruction
*/
public String toString( boolean verbose ) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java?rev=887625&r1=887624&r2=887625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java Sun Dec 6 01:03:55 2009
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.bcel.generic;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
import org.apache.tomcat.util.bcel.classfile.Utility;
/**
@@ -31,20 +30,15 @@
protected byte type;
protected String signature; // signature for the type
- /** Predefined constants
- */
- public static final BasicType VOID = new BasicType(Constants.T_VOID);
- public static final BasicType BOOLEAN = new BasicType(Constants.T_BOOLEAN);
- public static final BasicType INT = new BasicType(Constants.T_INT);
- public static final BasicType SHORT = new BasicType(Constants.T_SHORT);
- public static final BasicType BYTE = new BasicType(Constants.T_BYTE);
- public static final BasicType LONG = new BasicType(Constants.T_LONG);
- public static final BasicType DOUBLE = new BasicType(Constants.T_DOUBLE);
- public static final BasicType FLOAT = new BasicType(Constants.T_FLOAT);
- public static final BasicType CHAR = new BasicType(Constants.T_CHAR);
- public static final ObjectType OBJECT = new ObjectType("java.lang.Object");
- public static final ObjectType CLASS = new ObjectType("java.lang.Class");
- public static final ObjectType STRING = new ObjectType("java.lang.String");
+
+
+
+
+
+
+
+
+
@@ -87,28 +81,10 @@
}
- /**
- * @return type as defined in Constants
- */
- public byte getType() {
- return type;
- }
+
- /**
- * @return stack size of this type (2 for long and double, 0 for void, 1 otherwise)
- */
- public int getSize() {
- switch (type) {
- case Constants.T_DOUBLE:
- case Constants.T_LONG:
- return 2;
- case Constants.T_VOID:
- return 0;
- default:
- return 1;
- }
- }
+
/**
@@ -139,142 +115,4 @@
return buf.toString();
}
- private static ThreadLocal consumed_chars = new ThreadLocal() {
-
- protected Object initialValue() {
- return new Integer(0);
- }
- };//int consumed_chars=0; // Remember position in string, see getArgumentTypes
-
-
- private static int unwrap( ThreadLocal tl ) {
- return ((Integer) tl.get()).intValue();
- }
-
-
- private static void wrap( ThreadLocal tl, int value ) {
- tl.set(new Integer(value));
- }
-
-
- /**
- * Convert signature to a Type object.
- * @param signature signature string such as Ljava/lang/String;
- * @return type object
- */
- public static final Type getType( String signature ) throws StringIndexOutOfBoundsException {
- byte type = Utility.typeOfSignature(signature);
- if (type <= Constants.T_VOID) {
- //corrected concurrent private static field acess
- wrap(consumed_chars, 1);
- return BasicType.getType(type);
- } else if (type == Constants.T_ARRAY) {
- int dim = 0;
- do { // Count dimensions
- dim++;
- } while (signature.charAt(dim) == '[');
- // Recurse, but just once, if the signature is ok
- Type t = getType(signature.substring(dim));
- //corrected concurrent private static field acess
- // consumed_chars += dim; // update counter - is replaced by
- int _temp = unwrap(consumed_chars) + dim;
- wrap(consumed_chars, _temp);
- return new ArrayType(t, dim);
- } else { // type == T_REFERENCE
- int index = signature.indexOf(';'); // Look for closing `;'
- if (index < 0) {
- throw new ClassFormatException("Invalid signature: " + signature);
- }
- //corrected concurrent private static field acess
- wrap(consumed_chars, index + 1); // "Lblabla;" `L' and `;' are removed
- return new ObjectType(signature.substring(1, index).replace('/', '.'));
- }
- }
-
-
- /**
- * Convert return value of a method (signature) to a Type object.
- *
- * @param signature signature string such as (Ljava/lang/String;)V
- * @return return type
- */
- public static Type getReturnType( String signature ) {
- try {
- // Read return type after `)'
- int index = signature.lastIndexOf(')') + 1;
- return getType(signature.substring(index));
- } catch (StringIndexOutOfBoundsException e) { // Should never occur
- throw new ClassFormatException("Invalid method signature: " + signature, e);
- }
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
- private static int size(int coded) {
- return coded & 3;
- }
-
- private static int consumed(int coded) {
- return coded >> 2;
- }
-
- private static int encode(int size, int consumed) {
- return consumed << 2 | size;
- }
-
- static int getArgumentTypesSize( String signature ) {
- int res = 0;
- int index;
- try { // Read all declarations between for `(' and `)'
- if (signature.charAt(0) != '(') {
- throw new ClassFormatException("Invalid method signature: " + signature);
- }
- index = 1; // current string position
- while (signature.charAt(index) != ')') {
- int coded = getTypeSize(signature.substring(index));
- res += size(coded);
- index += consumed(coded);
- }
- } catch (StringIndexOutOfBoundsException e) { // Should never occur
- throw new ClassFormatException("Invalid method signature: " + signature, e);
- }
- return res;
- }
-
- static final int getTypeSize( String signature ) throws StringIndexOutOfBoundsException {
- byte type = Utility.typeOfSignature(signature);
- if (type <= Constants.T_VOID) {
- return encode(BasicType.getType(type).getSize(), 1);
- } else if (type == Constants.T_ARRAY) {
- int dim = 0;
- do { // Count dimensions
- dim++;
- } while (signature.charAt(dim) == '[');
- // Recurse, but just once, if the signature is ok
- int consumed = consumed(getTypeSize(signature.substring(dim)));
- return encode(1, dim + consumed);
- } else { // type == T_REFERENCE
- int index = signature.indexOf(';'); // Look for closing `;'
- if (index < 0) {
- throw new ClassFormatException("Invalid signature: " + signature);
- }
- return encode(1, index + 1);
- }
- }
-
-
- static int getReturnTypeSize(String signature) {
- int index = signature.lastIndexOf(')') + 1;
- return getTypeSize(signature.substring(index));
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java Sun Dec 6 00:19:52 2009
@@ -88,18 +88,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitUnknown(this);
- }
-
-
- /**
* Dump unknown bytes to file stream.
*
* @param file Output file stream
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -16,11 +16,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.FilterReader;
-import java.io.FilterWriter;
import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.util.ByteSequence;
@@ -855,7 +851,6 @@
private static final int FREE_CHARS = 48;
static int[] CHAR_MAP = new int[FREE_CHARS];
static int[] MAP_CHAR = new int[256]; // Reverse map
- private static final char ESCAPE_CHAR = '$';
static {
int j = 0;
for (int i = 'A'; i <= 'Z'; i++) {
@@ -875,93 +870,6 @@
MAP_CHAR['_'] = j;
}
- /** Decode characters into bytes.
- * Used by <a href="Utility.html#decode(java.lang.String, boolean)">decode()</a>
- */
- private static class JavaReader extends FilterReader {
-
- public JavaReader(Reader in) {
- super(in);
- }
-
-
- public int read() throws IOException {
- int b = in.read();
- if (b != ESCAPE_CHAR) {
- return b;
- }
- int i = in.read();
- if (i < 0) {
- return -1;
- }
- if (((i >= '0') && (i <= '9')) || ((i >= 'a') && (i <= 'f'))) { // Normal escape
- int j = in.read();
- if (j < 0) {
- return -1;
- }
- char[] tmp = {
- (char) i, (char) j
- };
- int s = Integer.parseInt(new String(tmp), 16);
- return s;
- }
- return MAP_CHAR[i];
- }
-
-
- public int read( char[] cbuf, int off, int len ) throws IOException {
- for (int i = 0; i < len; i++) {
- cbuf[off + i] = (char) read();
- }
- return len;
- }
- }
-
- /** Encode bytes into valid java identifier characters.
- * Used by <a href="Utility.html#encode(byte[], boolean)">encode()</a>
- */
- private static class JavaWriter extends FilterWriter {
-
- public JavaWriter(Writer out) {
- super(out);
- }
-
-
- public void write( int b ) throws IOException {
- if (isJavaIdentifierPart((char) b) && (b != ESCAPE_CHAR)) {
- out.write(b);
- } else {
- out.write(ESCAPE_CHAR); // Escape character
- // Special escape
- if (b >= 0 && b < FREE_CHARS) {
- out.write(CHAR_MAP[b]);
- } else { // Normal escape
- char[] tmp = Integer.toHexString(b).toCharArray();
- if (tmp.length == 1) {
- out.write('0');
- out.write(tmp[0]);
- } else {
- out.write(tmp[0]);
- out.write(tmp[1]);
- }
- }
- }
- }
-
-
- public void write( char[] cbuf, int off, int len ) throws IOException {
- for (int i = 0; i < len; i++) {
- write(cbuf[off + i]);
- }
- }
-
-
- public void write( String str, int off, int len ) throws IOException {
- write(str.toCharArray(), off, len);
- }
- }
-
-
/**
* Escape all occurences of newline chars '\n', quotes \", etc.
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java Sun Dec 6 00:19:52 2009
@@ -43,15 +43,7 @@
private static BranchHandle bh_list = null; // List of reusable handles
- static final BranchHandle getBranchHandle( BranchInstruction i ) {
- if (bh_list == null) {
- return new BranchHandle(i);
- }
- BranchHandle bh = bh_list;
- bh_list = (BranchHandle) bh.next;
- bh.setInstruction(i);
- return bh;
- }
+
/** Handle adds itself to the list of resuable handles.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java Sun Dec 6 00:19:52 2009
@@ -158,12 +158,7 @@
}
- /**
- * @return target offset in byte code
- */
- public final int getIndex() {
- return index;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java Sun Dec 6 00:19:52 2009
@@ -48,13 +48,7 @@
}
- /**
- * @param index to constant pool
- */
- protected CPInstruction(short opcode, int index) {
- super(opcode, (short) 3);
- setIndex(index);
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java Sun Dec 6 00:19:52 2009
@@ -16,10 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.AccessFlags;
import org.apache.tomcat.util.bcel.classfile.JavaClass;
import org.apache.tomcat.util.bcel.util.BCELComparator;
@@ -36,16 +32,7 @@
/* Corresponds to the fields found in a JavaClass object.
*/
- private String class_name, super_class_name, file_name;
- private int class_name_index = -1, superclass_name_index = -1;
- private int major = Constants.MAJOR_1_1, minor = Constants.MINOR_1_1;
- private ConstantPoolGen cp; // Template for building up constant pool
- // ArrayLists instead of arrays to gather fields, methods, etc.
- private List field_vec = new ArrayList();
- private List method_vec = new ArrayList();
- private List attribute_vec = new ArrayList();
- private List interface_vec = new ArrayList();
- private List annotation_vec = new ArrayList();
+ private String class_name;
private static BCELComparator _cmp = new BCELComparator() {
@@ -61,88 +48,13 @@
return THIS.getClassName().hashCode();
}
};
-
-
-
-
-
-
-
-
public String getClassName() {
return class_name;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- private ArrayList observers;
-
-
-
-
-
-
-
-
-
-
-
public Object clone() {
try {
return super.clone();
@@ -152,13 +64,7 @@
}
}
-
-
-
-
-
-
/**
* Return value as defined by given BCELComparator strategy.
* By default two ClassGen objects are said to be equal when
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java Sun Dec 6 00:19:52 2009
@@ -19,17 +19,11 @@
import java.util.HashMap;
import java.util.Map;
import org.apache.tomcat.util.bcel.classfile.Constant;
-import org.apache.tomcat.util.bcel.classfile.ConstantClass;
import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
-import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
-import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
import org.apache.tomcat.util.bcel.classfile.ConstantLong;
-import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
-import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
import org.apache.tomcat.util.bcel.classfile.ConstantPool;
-import org.apache.tomcat.util.bcel.classfile.ConstantString;
import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
/**
@@ -51,9 +45,6 @@
protected int size;
protected Constant[] constants;
protected int index = 1; // First entry (0) used by JVM
- private static final String METHODREF_DELIM = ":";
- private static final String IMETHODREF_DELIM = "#";
- private static final String FIELDREF_DELIM = "&";
private static final String NAT_DELIM = "%";
private static class Index implements java.io.Serializable {
@@ -93,43 +84,6 @@
}
}
- private Map string_table = new HashMap();
-
-
- /**
- * Look for ConstantString in ConstantPool containing String `str'.
- *
- * @param str String to search for
- * @return index on success, -1 otherwise
- */
- public int lookupString( String str ) {
- Index index = (Index) string_table.get(str);
- return (index != null) ? index.index : -1;
- }
-
-
- /**
- * Add a new String constant to the ConstantPool, if it is not already in there.
- *
- * @param str String to add
- * @return index of entry
- */
- public int addString( String str ) {
- int ret;
- if ((ret = lookupString(str)) != -1) {
- return ret; // Already in CP
- }
- int utf8 = addUtf8(str);
- adjustSize();
- ConstantString s = new ConstantString(utf8);
- ret = index;
- constants[index++] = s;
- if (!string_table.containsKey(str)) {
- string_table.put(str, new Index(ret));
- }
- return ret;
- }
-
private Map class_table = new HashMap();
@@ -145,47 +99,6 @@
}
- private int addClass_( String clazz ) {
- int ret;
- if ((ret = lookupClass(clazz)) != -1) {
- return ret; // Already in CP
- }
- adjustSize();
- ConstantClass c = new ConstantClass(addUtf8(clazz));
- ret = index;
- constants[index++] = c;
- if (!class_table.containsKey(clazz)) {
- class_table.put(clazz, new Index(ret));
- }
- return ret;
- }
-
-
- /**
- * Add a new Class reference to the ConstantPool, if it is not already in there.
- *
- * @param str Class to add
- * @return index of entry
- */
- public int addClass( String str ) {
- return addClass_(str.replace('.', '/'));
- }
-
-
- /**
- * Add a new Class reference to the ConstantPool for a given type.
- *
- * @param type Class to add
- * @return index of entry
- */
- public int addClass( ObjectType type ) {
- return addClass(type.getClassName());
- }
-
-
-
-
-
/**
* Look for ConstantInteger in ConstantPool.
*
@@ -387,175 +300,7 @@
return (_index != null) ? _index.index : -1;
}
-
- /**
- * Add a new NameAndType constant to the ConstantPool if it is not already
- * in there.
- *
- * @param name Name string to add
- * @param signature signature string to add
- * @return index of entry
- */
- public int addNameAndType( String name, String signature ) {
- int ret;
- int name_index, signature_index;
- if ((ret = lookupNameAndType(name, signature)) != -1) {
- return ret; // Already in CP
- }
- adjustSize();
- name_index = addUtf8(name);
- signature_index = addUtf8(signature);
- ret = index;
- constants[index++] = new ConstantNameAndType(name_index, signature_index);
- String key = name + NAT_DELIM + signature;
- if (!n_a_t_table.containsKey(key)) {
- n_a_t_table.put(key, new Index(ret));
- }
- return ret;
- }
-
- private Map cp_table = new HashMap();
-
-
- /**
- * Look for ConstantMethodref in ConstantPool.
- *
- * @param class_name Where to find method
- * @param method_name Guess what
- * @param signature return and argument types
- * @return index on success, -1 otherwise
- */
- public int lookupMethodref( String class_name, String method_name, String signature ) {
- Index index = (Index) cp_table.get(class_name + METHODREF_DELIM + method_name
- + METHODREF_DELIM + signature);
- return (index != null) ? index.index : -1;
- }
-
-
-
-
-
- /**
- * Add a new Methodref constant to the ConstantPool, if it is not already
- * in there.
- *
- * @param class_name class name string to add
- * @param method_name method name string to add
- * @param signature method signature string to add
- * @return index of entry
- */
- public int addMethodref( String class_name, String method_name, String signature ) {
- int ret, class_index, name_and_type_index;
- if ((ret = lookupMethodref(class_name, method_name, signature)) != -1) {
- return ret; // Already in CP
- }
- adjustSize();
- name_and_type_index = addNameAndType(method_name, signature);
- class_index = addClass(class_name);
- ret = index;
- constants[index++] = new ConstantMethodref(class_index, name_and_type_index);
- String key = class_name + METHODREF_DELIM + method_name + METHODREF_DELIM + signature;
- if (!cp_table.containsKey(key)) {
- cp_table.put(key, new Index(ret));
- }
- return ret;
- }
-
-
-
-
-
- /**
- * Look for ConstantInterfaceMethodref in ConstantPool.
- *
- * @param class_name Where to find method
- * @param method_name Guess what
- * @param signature return and argument types
- * @return index on success, -1 otherwise
- */
- public int lookupInterfaceMethodref( String class_name, String method_name, String signature ) {
- Index index = (Index) cp_table.get(class_name + IMETHODREF_DELIM + method_name
- + IMETHODREF_DELIM + signature);
- return (index != null) ? index.index : -1;
- }
-
-
-
-
-
- /**
- * Add a new InterfaceMethodref constant to the ConstantPool, if it is not already
- * in there.
- *
- * @param class_name class name string to add
- * @param method_name method name string to add
- * @param signature signature string to add
- * @return index of entry
- */
- public int addInterfaceMethodref( String class_name, String method_name, String signature ) {
- int ret, class_index, name_and_type_index;
- if ((ret = lookupInterfaceMethodref(class_name, method_name, signature)) != -1) {
- return ret; // Already in CP
- }
- adjustSize();
- class_index = addClass(class_name);
- name_and_type_index = addNameAndType(method_name, signature);
- ret = index;
- constants[index++] = new ConstantInterfaceMethodref(class_index, name_and_type_index);
- String key = class_name + IMETHODREF_DELIM + method_name + IMETHODREF_DELIM + signature;
- if (!cp_table.containsKey(key)) {
- cp_table.put(key, new Index(ret));
- }
- return ret;
- }
-
-
-
-
- /**
- * Look for ConstantFieldref in ConstantPool.
- *
- * @param class_name Where to find method
- * @param field_name Guess what
- * @param signature return and argument types
- * @return index on success, -1 otherwise
- */
- public int lookupFieldref( String class_name, String field_name, String signature ) {
- Index index = (Index) cp_table.get(class_name + FIELDREF_DELIM + field_name
- + FIELDREF_DELIM + signature);
- return (index != null) ? index.index : -1;
- }
-
-
- /**
- * Add a new Fieldref constant to the ConstantPool, if it is not already
- * in there.
- *
- * @param class_name class name string to add
- * @param field_name field name string to add
- * @param signature signature string to add
- * @return index of entry
- */
- public int addFieldref( String class_name, String field_name, String signature ) {
- int ret;
- int class_index, name_and_type_index;
- if ((ret = lookupFieldref(class_name, field_name, signature)) != -1) {
- return ret; // Already in CP
- }
- adjustSize();
- class_index = addClass(class_name);
- name_and_type_index = addNameAndType(field_name, signature);
- ret = index;
- constants[index++] = new ConstantFieldref(class_index, name_and_type_index);
- String key = class_name + FIELDREF_DELIM + field_name + FIELDREF_DELIM + signature;
- if (!cp_table.containsKey(key)) {
- cp_table.put(key, new Index(ret));
- }
- return ret;
- }
-
-
/**
* @param i index in constant pool
* @return constant pool entry at index i
@@ -565,9 +310,6 @@
}
-
-
-
/**
* @return intermediate constant pool
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java Sun Dec 6 00:19:52 2009
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import java.util.List;
import org.apache.tomcat.util.bcel.classfile.Field;
import org.apache.tomcat.util.bcel.classfile.Utility;
import org.apache.tomcat.util.bcel.util.BCELComparator;
@@ -60,18 +59,6 @@
return type.getSignature();
}
- private List observers;
-
-
-
-
-
-
-
-
-
-
-
public String getInitValue() {
if (value != null) {
return value.toString();
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java Sun Dec 6 00:19:52 2009
@@ -18,7 +18,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.AccessFlags;
import org.apache.tomcat.util.bcel.classfile.Attribute;
@@ -35,19 +34,14 @@
protected Type type;
protected ConstantPoolGen cp;
private List attribute_vec = new ArrayList();
- protected ArrayList annotation_vec= new ArrayList();
+
protected FieldGenOrMethodGen() {
}
- public void setType( Type type ) {
- if (type.getType() == Constants.T_ADDRESS) {
- throw new IllegalArgumentException("Type can not be " + type);
- }
- this.type = type;
- }
+
@@ -60,30 +54,16 @@
}
- public void setName( String name ) {
- this.name = name;
- }
+
- public void setConstantPool( ConstantPoolGen cp ) {
- this.cp = cp;
- }
+
- /**
- * Add an attribute to this method. Currently, the JVM knows about
- * the `Code', `ConstantValue', `Synthetic' and `Exceptions'
- * attributes. Other attributes will be ignored by the JVM but do no
- * harm.
- *
- * @param a attribute to be added
- */
- public void addAttribute( Attribute a ) {
- attribute_vec.add(a);
- }
+
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java Sun Dec 6 00:19:52 2009
@@ -54,26 +54,7 @@
- /** @return name of the referenced class/interface
- * @deprecated If the instruction references an array class,
- * this method will return "java.lang.Object".
- * For code generated by Java 1.5, this answer is
- * sometimes wrong (e.g., if the "clone()" method is
- * called on an array). A better idea is to use
- * the getReferenceType() method, which correctly distinguishes
- * between class types and array types.
- */
- public String getClassName( ConstantPoolGen cpg ) {
- ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
- String className = cp.getConstantString(cmr.getClassIndex(),
- org.apache.tomcat.util.bcel.Constants.CONSTANT_Class);
- if (className.startsWith("[")) {
- // Turn array classes into java.lang.Object.
- return "java.lang.Object";
- }
- return className.replace('/', '.');
- }
+
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java Sun Dec 6 00:19:52 2009
@@ -113,327 +113,7 @@
}
- /**
- * Read an instruction from (byte code) input stream and return the
- * appropiate object.
- *
- * @param bytes input stream bytes
- * @return instruction object being read
- */
- public static final Instruction readInstruction( ByteSequence bytes ) throws IOException {
- boolean wide = false;
- short opcode = (short) bytes.readUnsignedByte();
- Instruction obj = null;
- if (opcode == Constants.WIDE) { // Read next opcode after wide byte
- wide = true;
- opcode = (short) bytes.readUnsignedByte();
- }
- if (InstructionConstants.INSTRUCTIONS[opcode] != null) {
- return InstructionConstants.INSTRUCTIONS[opcode]; // Used predefined immutable object, if available
- }
-
- switch (opcode) {
- case Constants.BIPUSH:
- obj = new BIPUSH();
- break;
- case Constants.SIPUSH:
- obj = new SIPUSH();
- break;
- case Constants.LDC:
- obj = new LDC();
- break;
- case Constants.LDC_W:
- obj = new LDC_W();
- break;
- case Constants.LDC2_W:
- obj = new LDC2_W();
- break;
- case Constants.ILOAD:
- obj = new ILOAD();
- break;
- case Constants.LLOAD:
- obj = new LLOAD();
- break;
- case Constants.FLOAD:
- obj = new FLOAD();
- break;
- case Constants.DLOAD:
- obj = new DLOAD();
- break;
- case Constants.ALOAD:
- obj = new ALOAD();
- break;
- case Constants.ILOAD_0:
- obj = new ILOAD(0);
- break;
- case Constants.ILOAD_1:
- obj = new ILOAD(1);
- break;
- case Constants.ILOAD_2:
- obj = new ILOAD(2);
- break;
- case Constants.ILOAD_3:
- obj = new ILOAD(3);
- break;
- case Constants.LLOAD_0:
- obj = new LLOAD(0);
- break;
- case Constants.LLOAD_1:
- obj = new LLOAD(1);
- break;
- case Constants.LLOAD_2:
- obj = new LLOAD(2);
- break;
- case Constants.LLOAD_3:
- obj = new LLOAD(3);
- break;
- case Constants.FLOAD_0:
- obj = new FLOAD(0);
- break;
- case Constants.FLOAD_1:
- obj = new FLOAD(1);
- break;
- case Constants.FLOAD_2:
- obj = new FLOAD(2);
- break;
- case Constants.FLOAD_3:
- obj = new FLOAD(3);
- break;
- case Constants.DLOAD_0:
- obj = new DLOAD(0);
- break;
- case Constants.DLOAD_1:
- obj = new DLOAD(1);
- break;
- case Constants.DLOAD_2:
- obj = new DLOAD(2);
- break;
- case Constants.DLOAD_3:
- obj = new DLOAD(3);
- break;
- case Constants.ALOAD_0:
- obj = new ALOAD(0);
- break;
- case Constants.ALOAD_1:
- obj = new ALOAD(1);
- break;
- case Constants.ALOAD_2:
- obj = new ALOAD(2);
- break;
- case Constants.ALOAD_3:
- obj = new ALOAD(3);
- break;
- case Constants.ISTORE:
- obj = new ISTORE();
- break;
- case Constants.LSTORE:
- obj = new LSTORE();
- break;
- case Constants.FSTORE:
- obj = new FSTORE();
- break;
- case Constants.DSTORE:
- obj = new DSTORE();
- break;
- case Constants.ASTORE:
- obj = new ASTORE();
- break;
- case Constants.ISTORE_0:
- obj = new ISTORE(0);
- break;
- case Constants.ISTORE_1:
- obj = new ISTORE(1);
- break;
- case Constants.ISTORE_2:
- obj = new ISTORE(2);
- break;
- case Constants.ISTORE_3:
- obj = new ISTORE(3);
- break;
- case Constants.LSTORE_0:
- obj = new LSTORE(0);
- break;
- case Constants.LSTORE_1:
- obj = new LSTORE(1);
- break;
- case Constants.LSTORE_2:
- obj = new LSTORE(2);
- break;
- case Constants.LSTORE_3:
- obj = new LSTORE(3);
- break;
- case Constants.FSTORE_0:
- obj = new FSTORE(0);
- break;
- case Constants.FSTORE_1:
- obj = new FSTORE(1);
- break;
- case Constants.FSTORE_2:
- obj = new FSTORE(2);
- break;
- case Constants.FSTORE_3:
- obj = new FSTORE(3);
- break;
- case Constants.DSTORE_0:
- obj = new DSTORE(0);
- break;
- case Constants.DSTORE_1:
- obj = new DSTORE(1);
- break;
- case Constants.DSTORE_2:
- obj = new DSTORE(2);
- break;
- case Constants.DSTORE_3:
- obj = new DSTORE(3);
- break;
- case Constants.ASTORE_0:
- obj = new ASTORE(0);
- break;
- case Constants.ASTORE_1:
- obj = new ASTORE(1);
- break;
- case Constants.ASTORE_2:
- obj = new ASTORE(2);
- break;
- case Constants.ASTORE_3:
- obj = new ASTORE(3);
- break;
- case Constants.IINC:
- obj = new IINC();
- break;
- case Constants.IFEQ:
- obj = new IFEQ();
- break;
- case Constants.IFNE:
- obj = new IFNE();
- break;
- case Constants.IFLT:
- obj = new IFLT();
- break;
- case Constants.IFGE:
- obj = new IFGE();
- break;
- case Constants.IFGT:
- obj = new IFGT();
- break;
- case Constants.IFLE:
- obj = new IFLE();
- break;
- case Constants.IF_ICMPEQ:
- obj = new IF_ICMPEQ();
- break;
- case Constants.IF_ICMPNE:
- obj = new IF_ICMPNE();
- break;
- case Constants.IF_ICMPLT:
- obj = new IF_ICMPLT();
- break;
- case Constants.IF_ICMPGE:
- obj = new IF_ICMPGE();
- break;
- case Constants.IF_ICMPGT:
- obj = new IF_ICMPGT();
- break;
- case Constants.IF_ICMPLE:
- obj = new IF_ICMPLE();
- break;
- case Constants.IF_ACMPEQ:
- obj = new IF_ACMPEQ();
- break;
- case Constants.IF_ACMPNE:
- obj = new IF_ACMPNE();
- break;
- case Constants.GOTO:
- obj = new GOTO();
- break;
- case Constants.JSR:
- obj = new JSR();
- break;
- case Constants.RET:
- obj = new RET();
- break;
- case Constants.TABLESWITCH:
- obj = new TABLESWITCH();
- break;
- case Constants.LOOKUPSWITCH:
- obj = new LOOKUPSWITCH();
- break;
- case Constants.GETSTATIC:
- obj = new GETSTATIC();
- break;
- case Constants.PUTSTATIC:
- obj = new PUTSTATIC();
- break;
- case Constants.GETFIELD:
- obj = new GETFIELD();
- break;
- case Constants.PUTFIELD:
- obj = new PUTFIELD();
- break;
- case Constants.INVOKEVIRTUAL:
- obj = new INVOKEVIRTUAL();
- break;
- case Constants.INVOKESPECIAL:
- obj = new INVOKESPECIAL();
- break;
- case Constants.INVOKESTATIC:
- obj = new INVOKESTATIC();
- break;
- case Constants.INVOKEINTERFACE:
- obj = new INVOKEINTERFACE();
- break;
- case Constants.NEW:
- obj = new NEW();
- break;
- case Constants.NEWARRAY:
- obj = new NEWARRAY();
- break;
- case Constants.ANEWARRAY:
- obj = new ANEWARRAY();
- break;
- case Constants.CHECKCAST:
- obj = new CHECKCAST();
- break;
- case Constants.INSTANCEOF:
- obj = new INSTANCEOF();
- break;
- case Constants.MULTIANEWARRAY:
- obj = new MULTIANEWARRAY();
- break;
- case Constants.IFNULL:
- obj = new IFNULL();
- break;
- case Constants.IFNONNULL:
- obj = new IFNONNULL();
- break;
- case Constants.GOTO_W:
- obj = new GOTO_W();
- break;
- case Constants.JSR_W:
- obj = new JSR_W();
- break;
- case Constants.BREAKPOINT:
- obj = new BREAKPOINT();
- break;
- case Constants.IMPDEP1:
- obj = new IMPDEP1();
- break;
- case Constants.IMPDEP2:
- obj = new IMPDEP2();
- break;
- default:
- throw new ClassGenException("Illegal opcode detected: " + opcode);
-
- }
-
- if (wide
- && !((obj instanceof LocalVariableInstruction) || (obj instanceof IINC) || (obj instanceof RET))) {
- throw new ClassGenException("Illegal opcode after wide: " + opcode);
- }
- obj.setOpcode(opcode);
- obj.initFromFile(bytes, wide); // Do further initializations, if any
- return obj;
- }
+
/**
* This method also gives right results for instructions whose
@@ -475,14 +155,6 @@
}
- /**
- * Needed in readInstruction.
- */
- private void setOpcode( short opcode ) {
- this.opcode = opcode;
- }
-
-
/** Some instructions may be reused, so don't do anything by default.
*/
void dispose() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java Sun Dec 6 00:19:52 2009
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.bcel.generic;
import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
import org.apache.tomcat.util.bcel.classfile.Utility;
@@ -45,7 +44,6 @@
Instruction instruction;
protected int i_position = -1; // byte code offset of instruction
private Set targeters;
- private Map attributes;
public final InstructionHandle getNext() {
@@ -91,18 +89,7 @@
private static InstructionHandle ih_list = null; // List of reusable handles
- /** Factory method.
- */
- static final InstructionHandle getInstructionHandle( Instruction i ) {
- if (ih_list == null) {
- return new InstructionHandle(i);
- } else {
- InstructionHandle ih = ih_list;
- ih_list = ih.next;
- ih.setInstruction(i);
- return ih;
- }
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java Sun Dec 6 00:19:52 2009
@@ -17,8 +17,6 @@
package org.apache.tomcat.util.bcel.generic;
import java.io.Serializable;
-import java.util.List;
-import org.apache.tomcat.util.bcel.Constants;
/**
* This class is a container for a list of <a
@@ -42,9 +40,6 @@
public class InstructionList implements Serializable {
private InstructionHandle start = null, end = null;
- private int length = 0; // number of elements in list
- private int[] byte_positions; // byte code offsets corresponding to instructions
-
/**
* Create (empty) instruction list.
@@ -52,195 +47,7 @@
public InstructionList() {
}
-
-
-
-
-
-
-
-
-
-
- /**
- * Test for empty list.
- */
- public boolean isEmpty() {
- return start == null;
- } // && end == null
-
-
- /**
- * Find the target instruction (handle) that corresponds to the given target
- * position (byte code offset).
- *
- * @param ihs array of instruction handles, i.e. il.getInstructionHandles()
- * @param pos array of positions corresponding to ihs, i.e. il.getInstructionPositions()
- * @param count length of arrays
- * @param target target position to search for
- * @return target position's instruction handle if available
- */
- public static InstructionHandle findHandle( InstructionHandle[] ihs, int[] pos, int count,
- int target ) {
- int l = 0, r = count - 1;
- /* Do a binary search since the pos array is orderd.
- */
- do {
- int i = (l + r) / 2;
- int j = pos[i];
- if (j == target) {
- return ihs[i];
- } else if (target < j) {
- r = i - 1;
- } else {
- l = i + 1;
- }
- } while (l <= r);
- return null;
- }
-
-
-
-
-
-
-
-
- /**
- * Append another list after instruction (handle) ih contained in this list.
- * Consumes argument list, i.e., it becomes empty.
- *
- * @param ih where to append the instruction list
- * @param il Instruction list to append to this one
- * @return instruction handle pointing to the <B>first</B> appended instruction
- */
- public InstructionHandle append( InstructionHandle ih, InstructionList il ) {
- if (il == null) {
- throw new ClassGenException("Appending null InstructionList");
- }
- if (il.isEmpty()) {
- return ih;
- }
- InstructionHandle next = ih.next, ret = il.start;
- ih.next = il.start;
- il.start.prev = ih;
- il.end.next = next;
- if (next != null) {
- next.prev = il.end;
- } else {
- end = il.end; // Update end ...
- }
- length += il.length; // Update length
- il.clear();
- return ret;
- }
-
-
-
-
-
-
-
- /**
- * Append an instruction to the end of this list.
- *
- * @param ih instruction to append
- */
- private void append( InstructionHandle ih ) {
- if (isEmpty()) {
- start = end = ih;
- ih.next = ih.prev = null;
- } else {
- end.next = ih;
- ih.prev = end;
- ih.next = null;
- end = ih;
- }
- length++; // Update length
- }
-
-
- /**
- * Append an instruction to the end of this list.
- *
- * @param i instruction to append
- * @return instruction handle of the appended instruction
- */
- public InstructionHandle append( Instruction i ) {
- InstructionHandle ih = InstructionHandle.getInstructionHandle(i);
- append(ih);
- return ih;
- }
-
-
- /**
- * Append a branch instruction to the end of this list.
- *
- * @param i branch instruction to append
- * @return branch instruction handle of the appended instruction
- */
- public BranchHandle append( BranchInstruction i ) {
- BranchHandle ih = BranchHandle.getBranchHandle(i);
- append(ih);
- return ih;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -265,102 +72,6 @@
}
- public void setPositions() {
- setPositions(false);
- }
-
-
- /**
- * Give all instructions their position number (offset in byte stream), i.e.,
- * make the list ready to be dumped.
- *
- * @param check Perform sanity checks, e.g. if all targeted instructions really belong
- * to this list
- */
- public void setPositions( boolean check ) {
- int max_additional_bytes = 0, additional_bytes = 0;
- int index = 0, count = 0;
- int[] pos = new int[length];
- /* Pass 0: Sanity checks
- */
- if (check) {
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- Instruction i = ih.instruction;
- if (i instanceof BranchInstruction) { // target instruction within list?
- Instruction inst = ((BranchInstruction) i).getTarget().instruction;
- if (!contains(inst)) {
- throw new ClassGenException("Branch target of "
- + Constants.OPCODE_NAMES[i.opcode] + ":" + inst
- + " not in instruction list");
- }
- if (i instanceof Select) {
- InstructionHandle[] targets = ((Select) i).getTargets();
- for (int j = 0; j < targets.length; j++) {
- inst = targets[j].instruction;
- if (!contains(inst)) {
- throw new ClassGenException("Branch target of "
- + Constants.OPCODE_NAMES[i.opcode] + ":" + inst
- + " not in instruction list");
- }
- }
- }
- if (!(ih instanceof BranchHandle)) {
- throw new ClassGenException("Branch instruction "
- + Constants.OPCODE_NAMES[i.opcode] + ":" + inst
- + " not contained in BranchHandle.");
- }
- }
- }
- }
- /* Pass 1: Set position numbers and sum up the maximum number of bytes an
- * instruction may be shifted.
- */
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- Instruction i = ih.instruction;
- ih.setPosition(index);
- pos[count++] = index;
- /* Get an estimate about how many additional bytes may be added, because
- * BranchInstructions may have variable length depending on the target
- * offset (short vs. int) or alignment issues (TABLESWITCH and
- * LOOKUPSWITCH).
- */
- switch (i.getOpcode()) {
- case Constants.JSR:
- case Constants.GOTO:
- max_additional_bytes += 2;
- break;
- case Constants.TABLESWITCH:
- case Constants.LOOKUPSWITCH:
- max_additional_bytes += 3;
- break;
- }
- index += i.getLength();
- }
- /* Pass 2: Expand the variable-length (Branch)Instructions depending on
- * the target offset (short or int) and ensure that branch targets are
- * within this list.
- */
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- additional_bytes += ih.updatePosition(additional_bytes, max_additional_bytes);
- }
- /* Pass 3: Update position numbers (which may have changed due to the
- * preceding expansions), like pass 1.
- */
- index = count = 0;
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- Instruction i = ih.instruction;
- ih.setPosition(index);
- pos[count++] = index;
- index += i.getLength();
- }
- byte_positions = new int[count]; // Trim to proper size
- System.arraycopy(pos, 0, byte_positions, 0, count);
- }
-
-
-
-
-
@@ -382,30 +93,6 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- private void clear() {
- start = end = null;
- length = 0;
- }
-
-
-
-
-
/**
* @return start of list
*/
@@ -420,30 +107,4 @@
public InstructionHandle getEnd() {
return end;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- private List observers;
-
-
-
-
-
-
-
-
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java Sun Dec 6 00:19:52 2009
@@ -36,42 +36,8 @@
}
- /** @return return address type
- */
- public Type getType( ConstantPoolGen cp ) {
- return new ReturnaddressType(physicalSuccessor());
- }
+
- /**
- * Returns an InstructionHandle to the physical successor
- * of this JsrInstruction. <B>For this method to work,
- * this JsrInstruction object must not be shared between
- * multiple InstructionHandle objects!</B>
- * Formally, there must not be InstructionHandle objects
- * i, j where i != j and i.getInstruction() == this ==
- * j.getInstruction().
- * @return an InstructionHandle to the "next" instruction that
- * will be executed when RETurned from a subroutine.
- */
- public InstructionHandle physicalSuccessor() {
- InstructionHandle ih = this.target;
- // Rewind!
- while (ih.getPrev() != null) {
- ih = ih.getPrev();
- }
- // Find the handle for "this" JsrInstruction object.
- while (ih.getInstruction() != this) {
- ih = ih.getNext();
- }
- InstructionHandle toThis = ih;
- while (ih != null) {
- ih = ih.getNext();
- if ((ih != null) && (ih.getInstruction() == this)) {
- throw new RuntimeException("physicalSuccessor() called on a shared JsrInstruction.");
- }
- }
- // Return the physical successor
- return toThis.getNext();
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java Sun Dec 6 00:19:52 2009
@@ -76,9 +76,7 @@
}
- public void setName( String name ) {
- this.name = name;
- }
+
public String getName() {
@@ -86,9 +84,7 @@
}
- public void setType( Type type ) {
- this.type = type;
- }
+
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java Sun Dec 6 00:19:52 2009
@@ -46,22 +46,10 @@
*/
public class MethodGen extends FieldGenOrMethodGen {
- private String class_name;
private Type[] arg_types;
- private String[] arg_names;
- private int max_locals;
- private int max_stack;
private InstructionList il;
- private boolean strip_attributes;
private List variable_vec = new ArrayList();
- private List line_number_vec = new ArrayList();
- private List exception_vec = new ArrayList();
private List throws_vec = new ArrayList();
- private List code_attrs_vec = new ArrayList();
-
- private List[] param_annotations; // Array of lists containing AnnotationGen objects
- private boolean hasParameterAnnotations = false;
- private boolean haveUnpackedParameterAnnotations = false;
private static BCELComparator _cmp = new BCELComparator() {
@@ -80,24 +68,6 @@
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/**
* Sort local variables by index
*/
@@ -169,153 +139,11 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
public String getSignature() {
return Type.getMethodSignature(type, arg_types);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- private List observers;
-
-
-
-
-
-
-
-
-
-
-
/**
* Return string representation close to declaration format,
* `public static void main(String[]) throws IOException', e.g.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java Sun Dec 6 00:19:52 2009
@@ -31,8 +31,8 @@
- public void setName( String name );
+
- public void setType( Type type );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java Sun Dec 6 00:19:52 2009
@@ -38,11 +38,7 @@
}
- /** @return name of referenced class
- */
- public String getClassName() {
- return class_name;
- }
+
/** @return a hash code value for the object.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java Sun Dec 6 00:19:52 2009
@@ -195,12 +195,7 @@
- /**
- * @return array of match target offsets
- */
- public int[] getIndices() {
- return indices;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java Sun Dec 6 00:19:52 2009
@@ -235,7 +235,6 @@
static int getArgumentTypesSize( String signature ) {
int res = 0;
int index;
- Type[] types;
try { // Read all declarations between for `(' and `)'
if (signature.charAt(0) != '(') {
throw new ClassFormatException("Invalid method signature: " + signature);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Author: markt
Date: Sun Dec 6 00:19:52 2009
New Revision: 887613
URL: http://svn.apache.org/viewvc?rev=887613&view=rev
Log:
More unused code removal.
Still not complete.
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/Repository.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Node.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.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/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.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/ConstantFieldref.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/ConstantInterfaceMethodref.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Sun Dec 6 00:19:52 2009
@@ -24,40 +24,6 @@
*/
public interface Constants {
- /** Major version number of class files for Java 1.1.
- * @see #MINOR_1_1
- * */
- public final static short MAJOR_1_1 = 45;
-
- /** Minor version number of class files for Java 1.1.
- * @see #MAJOR_1_1
- * */
- public final static short MINOR_1_1 = 3;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/** Maximum value for an unsigned short.
*/
public final static int MAX_SHORT = 65535; // 2^16 - 1
@@ -66,39 +32,11 @@
*/
public final static int MAX_BYTE = 255; // 2^8 - 1
-
-
-
-
-
-
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_STATIC = 0x0008;
-
/** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
*/
public final static short ACC_FINAL = 0x0010;
-
-
-
-
-
-
-
-
-
-
-
-
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_NATIVE = 0x0100;
-
/** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
*/
@@ -109,12 +47,6 @@
*/
public final static short ACC_ABSTRACT = 0x0400;
-
-
-
-
-
-
/** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
*/
@@ -178,41 +110,7 @@
"CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref",
"CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
"CONSTANT_NameAndType" };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short BIPUSH = 16;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short SIPUSH = 17;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short LDC = 18;
@@ -240,87 +138,27 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ILOAD_0 = 26;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ILOAD_1 = 27;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ILOAD_2 = 28;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ILOAD_3 = 29;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short LLOAD_0 = 30;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LLOAD_1 = 31;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LLOAD_2 = 32;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LLOAD_3 = 33;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short FLOAD_0 = 34;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FLOAD_1 = 35;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FLOAD_2 = 36;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FLOAD_3 = 37;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short DLOAD_0 = 38;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DLOAD_1 = 39;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DLOAD_2 = 40;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DLOAD_3 = 41;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ALOAD_0 = 42;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ALOAD_1 = 43;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ALOAD_2 = 44;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ALOAD_3 = 45;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IALOAD = 46;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LALOAD = 47;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FALOAD = 48;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DALOAD = 49;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short AALOAD = 50;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short BALOAD = 51;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short CALOAD = 52;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short SALOAD = 53;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ISTORE = 54;
@@ -339,259 +177,30 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ISTORE_0 = 59;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ISTORE_1 = 60;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ISTORE_2 = 61;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ISTORE_3 = 62;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short LSTORE_0 = 63;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LSTORE_1 = 64;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LSTORE_2 = 65;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LSTORE_3 = 66;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short FSTORE_0 = 67;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FSTORE_1 = 68;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FSTORE_2 = 69;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FSTORE_3 = 70;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short DSTORE_0 = 71;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DSTORE_1 = 72;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DSTORE_2 = 73;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DSTORE_3 = 74;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ASTORE_0 = 75;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ASTORE_1 = 76;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ASTORE_2 = 77;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ASTORE_3 = 78;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IASTORE = 79;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LASTORE = 80;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FASTORE = 81;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DASTORE = 82;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short AASTORE = 83;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short BASTORE = 84;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short CASTORE = 85;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short SASTORE = 86;
-
-
-
-
-
-
-
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IADD = 96;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LADD = 97;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FADD = 98;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DADD = 99;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ISUB = 100;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LSUB = 101;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FSUB = 102;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DSUB = 103;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IMUL = 104;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LMUL = 105;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FMUL = 106;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DMUL = 107;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IDIV = 108;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LDIV = 109;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FDIV = 110;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DDIV = 111;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IREM = 112;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LREM = 113;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FREM = 114;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DREM = 115;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short INEG = 116;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LNEG = 117;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FNEG = 118;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DNEG = 119;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ISHL = 120;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LSHL = 121;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ISHR = 122;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LSHR = 123;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IUSHR = 124;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LUSHR = 125;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IAND = 126;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LAND = 127;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IOR = 128;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LOR = 129;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IXOR = 130;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LXOR = 131;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short IINC = 132;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short I2L = 133;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short I2F = 134;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short I2D = 135;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short L2I = 136;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short L2F = 137;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short L2D = 138;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short F2I = 139;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short F2L = 140;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short F2D = 141;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short D2I = 142;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short D2L = 143;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short D2F = 144;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short I2B = 145;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short I2C = 146;
-
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short I2S = 147;
-
-
-
-
-
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
@@ -652,24 +261,6 @@
public static final short LOOKUPSWITCH = 171;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short IRETURN = 172;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LRETURN = 173;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FRETURN = 174;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DRETURN = 175;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ARETURN = 176;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short RETURN = 177;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short GETSTATIC = 178;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
@@ -704,7 +295,6 @@
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ANEWARRAY = 189;
-
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short CHECKCAST = 192;
@@ -712,7 +302,6 @@
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short INSTANCEOF = 193;
-
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short WIDE = 196;
@@ -736,30 +325,6 @@
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
public static final short BREAKPOINT = 202;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/** JVM internal opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
public static final short IMPDEP1 = 254;
@@ -767,9 +332,6 @@
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
public static final short IMPDEP2 = 255;
-
-
-
/** Illegal opcode. */
public static final short UNDEFINED = -1;
/** Illegal opcode. */
@@ -820,8 +382,6 @@
"void", "array", "object", "unknown", "address"
};
-
-
/** The signature characters corresponding to primitive types,
* e.g., SHORT_TYPE_NAMES[T_INT] = "I"
*/
@@ -1170,12 +730,6 @@
/** Constants used in the StackMap attribute.
*/
public static final byte ITEM_Bogus = 0;
-
-
-
-
-
-
public static final byte ITEM_Object = 7;
public static final byte ITEM_NewObject = 8;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java Sun Dec 6 00:19:52 2009
@@ -73,19 +73,6 @@
}
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v
- * Visitor object
- */
- public void accept(Visitor v)
- {
- // v.visitAnnotationDefault(this);
- }
-
- /**
* @param defaultValue
* the default value of this methodinfo's 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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -32,7 +32,7 @@
* @author <A HREF="mailto:dbrosius@mebigfatguy.com">D. Brosius</A>
* @since 5.3
*/
-public class AnnotationEntry implements Node, Constants, Serializable {
+public class AnnotationEntry implements Constants, Serializable {
private int type_index;
private int num_element_value_pairs;
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -31,7 +31,6 @@
private int annotation_table_length;
private AnnotationEntry[] annotation_table; // Table of annotations
- private boolean isRuntimeVisible;
/**
@@ -63,19 +62,6 @@
AnnotationEntry[] annotation_table, ConstantPool constant_pool , boolean isRuntimeVisible) {
super(annotation_type, name_index, length, constant_pool);
setAnnotationTable(annotation_table);
- this.isRuntimeVisible = isRuntimeVisible;
- }
-
-
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitAnnotation(this);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Sun Dec 6 00:19:52 2009
@@ -47,7 +47,7 @@
* @see Deprecated
* @see Signature
*/
-public abstract class Attribute implements Cloneable, Node, Serializable
+public abstract class Attribute implements Cloneable, Serializable
{
protected int name_index; // Points to attribute name in constant pool
@@ -67,16 +67,6 @@
}
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v
- * Visitor object
- */
- public abstract void accept(Visitor v);
-
- /**
* Dump attribute to file stream in binary format.
*
* @param file
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java Sun Dec 6 00:19:52 2009
@@ -115,18 +115,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitCode(this);
- }
-
-
- /**
* Dump code attribute to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java Sun Dec 6 00:19:52 2009
@@ -32,7 +32,7 @@
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
* @see Code
*/
-public final class CodeException implements Cloneable, Constants, Node, Serializable {
+public final class CodeException implements Cloneable, Constants, Serializable {
private int start_pc; // Range in the code the exception handler is
private int end_pc; // active. start_pc is inclusive, end_pc exclusive
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -31,7 +31,7 @@
* @version $Id$
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
*/
-public abstract class Constant implements Cloneable, Node, Serializable {
+public abstract class Constant implements Cloneable, Serializable {
private static BCELComparator _cmp = new BCELComparator() {
@@ -63,16 +63,6 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public abstract void accept( Visitor v );
-
-
public abstract void dump( DataOutputStream file ) throws IOException;
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -60,18 +60,6 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantClass(this);
- }
-
-
/**
* Dump constant class to file stream in binary format.
*
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -60,18 +60,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantDouble(this);
- }
-
-
- /**
* Dump constant double to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java Sun Dec 6 00:19:52 2009
@@ -42,23 +42,5 @@
}
- /**
- * @param class_index Reference to the class containing the Field
- * @param name_and_type_index and the Field signature
- */
- public ConstantFieldref(int class_index, int name_and_type_index) {
- super(Constants.CONSTANT_Fieldref, class_index, name_and_type_index);
- }
-
-
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of Fields,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantFieldref(this);
- }
+
}
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -58,19 +58,7 @@
this(file.readFloat());
}
-
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantFloat(this);
- }
-
-
+
/**
* Dump constant float to file stream in binary format.
*
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -60,18 +60,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantInteger(this);
- }
-
-
- /**
* Dump constant integer to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java Sun Dec 6 00:19:52 2009
@@ -42,23 +42,5 @@
}
- /**
- * @param class_index Reference to the class containing the method
- * @param name_and_type_index and the method signature
- */
- public ConstantInterfaceMethodref(int class_index, int name_and_type_index) {
- super(Constants.CONSTANT_InterfaceMethodref, class_index, name_and_type_index);
- }
-
-
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantInterfaceMethodref(this);
- }
+
}
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -60,18 +60,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantLong(this);
- }
-
-
- /**
* Dump constant long to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java Sun Dec 6 00:19:52 2009
@@ -42,23 +42,5 @@
}
- /**
- * @param class_index Reference to the class containing the method
- * @param name_and_type_index and the method signature
- */
- public ConstantMethodref(int class_index, int name_and_type_index) {
- super(Constants.CONSTANT_Methodref, class_index, name_and_type_index);
- }
-
-
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantMethodref(this);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java Sun Dec 6 00:19:52 2009
@@ -64,18 +64,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantNameAndType(this);
- }
-
-
- /**
* Dump name and signature index to file stream in binary format.
*
* @param file Output file stream
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -34,7 +34,7 @@
* @see org.apache.tomcat.util.bcel.generic.ConstantPoolGen
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
*/
-public class ConstantPool implements Cloneable, Node, Serializable {
+public class ConstantPool implements Cloneable, Serializable {
private int constant_pool_count;
private Constant[] constant_pool;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java Sun Dec 6 00:19:52 2009
@@ -60,18 +60,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantString(this);
- }
-
-
- /**
* Dump constant field reference to file stream in binary format.
*
* @param file Output file stream
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -64,18 +64,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantUtf8(this);
- }
-
-
- /**
* Dump String in Utf8 format to file stream.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java Sun Dec 6 00:19:52 2009
@@ -67,18 +67,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantValue(this);
- }
-
-
- /**
* Dump constant value attribute to file stream on binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java Sun Dec 6 00:19:52 2009
@@ -70,18 +70,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitDeprecated(this);
- }
-
-
- /**
* Dump source file attribute to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java Sun Dec 6 00:19:52 2009
@@ -49,10 +49,6 @@
methodIndex = methodIdx;
}
- public void accept(Visitor v) {
- v.visitEnclosingMethod(this);
- }
-
public Attribute copy(ConstantPool constant_pool) {
throw new RuntimeException("Not implemented yet!");
// is this next line sufficient?
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java Sun Dec 6 00:19:52 2009
@@ -75,18 +75,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionTable(this);
- }
-
-
- /**
* Dump exceptions attribute to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java Sun Dec 6 00:19:52 2009
@@ -27,7 +27,7 @@
* @version $Id$
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
*/
-public abstract class FieldOrMethod extends AccessFlags implements Cloneable, Node {
+public abstract class FieldOrMethod extends AccessFlags implements Cloneable {
protected int name_index; // Points to field name in constant pool
protected int signature_index; // Points to encoded signature
@@ -36,20 +36,10 @@
protected ConstantPool constant_pool;
- private String signatureAttributeString = null;
- private boolean searchedForSignatureAttribute = false;
-
-
- // Annotations are collected from certain attributes, don't do it more than necessary!
- private boolean annotationsOutOfDate = true;
-
FieldOrMethod() {
}
-
-
-
/**
* Construct object from file stream.
* @param file Input stream
@@ -85,12 +75,6 @@
}
-
-
-
-
-
-
/**
* @param attributes Collection of object attributes.
*/
@@ -99,25 +83,7 @@
attributes_count = (attributes == null) ? 0 : attributes.length;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/**
* @return Name of object, i.e., method name or field name
*/
@@ -136,13 +102,4 @@
c = (ConstantUtf8) constant_pool.getConstant(signature_index, Constants.CONSTANT_Utf8);
return c.getBytes();
}
-
-
-
-
-
-
-
-
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java Sun Dec 6 00:19:52 2009
@@ -32,7 +32,7 @@
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
* @see InnerClasses
*/
-public final class InnerClass implements Cloneable, Node, Serializable {
+public final class InnerClass implements Cloneable, Serializable {
private int inner_class_index;
private int outer_class_index;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java Sun Dec 6 00:19:52 2009
@@ -74,18 +74,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitInnerClasses(this);
- }
-
-
- /**
* Dump source file attribute to file stream in binary format.
*
* @param file Output file stream
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=887613&r1=887612&r2=887613&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 Sun Dec 6 00:19:52 2009
@@ -38,13 +38,10 @@
* @see org.apache.tomcat.util.bcel.generic.ClassGen
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
*/
-public class JavaClass extends AccessFlags implements Cloneable, Node, Comparable {
+public class JavaClass extends AccessFlags implements Cloneable, Comparable {
private String file_name;
- private String package_name;
private String source_file_name = "<Unknown>";
- private int class_name_index;
- private int superclass_name_index;
private String class_name;
private String superclass_name;
private int major, minor; // Compiler version
@@ -55,11 +52,7 @@
private Method[] methods; // methods defined in the class
private Attribute[] attributes; // attributes defined in the class
private AnnotationEntry[] annotations; // annotations defined on the class
- private byte source = HEAP; // Generated in memory
- private boolean isAnonymous = false;
- private boolean isNested = false;
- private boolean computedNestedTypeStatus = false;
- public static final byte HEAP = 1;
+
public static final byte FILE = 2;
public static final byte ZIP = 3;
@@ -124,8 +117,6 @@
if (methods == null) {
methods = new Method[0];
}
- this.class_name_index = class_name_index;
- this.superclass_name_index = superclass_name_index;
this.file_name = file_name;
this.major = major;
this.minor = minor;
@@ -136,7 +127,6 @@
this.methods = methods;
this.attributes = attributes;
annotationsOutOfDate = true;
- this.source = source;
// Get source file name if available
for (int i = 0; i < attributes.length; i++) {
if (attributes[i] instanceof SourceFile) {
@@ -150,12 +140,6 @@
*/
class_name = constant_pool.getConstantString(class_name_index, Constants.CONSTANT_Class);
class_name = Utility.compactClassName(class_name, false);
- int index = class_name.lastIndexOf('.');
- if (index < 0) {
- package_name = "";
- } else {
- package_name = class_name.substring(0, index);
- }
if (superclass_name_index > 0) {
// May be zero -> class is java.lang.Object
superclass_name = constant_pool.getConstantString(superclass_name_index,
@@ -366,27 +350,7 @@
}
- /** Equivalent to runtime "instanceof" operator.
- *
- * @return true if this JavaClass is derived from the super class
- * @throws ClassNotFoundException if superclasses or superinterfaces
- * of this object can't be found
- */
- public final boolean instanceOf( JavaClass super_class ) throws ClassNotFoundException {
- if (this.equals(super_class)) {
- return true;
- }
- JavaClass[] super_classes = getSuperClasses();
- for (int i = 0; i < super_classes.length; i++) {
- if (super_classes[i].equals(super_class)) {
- return true;
- }
- }
- if (super_class.isInterface()) {
- return implementationOf(super_class);
- }
- return false;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java Sun Dec 6 00:19:52 2009
@@ -30,7 +30,7 @@
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
* @see LineNumberTable
*/
-public final class LineNumber implements Cloneable, Node, Serializable {
+public final class LineNumber implements Cloneable, Serializable {
private int start_pc; // Program Counter (PC) corresponds to line
private int line_number; // number in source file
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java Sun Dec 6 00:19:52 2009
@@ -73,18 +73,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLineNumberTable(this);
- }
-
-
- /**
* Dump line number table attribute to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java Sun Dec 6 00:19:52 2009
@@ -31,7 +31,7 @@
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
* @see LocalVariableTable
*/
-public final class LocalVariable implements Constants, Cloneable, Node, Serializable {
+public final class LocalVariable implements Constants, Cloneable, Serializable {
private int start_pc; // Range in which the variable is valid
private int length;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java Sun Dec 6 00:19:52 2009
@@ -72,18 +72,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLocalVariableTable(this);
- }
-
-
- /**
* Dump local variable table attribute to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java Sun Dec 6 00:19:52 2009
@@ -68,10 +68,6 @@
local_variable_type_table[i] = new LocalVariable(dis, cpool);
}
- public void accept(Visitor v) {
- v.visitLocalVariableTypeTable(this);
- }
-
public final void dump(DataOutputStream file) throws IOException
{
super.dump(file);
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java Sun Dec 6 00:19:52 2009
@@ -68,18 +68,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- System.err.println("Visiting non-standard PMGClass object");
- }
-
-
- /**
* Dump source file attribute to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java Sun Dec 6 00:19:52 2009
@@ -27,7 +27,7 @@
* @author <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
* @since 5.3
*/
-public class ParameterAnnotationEntry implements Node, Constants {
+public class ParameterAnnotationEntry implements Constants {
private int annotation_table_length;
private AnnotationEntry[] annotation_table;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java Sun Dec 6 00:19:52 2009
@@ -66,18 +66,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- // v.visitParameterAnnotation(this);
- }
-
-
- /**
* @param parameter_annotation_table the entries to set in this parameter annotation
*/
public final void setParameterAnnotationTable(
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java Sun Dec 6 00:19:52 2009
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.ByteArrayInputStream;
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -66,19 +65,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- //System.err.println("Visiting non-standard Signature object");
- v.visitSignature(this);
- }
-
-
- /**
* Dump source file attribute to file stream in binary format.
*
* @param file Output file stream
@@ -106,17 +92,6 @@
}
/**
- * Extends ByteArrayInputStream to make 'unreading' chars possible.
- */
- private static final class MyByteArrayInputStream extends ByteArrayInputStream {
-
- MyByteArrayInputStream(String data) {
- super(data.getBytes());
- }
- }
-
-
- /**
* @return String representation
*/
public final String toString() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java Sun Dec 6 00:19:52 2009
@@ -74,18 +74,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitSourceFile(this);
- }
-
-
- /**
* Dump source file attribute to file stream in binary format.
*
* @param file Output file stream
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java Sun Dec 6 00:19:52 2009
@@ -36,7 +36,7 @@
* @see StackMapEntry
* @see StackMapType
*/
-public final class StackMap extends Attribute implements Node {
+public final class StackMap extends Attribute {
private int map_length;
private StackMapEntry[] map; // Table of stack map entries
@@ -128,19 +128,4 @@
c.constant_pool = _constant_pool;
return c;
}
-
-
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackMap(this);
- }
-
-
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java Sun Dec 6 00:19:52 2009
@@ -37,7 +37,6 @@
private StackMapType[] types_of_locals;
private int number_of_stack_items;
private StackMapType[] types_of_stack_items;
- private ConstantPool constant_pool;
/**
@@ -67,7 +66,6 @@
this.types_of_locals = types_of_locals;
this.number_of_stack_items = number_of_stack_items;
this.types_of_stack_items = types_of_stack_items;
- this.constant_pool = constant_pool;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java Sun Dec 6 00:19:52 2009
@@ -36,7 +36,7 @@
* @see StackMapEntry
* @see StackMapType
*/
-public final class StackMapTable extends Attribute implements Node {
+public final class StackMapTable extends Attribute {
private int map_length;
private StackMapTableEntry[] map; // Table of stack map entries
@@ -128,19 +128,4 @@
c.constant_pool = _constant_pool;
return c;
}
-
-
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackMapTable(this);
- }
-
-
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java Sun Dec 6 00:19:52 2009
@@ -40,7 +40,6 @@
private StackMapType[] types_of_locals;
private int number_of_stack_items;
private StackMapType[] types_of_stack_items;
- private ConstantPool constant_pool;
/**
@@ -102,7 +101,6 @@
this.types_of_locals = types_of_locals;
this.number_of_stack_items = number_of_stack_items;
this.types_of_stack_items = types_of_stack_items;
- this.constant_pool = constant_pool;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java?rev=887613&r1=887612&r2=887613&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java Sun Dec 6 00:19:52 2009
@@ -76,18 +76,6 @@
/**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitSynthetic(this);
- }
-
-
- /**
* Dump source file attribute to file stream in binary format.
*
* @param file Output file stream
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java Sat Dec 5 23:22:46 2009
@@ -17,26 +17,14 @@
package org.apache.tomcat.util.bcel.generic;
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import java.util.Stack;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
-import org.apache.tomcat.util.bcel.classfile.Annotations;
import org.apache.tomcat.util.bcel.classfile.Attribute;
import org.apache.tomcat.util.bcel.classfile.Code;
-import org.apache.tomcat.util.bcel.classfile.CodeException;
import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
-import org.apache.tomcat.util.bcel.classfile.LineNumber;
-import org.apache.tomcat.util.bcel.classfile.LineNumberTable;
import org.apache.tomcat.util.bcel.classfile.LocalVariable;
import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
-import org.apache.tomcat.util.bcel.classfile.LocalVariableTypeTable;
import org.apache.tomcat.util.bcel.classfile.Method;
-import org.apache.tomcat.util.bcel.classfile.ParameterAnnotationEntry;
-import org.apache.tomcat.util.bcel.classfile.ParameterAnnotations;
-import org.apache.tomcat.util.bcel.classfile.RuntimeVisibleParameterAnnotations;
import org.apache.tomcat.util.bcel.classfile.Utility;
import org.apache.tomcat.util.bcel.util.BCELComparator;
@@ -92,260 +80,22 @@
};
- /**
- * Declare method. If the method is non-static the constructor
- * automatically declares a local variable `$this' in slot 0. The
- * actual code is contained in the `il' parameter, which may further
- * manipulated by the user. But he must take care not to remove any
- * instruction (handles) that are still referenced from this object.
- *
- * For example one may not add a local variable and later remove the
- * instructions it refers to without causing havoc. It is safe
- * however if you remove that local variable, too.
- *
- * @param access_flags access qualifiers
- * @param return_type method type
- * @param arg_types argument types
- * @param arg_names argument names (if this is null, default names will be provided
- * for them)
- * @param method_name name of method
- * @param class_name class name containing this method (may be null, if you don't care)
- * @param il instruction list associated with this method, may be null only for
- * abstract or native methods
- * @param cp constant pool
- */
- public MethodGen(int access_flags, Type return_type, Type[] arg_types, String[] arg_names,
- String method_name, String class_name, InstructionList il, ConstantPoolGen cp) {
- setAccessFlags(access_flags);
- setType(return_type);
- setArgumentTypes(arg_types);
- setArgumentNames(arg_names);
- setName(method_name);
- setClassName(class_name);
- setInstructionList(il);
- setConstantPool(cp);
- boolean abstract_ = isAbstract() || isNative();
- InstructionHandle start = null;
- InstructionHandle end = null;
- if (!abstract_) {
- start = il.getStart();
- end = il.getEnd();
- /* Add local variables, namely the implicit `this' and the arguments
- */
- if (!isStatic() && (class_name != null)) { // Instance method -> `this' is local var 0
- addLocalVariable("this", new ObjectType(class_name), start, end);
- }
- }
- if (arg_types != null) {
- int size = arg_types.length;
- for (int i = 0; i < size; i++) {
- if (Type.VOID == arg_types[i]) {
- throw new ClassGenException("'void' is an illegal argument type for a method");
- }
- }
- if (arg_names != null) { // Names for variables provided?
- if (size != arg_names.length) {
- throw new ClassGenException("Mismatch in argument array lengths: " + size
- + " vs. " + arg_names.length);
- }
- } else { // Give them dummy names
- arg_names = new String[size];
- for (int i = 0; i < size; i++) {
- arg_names[i] = "arg" + i;
- }
- setArgumentNames(arg_names);
- }
- if (!abstract_) {
- for (int i = 0; i < size; i++) {
- addLocalVariable(arg_names[i], arg_types[i], start, end);
- }
- }
- }
- }
+
- /**
- * Instantiate from existing method.
- *
- * @param m method
- * @param class_name class name containing this method
- * @param cp constant pool
- */
- public MethodGen(Method m, String class_name, ConstantPoolGen cp) {
- this(m.getAccessFlags(), Type.getReturnType(m.getSignature()), Type.getArgumentTypes(m
- .getSignature()), null /* may be overridden anyway */
- , m.getName(), class_name,
- ((m.getAccessFlags() & (Constants.ACC_ABSTRACT | Constants.ACC_NATIVE)) == 0)
- ? new InstructionList(m.getCode().getCode())
- : null, cp);
- Attribute[] attributes = m.getAttributes();
- for (int i = 0; i < attributes.length; i++) {
- Attribute a = attributes[i];
- if (a instanceof Code) {
- Code c = (Code) a;
- setMaxStack(c.getMaxStack());
- setMaxLocals(c.getMaxLocals());
- CodeException[] ces = c.getExceptionTable();
- if (ces != null) {
- for (int j = 0; j < ces.length; j++) {
- CodeException ce = ces[j];
- int type = ce.getCatchType();
- ObjectType c_type = null;
- if (type > 0) {
- String cen = m.getConstantPool().getConstantString(type,
- Constants.CONSTANT_Class);
- c_type = new ObjectType(cen);
- }
- int end_pc = ce.getEndPC();
- int length = m.getCode().getCode().length;
- InstructionHandle end;
- if (length == end_pc) { // May happen, because end_pc is exclusive
- end = il.getEnd();
- } else {
- end = il.findHandle(end_pc);
- end = end.getPrev(); // Make it inclusive
- }
- addExceptionHandler(il.findHandle(ce.getStartPC()), end, il.findHandle(ce
- .getHandlerPC()), c_type);
- }
- }
- Attribute[] c_attributes = c.getAttributes();
- for (int j = 0; j < c_attributes.length; j++) {
- a = c_attributes[j];
- if (a instanceof LineNumberTable) {
- LineNumber[] ln = ((LineNumberTable) a).getLineNumberTable();
- for (int k = 0; k < ln.length; k++) {
- LineNumber l = ln[k];
- InstructionHandle ih = il.findHandle(l.getStartPC());
- if (ih != null) {
- addLineNumber(ih, l.getLineNumber());
- }
- }
- } else if (a instanceof LocalVariableTable) {
- LocalVariable[] lv = ((LocalVariableTable) a).getLocalVariableTable();
- removeLocalVariables();
- for (int k = 0; k < lv.length; k++) {
- LocalVariable l = lv[k];
- InstructionHandle start = il.findHandle(l.getStartPC());
- InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength());
- // Repair malformed handles
- if (null == start) {
- start = il.getStart();
- }
- if (null == end) {
- end = il.getEnd();
- }
- addLocalVariable(l.getName(), Type.getType(l.getSignature()), l
- .getIndex(), start, end);
- }
- } else if (a instanceof LocalVariableTypeTable) {
- LocalVariable[] lv = ((LocalVariableTypeTable) a).getLocalVariableTypeTable();
- removeLocalVariables();
- for (int k = 0; k < lv.length; k++) {
- LocalVariable l = lv[k];
- InstructionHandle start = il.findHandle(l.getStartPC());
- InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength());
- // Repair malformed handles
- if (null == start) {
- start = il.getStart();
- }
- if (null == end) {
- end = il.getEnd();
- }
- addLocalVariable(l.getName(), Type.getType(l.getSignature()), l
- .getIndex(), start, end);
- }
- } else {
- addCodeAttribute(a);
- }
- }
- } else if (a instanceof ExceptionTable) {
- String[] names = ((ExceptionTable) a).getExceptionNames();
- for (int j = 0; j < names.length; j++) {
- addException(names[j]);
- }
- } else if (a instanceof Annotations) {
- Annotations runtimeAnnotations = (Annotations) a;
- AnnotationEntry[] aes = runtimeAnnotations.getAnnotationEntries();
- for (int k = 0; k < aes.length; k++) {
- AnnotationEntry element = aes[k];
- addAnnotationEntry(new AnnotationEntryGen(element, cp, false));
- }
- } else {
- addAttribute(a);
- }
- }
- }
+
- /**
- * Adds a local variable to this method.
- *
- * @param name variable name
- * @param type variable type
- * @param slot the index of the local variable, if type is long or double, the next available
- * index is slot+2
- * @param start from where the variable is valid
- * @param end until where the variable is valid
- * @return new local variable object
- * @see LocalVariable
- */
- public LocalVariableGen addLocalVariable( String name, Type type, int slot,
- InstructionHandle start, InstructionHandle end ) {
- byte t = type.getType();
- if (t != Constants.T_ADDRESS) {
- int add = type.getSize();
- if (slot + add > max_locals) {
- max_locals = slot + add;
- }
- LocalVariableGen l = new LocalVariableGen(slot, name, type, start, end);
- int i;
- if ((i = variable_vec.indexOf(l)) >= 0) {
- variable_vec.set(i, l);
- } else {
- variable_vec.add(l);
- }
- return l;
- } else {
- throw new IllegalArgumentException("Can not use " + type
- + " as type for local variable");
- }
- }
+
- /**
- * Adds a local variable to this method and assigns an index automatically.
- *
- * @param name variable name
- * @param type variable type
- * @param start from where the variable is valid, if this is null,
- * it is valid from the start
- * @param end until where the variable is valid, if this is null,
- * it is valid to the end
- * @return new local variable object
- * @see LocalVariable
- */
- public LocalVariableGen addLocalVariable( String name, Type type, InstructionHandle start,
- InstructionHandle end ) {
- return addLocalVariable(name, type, max_locals, start, end);
- }
+
- /**
- * Remove a local variable, its slot will not be reused, if you do not use addLocalVariable
- * with an explicit index argument.
- */
- public void removeLocalVariable( LocalVariableGen l ) {
- variable_vec.remove(l);
- }
+
- /**
- * Remove all local variables.
- */
- public void removeLocalVariables() {
- variable_vec.clear();
- }
+
/**
@@ -419,440 +169,119 @@
}
- /**
- * Give an instruction a line number corresponding to the source code line.
- *
- * @param ih instruction to tag
- * @return new line number object
- * @see LineNumber
- */
- public LineNumberGen addLineNumber( InstructionHandle ih, int src_line ) {
- LineNumberGen l = new LineNumberGen(ih, src_line);
- line_number_vec.add(l);
- return l;
- }
-
-
- /**
- * Remove a line number.
- */
- public void removeLineNumber( LineNumberGen l ) {
- line_number_vec.remove(l);
- }
-
-
- /**
- * Remove all line numbers.
- */
- public void removeLineNumbers() {
- line_number_vec.clear();
- }
+
- /*
- * @return array of line numbers
- */
- public LineNumberGen[] getLineNumbers() {
- LineNumberGen[] lg = new LineNumberGen[line_number_vec.size()];
- line_number_vec.toArray(lg);
- return lg;
- }
+
- /**
- * @return `LineNumberTable' attribute of all the local variables of this method.
- */
- public LineNumberTable getLineNumberTable( ConstantPoolGen cp ) {
- int size = line_number_vec.size();
- LineNumber[] ln = new LineNumber[size];
- try {
- for (int i = 0; i < size; i++) {
- ln[i] = ((LineNumberGen) line_number_vec.get(i)).getLineNumber();
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- } // Never occurs
- return new LineNumberTable(cp.addUtf8("LineNumberTable"), 2 + ln.length * 4, ln, cp
- .getConstantPool());
- }
+
- /**
- * Add an exception handler, i.e., specify region where a handler is active and an
- * instruction where the actual handling is done.
- *
- * @param start_pc Start of region (inclusive)
- * @param end_pc End of region (inclusive)
- * @param handler_pc Where handling is done
- * @param catch_type class type of handled exception or null if any
- * exception is handled
- * @return new exception handler object
- */
- public CodeExceptionGen addExceptionHandler( InstructionHandle start_pc,
- InstructionHandle end_pc, InstructionHandle handler_pc, ObjectType catch_type ) {
- if ((start_pc == null) || (end_pc == null) || (handler_pc == null)) {
- throw new ClassGenException("Exception handler target is null instruction");
- }
- CodeExceptionGen c = new CodeExceptionGen(start_pc, end_pc, handler_pc, catch_type);
- exception_vec.add(c);
- return c;
- }
+
- /**
- * Remove an exception handler.
- */
- public void removeExceptionHandler( CodeExceptionGen c ) {
- exception_vec.remove(c);
- }
+
- /**
- * Remove all line numbers.
- */
- public void removeExceptionHandlers() {
- exception_vec.clear();
- }
+
- /*
- * @return array of declared exception handlers
- */
- public CodeExceptionGen[] getExceptionHandlers() {
- CodeExceptionGen[] cg = new CodeExceptionGen[exception_vec.size()];
- exception_vec.toArray(cg);
- return cg;
- }
+
- /**
- * @return code exceptions for `Code' attribute
- */
- private CodeException[] getCodeExceptions() {
- int size = exception_vec.size();
- CodeException[] c_exc = new CodeException[size];
- try {
- for (int i = 0; i < size; i++) {
- CodeExceptionGen c = (CodeExceptionGen) exception_vec.get(i);
- c_exc[i] = c.getCodeException(cp);
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- }
- return c_exc;
- }
+
- /**
- * Add an exception possibly thrown by this method.
- *
- * @param class_name (fully qualified) name of exception
- */
- public void addException( String class_name ) {
- throws_vec.add(class_name);
- }
+
- /**
- * Remove an exception.
- */
- public void removeException( String c ) {
- throws_vec.remove(c);
- }
+
- /**
- * Remove all exceptions.
- */
- public void removeExceptions() {
- throws_vec.clear();
- }
+
- /*
- * @return array of thrown exceptions
- */
- public String[] getExceptions() {
- String[] e = new String[throws_vec.size()];
- throws_vec.toArray(e);
- return e;
- }
+
- /**
- * @return `Exceptions' attribute of all the exceptions thrown by this method.
- */
- private ExceptionTable getExceptionTable( ConstantPoolGen cp ) {
- int size = throws_vec.size();
- int[] ex = new int[size];
- try {
- for (int i = 0; i < size; i++) {
- ex[i] = cp.addClass((String) throws_vec.get(i));
- }
- } catch (ArrayIndexOutOfBoundsException e) {
- }
- return new ExceptionTable(cp.addUtf8("Exceptions"), 2 + 2 * size, ex, cp.getConstantPool());
- }
+
- /**
- * Add an attribute to the code. Currently, the JVM knows about the
- * LineNumberTable, LocalVariableTable and StackMap attributes,
- * where the former two will be generated automatically and the
- * latter is used for the MIDP only. Other attributes will be
- * ignored by the JVM but do no harm.
- *
- * @param a attribute to be added
- */
- public void addCodeAttribute( Attribute a ) {
- code_attrs_vec.add(a);
- }
+
- /**
- * Remove a code attribute.
- */
- public void removeCodeAttribute( Attribute a ) {
- code_attrs_vec.remove(a);
- }
+
- /**
- * Remove all code attributes.
- */
- public void removeCodeAttributes() {
- code_attrs_vec.clear();
- }
+
- /**
- * @return all attributes of this method.
- */
- public Attribute[] getCodeAttributes() {
- Attribute[] attributes = new Attribute[code_attrs_vec.size()];
- code_attrs_vec.toArray(attributes);
- return attributes;
- }
- public void addAnnotationsAsAttribute(ConstantPoolGen cp) {
- Attribute[] attrs = Utility.getAnnotationAttributes(cp,annotation_vec);
- for (int i = 0; i < attrs.length; i++) {
- addAttribute(attrs[i]);
- }
- }
+
+
+
- public void addParameterAnnotationsAsAttribute(ConstantPoolGen cp) {
- if (!hasParameterAnnotations) return;
- Attribute[] attrs = Utility.getParameterAnnotationAttributes(cp,param_annotations);
- if (attrs!=null) {
- for (int i = 0; i < attrs.length; i++) {
- addAttribute(attrs[i]);
- }
- }
- }
- /**
- * Get method object. Never forget to call setMaxStack() or setMaxStack(max), respectively,
- * before calling this method (the same applies for max locals).
- *
- * @return method object
- */
- public Method getMethod() {
- String signature = getSignature();
- int name_index = cp.addUtf8(name);
- int signature_index = cp.addUtf8(signature);
- /* Also updates positions of instructions, i.e., their indices
- */
- byte[] byte_code = null;
- if (il != null) {
- byte_code = il.getByteCode();
- }
- LineNumberTable lnt = null;
- LocalVariableTable lvt = null;
- /* Create LocalVariableTable and LineNumberTable attributes (for debuggers, e.g.)
- */
- if ((variable_vec.size() > 0) && !strip_attributes) {
- addCodeAttribute(lvt = getLocalVariableTable(cp));
- }
- if ((line_number_vec.size() > 0) && !strip_attributes) {
- addCodeAttribute(lnt = getLineNumberTable(cp));
- }
- Attribute[] code_attrs = getCodeAttributes();
- /* Each attribute causes 6 additional header bytes
- */
- int attrs_len = 0;
- for (int i = 0; i < code_attrs.length; i++) {
- attrs_len += (code_attrs[i].getLength() + 6);
- }
- CodeException[] c_exc = getCodeExceptions();
- int exc_len = c_exc.length * 8; // Every entry takes 8 bytes
- Code code = null;
- if ((il != null) && !isAbstract() && !isNative()) {
- // Remove any stale code attribute
- Attribute[] attributes = getAttributes();
- for (int i = 0; i < attributes.length; i++) {
- Attribute a = attributes[i];
- if (a instanceof Code) {
- removeAttribute(a);
- }
- }
- code = new Code(cp.addUtf8("Code"), 8 + byte_code.length + // prologue byte code
- 2 + exc_len + // exceptions
- 2 + attrs_len, // attributes
- max_stack, max_locals, byte_code, c_exc, code_attrs, cp.getConstantPool());
- addAttribute(code);
- }
- addAnnotationsAsAttribute(cp);
- addParameterAnnotationsAsAttribute(cp);
- ExceptionTable et = null;
- if (throws_vec.size() > 0) {
- addAttribute(et = getExceptionTable(cp));
- // Add `Exceptions' if there are "throws" clauses
- }
- Method m = new Method(access_flags, name_index, signature_index, getAttributes(), cp
- .getConstantPool());
- // Undo effects of adding attributes
- if (lvt != null) {
- removeCodeAttribute(lvt);
- }
- if (lnt != null) {
- removeCodeAttribute(lnt);
- }
- if (code != null) {
- removeAttribute(code);
- }
- if (et != null) {
- removeAttribute(et);
- }
- return m;
- }
+
- /**
- * Remove all NOPs from the instruction list (if possible) and update every
- * object refering to them, i.e., branch instructions, local variables and
- * exception handlers.
- */
- public void removeNOPs() {
- if (il != null) {
- InstructionHandle next;
- /* Check branch instructions.
- */
- for (InstructionHandle ih = il.getStart(); ih != null; ih = next) {
- next = ih.next;
- if ((next != null) && (ih.getInstruction() instanceof NOP)) {
- try {
- il.delete(ih);
- } catch (TargetLostException e) {
- InstructionHandle[] targets = e.getTargets();
- for (int i = 0; i < targets.length; i++) {
- InstructionTargeter[] targeters = targets[i].getTargeters();
- for (int j = 0; j < targeters.length; j++) {
- targeters[j].updateTarget(targets[i], next);
- }
- }
- }
- }
- }
- }
- }
+
- /**
- * Set maximum number of local variables.
- */
- public void setMaxLocals( int m ) {
- max_locals = m;
- }
+
- public int getMaxLocals() {
- return max_locals;
- }
+
- /**
- * Set maximum stack size for this method.
- */
- public void setMaxStack( int m ) {
- max_stack = m;
- }
+
- public int getMaxStack() {
- return max_stack;
- }
+
- /** @return class that contains this method
- */
- public String getClassName() {
- return class_name;
- }
+
- public void setClassName( String class_name ) {
- this.class_name = class_name;
- }
+
- public void setReturnType( Type return_type ) {
- setType(return_type);
- }
+
- public Type getReturnType() {
- return getType();
- }
+
- public void setArgumentTypes( Type[] arg_types ) {
- this.arg_types = arg_types;
- }
+
- public Type[] getArgumentTypes() {
- return (Type[]) arg_types.clone();
- }
+
- public void setArgumentType( int i, Type type ) {
- arg_types[i] = type;
- }
+
- public Type getArgumentType( int i ) {
- return arg_types[i];
- }
+
- public void setArgumentNames( String[] arg_names ) {
- this.arg_names = arg_names;
- }
+
- public String[] getArgumentNames() {
- return (String[]) arg_names.clone();
- }
+
- public void setArgumentName( int i, String name ) {
- arg_names[i] = name;
- }
+
- public String getArgumentName( int i ) {
- return arg_names[i];
- }
+
- public InstructionList getInstructionList() {
- return il;
- }
+
- public void setInstructionList( InstructionList il ) {
- this.il = il;
- }
+
public String getSignature() {
@@ -860,210 +289,31 @@
}
- /**
- * Computes max. stack size by performing control flow analysis.
- */
- public void setMaxStack() {
- if (il != null) {
- max_stack = getMaxStack(cp, il, getExceptionHandlers());
- } else {
- max_stack = 0;
- }
- }
-
-
- /**
- * Compute maximum number of local variables.
- */
- public void setMaxLocals() {
- if (il != null) {
- int max = isStatic() ? 0 : 1;
- if (arg_types != null) {
- for (int i = 0; i < arg_types.length; i++) {
- max += arg_types[i].getSize();
- }
- }
- for (InstructionHandle ih = il.getStart(); ih != null; ih = ih.getNext()) {
- Instruction ins = ih.getInstruction();
- if ((ins instanceof LocalVariableInstruction) || (ins instanceof RET)
- || (ins instanceof IINC)) {
- int index = ((IndexedInstruction) ins).getIndex()
- + ((TypedInstruction) ins).getType(cp).getSize();
- if (index > max) {
- max = index;
- }
- }
- }
- max_locals = max;
- } else {
- max_locals = 0;
- }
- }
-
-
- /** Do not/Do produce attributes code attributesLineNumberTable and
- * LocalVariableTable, like javac -O
- */
- public void stripAttributes( boolean flag ) {
- strip_attributes = flag;
- }
-
- static final class BranchTarget {
-
- InstructionHandle target;
- int stackDepth;
-
-
- BranchTarget(InstructionHandle target, int stackDepth) {
- this.target = target;
- this.stackDepth = stackDepth;
- }
- }
-
- static final class BranchStack {
-
- Stack branchTargets = new Stack();
- Hashtable visitedTargets = new Hashtable();
-
-
- public void push( InstructionHandle target, int stackDepth ) {
- if (visited(target)) {
- return;
- }
- branchTargets.push(visit(target, stackDepth));
- }
+
- public BranchTarget pop() {
- if (!branchTargets.empty()) {
- BranchTarget bt = (BranchTarget) branchTargets.pop();
- return bt;
- }
- return null;
- }
+
- private final BranchTarget visit( InstructionHandle target, int stackDepth ) {
- BranchTarget bt = new BranchTarget(target, stackDepth);
- visitedTargets.put(target, bt);
- return bt;
- }
+
+
- private final boolean visited( InstructionHandle target ) {
- return (visitedTargets.get(target) != null);
- }
- }
+
- /**
- * Computes stack usage of an instruction list by performing control flow analysis.
- *
- * @return maximum stack depth used by method
- */
- public static int getMaxStack( ConstantPoolGen cp, InstructionList il, CodeExceptionGen[] et ) {
- BranchStack branchTargets = new BranchStack();
- /* Initially, populate the branch stack with the exception
- * handlers, because these aren't (necessarily) branched to
- * explicitly. in each case, the stack will have depth 1,
- * containing the exception object.
- */
- for (int i = 0; i < et.length; i++) {
- InstructionHandle handler_pc = et[i].getHandlerPC();
- if (handler_pc != null) {
- branchTargets.push(handler_pc, 1);
- }
- }
- int stackDepth = 0, maxStackDepth = 0;
- InstructionHandle ih = il.getStart();
- while (ih != null) {
- Instruction instruction = ih.getInstruction();
- short opcode = instruction.getOpcode();
- int delta = instruction.produceStack(cp) - instruction.consumeStack(cp);
- stackDepth += delta;
- if (stackDepth > maxStackDepth) {
- maxStackDepth = stackDepth;
- }
- // choose the next instruction based on whether current is a branch.
- if (instruction instanceof BranchInstruction) {
- BranchInstruction branch = (BranchInstruction) instruction;
- if (instruction instanceof Select) {
- // explore all of the select's targets. the default target is handled below.
- Select select = (Select) branch;
- InstructionHandle[] targets = select.getTargets();
- for (int i = 0; i < targets.length; i++) {
- branchTargets.push(targets[i], stackDepth);
- }
- // nothing to fall through to.
- ih = null;
- } else if (!(branch instanceof IfInstruction)) {
- // if an instruction that comes back to following PC,
- // push next instruction, with stack depth reduced by 1.
- if (opcode == Constants.JSR || opcode == Constants.JSR_W) {
- branchTargets.push(ih.getNext(), stackDepth - 1);
- }
- ih = null;
- }
- // for all branches, the target of the branch is pushed on the branch stack.
- // conditional branches have a fall through case, selects don't, and
- // jsr/jsr_w return to the next instruction.
- branchTargets.push(branch.getTarget(), stackDepth);
- } else {
- // check for instructions that terminate the method.
- if (opcode == Constants.ATHROW || opcode == Constants.RET
- || (opcode >= Constants.IRETURN && opcode <= Constants.RETURN)) {
- ih = null;
- }
- }
- // normal case, go to the next instruction.
- if (ih != null) {
- ih = ih.getNext();
- }
- // if we have no more instructions, see if there are any deferred branches to explore.
- if (ih == null) {
- BranchTarget bt = branchTargets.pop();
- if (bt != null) {
- ih = bt.target;
- stackDepth = bt.stackDepth;
- }
- }
- }
- return maxStackDepth;
- }
+
private List observers;
- /** Add observer for this object.
- */
- public void addObserver( MethodObserver o ) {
- if (observers == null) {
- observers = new ArrayList();
- }
- observers.add(o);
- }
+
- /** Remove observer for this object.
- */
- public void removeObserver( MethodObserver o ) {
- if (observers != null) {
- observers.remove(o);
- }
- }
+
- /** Call notify() method on all observers. This method is not called
- * automatically whenever the state has changed, but has to be
- * called by the user after he has finished editing the object.
- */
- public void update() {
- if (observers != null) {
- for (Iterator e = observers.iterator(); e.hasNext();) {
- ((MethodObserver) e.next()).notify(this);
- }
- }
- }
+
/**
@@ -1094,134 +344,10 @@
}
- /** @return deep copy of this method
- */
- public MethodGen copy( String class_name, ConstantPoolGen cp ) {
- Method m = ((MethodGen) clone()).getMethod();
- MethodGen mg = new MethodGen(m, class_name, this.cp);
- if (this.cp != cp) {
- mg.setConstantPool(cp);
- mg.getInstructionList().replaceConstantPool(this.cp, cp);
- }
- return mg;
- }
- //J5TODO: Should param_annotations be an array of arrays? Rather than an array of lists, this
- // is more likely to suggest to the caller it is readonly (which a List does not).
- /**
- * Return a list of AnnotationGen objects representing parameter annotations
- */
- public List getAnnotationsOnParameter(int i) {
- ensureExistingParameterAnnotationsUnpacked();
- if (!hasParameterAnnotations || i>arg_types.length) return null;
- return param_annotations[i];
- }
- /**
- * Goes through the attributes on the method and identifies any that are
- * RuntimeParameterAnnotations, extracting their contents and storing them
- * as parameter annotations. There are two kinds of parameter annotation -
- * visible and invisible. Once they have been unpacked, these attributes are
- * deleted. (The annotations will be rebuilt as attributes when someone
- * builds a Method object out of this MethodGen object).
- */
- private void ensureExistingParameterAnnotationsUnpacked()
- {
- if (haveUnpackedParameterAnnotations)
- return;
- // Find attributes that contain parameter annotation data
- Attribute[] attrs = getAttributes();
- ParameterAnnotations paramAnnVisAttr = null;
- ParameterAnnotations paramAnnInvisAttr = null;
- for (int i = 0; i < attrs.length; i++)
- {
- Attribute attribute = attrs[i];
- if (attribute instanceof ParameterAnnotations)
- {
- // Initialize param_annotations
- if (!hasParameterAnnotations)
- {
- param_annotations = new List[arg_types.length];
- for (int j = 0; j < arg_types.length; j++)
- param_annotations[j] = new ArrayList();
- }
- hasParameterAnnotations = true;
- ParameterAnnotations rpa = (ParameterAnnotations) attribute;
- if (rpa instanceof RuntimeVisibleParameterAnnotations)
- paramAnnVisAttr = rpa;
- else
- paramAnnInvisAttr = rpa;
- for (int j = 0; j < arg_types.length; j++)
- {
- // This returns Annotation[] ...
- ParameterAnnotationEntry immutableArray = rpa
- .getParameterAnnotationEntries()[j];
- // ... which needs transforming into an AnnotationGen[] ...
- List mutable = makeMutableVersion(immutableArray.getAnnotationEntries());
- // ... then add these to any we already know about
- param_annotations[j].addAll(mutable);
- }
- }
- }
- if (paramAnnVisAttr != null)
- removeAttribute(paramAnnVisAttr);
- if (paramAnnInvisAttr != null)
- removeAttribute(paramAnnInvisAttr);
- haveUnpackedParameterAnnotations = true;
- }
-
- private List /* AnnotationGen */makeMutableVersion(AnnotationEntry[] mutableArray)
- {
- List result = new ArrayList();
- for (int i = 0; i < mutableArray.length; i++)
- {
- result.add(new AnnotationEntryGen(mutableArray[i], getConstantPool(),
- false));
- }
- return result;
- }
-
- public void addParameterAnnotation(int parameterIndex,
- AnnotationEntryGen annotation)
- {
- ensureExistingParameterAnnotationsUnpacked();
- if (!hasParameterAnnotations)
- {
- param_annotations = new List[arg_types.length];
- hasParameterAnnotations = true;
- }
- List existingAnnotations = param_annotations[parameterIndex];
- if (existingAnnotations != null)
- {
- existingAnnotations.add(annotation);
- }
- else
- {
- List l = new ArrayList();
- l.add(annotation);
- param_annotations[parameterIndex] = l;
- }
- }
-
-
-
-
- /**
- * @return Comparison strategy object
- */
- public static BCELComparator getComparator() {
- return _cmp;
- }
-
-
- /**
- * @param comparator Comparison strategy object
- */
- public static void setComparator( BCELComparator comparator ) {
- _cmp = comparator;
- }
-
-
+
+
/**
* Return value as defined by given BCELComparator strategy.
* By default two MethodGen objects are said to be equal when
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java Sat Dec 5 23:22:46 2009
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* NEW - Create new object
* <PRE>Stack: ... -> ..., objectref</PRE>
@@ -36,22 +34,11 @@
}
- public NEW(int index) {
- super(org.apache.tomcat.util.bcel.Constants.NEW, index);
- }
+
- public Class[] getExceptions() {
- Class[] cs = new Class[2 + ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length + 1] = ExceptionConstants.INSTANTIATION_ERROR;
- cs[ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length] = ExceptionConstants.ILLEGAL_ACCESS_ERROR;
- return cs;
- }
+
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
- return (ObjectType) getType(cpg);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java Sat Dec 5 23:22:46 2009
@@ -42,15 +42,10 @@
}
- public NEWARRAY(byte type) {
- super(org.apache.tomcat.util.bcel.Constants.NEWARRAY, (short) 2);
- this.type = type;
- }
+
- public NEWARRAY(BasicType type) {
- this(type.getType());
- }
+
/**
@@ -71,12 +66,7 @@
}
- /**
- * @return type of constructed array
- */
- public final Type getType() {
- return new ArrayType(BasicType.getType(type), 1);
- }
+
/**
@@ -96,9 +86,5 @@
}
- public Class[] getExceptions() {
- return new Class[] {
- org.apache.tomcat.util.bcel.ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION
- };
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java Sat Dec 5 23:22:46 2009
@@ -28,7 +28,7 @@
public String getName();
- public Type getType();
+
public void setName( String name );
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java Sat Dec 5 23:22:46 2009
@@ -17,8 +17,6 @@
package org.apache.tomcat.util.bcel.generic;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.Repository;
-import org.apache.tomcat.util.bcel.classfile.JavaClass;
/**
* Denotes reference such as java.lang.String.
@@ -63,93 +61,20 @@
}
- /**
- * If "this" doesn't reference a class, it references an interface
- * or a non-existant entity.
- * @deprecated this method returns an inaccurate result
- * if the class or interface referenced cannot
- * be found: use referencesClassExact() instead
- */
- public boolean referencesClass() {
- try {
- JavaClass jc = Repository.lookupClass(class_name);
- return jc.isClass();
- } catch (ClassNotFoundException e) {
- return false;
- }
- }
+
- /**
- * If "this" doesn't reference an interface, it references a class
- * or a non-existant entity.
- * @deprecated this method returns an inaccurate result
- * if the class or interface referenced cannot
- * be found: use referencesInterfaceExact() instead
- */
- public boolean referencesInterface() {
- try {
- JavaClass jc = Repository.lookupClass(class_name);
- return !jc.isClass();
- } catch (ClassNotFoundException e) {
- return false;
- }
- }
+
- /**
- * Return true if this type references a class,
- * false if it references an interface.
- * @return true if the type references a class, false if
- * it references an interface
- * @throws ClassNotFoundException if the class or interface
- * referenced by this type can't be found
- */
- public boolean referencesClassExact() throws ClassNotFoundException {
- JavaClass jc = Repository.lookupClass(class_name);
- return jc.isClass();
- }
+
- /**
- * Return true if this type references an interface,
- * false if it references a class.
- * @return true if the type references an interface, false if
- * it references a class
- * @throws ClassNotFoundException if the class or interface
- * referenced by this type can't be found
- */
- public boolean referencesInterfaceExact() throws ClassNotFoundException {
- JavaClass jc = Repository.lookupClass(class_name);
- return !jc.isClass();
- }
+
- /**
- * Return true if this type is a subclass of given ObjectType.
- * @throws ClassNotFoundException if any of this class's superclasses
- * can't be found
- */
- public boolean subclassOf( ObjectType superclass ) throws ClassNotFoundException {
- if (this.referencesInterface() || superclass.referencesInterface()) {
- return false;
- }
- return Repository.instanceOf(this.class_name, superclass.class_name);
- }
+
- /**
- * Java Virtual Machine Specification edition 2, � 5.4.4 Access Control
- * @throws ClassNotFoundException if the class referenced by this type
- * can't be found
- */
- public boolean accessibleTo( ObjectType accessor ) throws ClassNotFoundException {
- JavaClass jc = Repository.lookupClass(class_name);
- if (jc.isPublic()) {
- return true;
- } else {
- JavaClass acc = Repository.lookupClass(accessor.class_name);
- return acc.getPackageName().equals(jc.getPackageName());
- }
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* PUTFIELD - Put field in object
* <PRE>Stack: ..., objectref, value -> ...</PRE>
@@ -38,9 +35,7 @@
}
- public PUTFIELD(int index) {
- super(Constants.PUTFIELD, index);
- }
+
public int consumeStack( ConstantPoolGen cpg ) {
@@ -48,12 +43,5 @@
}
- public Class[] getExceptions() {
- Class[] cs = new Class[2 + ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 1] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* PUTSTATIC - Put static field in class
* <PRE>Stack: ..., value -> ...</PRE>
@@ -38,9 +35,7 @@
}
- public PUTSTATIC(int index) {
- super(Constants.PUTSTATIC, index);
- }
+
public int consumeStack( ConstantPoolGen cpg ) {
@@ -48,11 +43,5 @@
}
- public Class[] getExceptions() {
- Class[] cs = new Class[1 + ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java Sat Dec 5 23:22:46 2009
@@ -42,10 +42,7 @@
}
- public RET(int index) {
- super(org.apache.tomcat.util.bcel.Constants.RET, (short) 2);
- setIndex(index); // May set wide as side effect
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java Sat Dec 5 23:22:46 2009
@@ -17,8 +17,6 @@
package org.apache.tomcat.util.bcel.generic;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.Repository;
-import org.apache.tomcat.util.bcel.classfile.JavaClass;
/**
* Super class for object and array types.
@@ -40,291 +38,14 @@
}
- /**
- * Return true iff this type is castable to another type t as defined in
- * the JVM specification. The case where this is Type.NULL is not
- * defined (see the CHECKCAST definition in the JVM specification).
- * However, because e.g. CHECKCAST doesn't throw a
- * ClassCastException when casting a null reference to any Object,
- * true is returned in this case.
- *
- * @throws ClassNotFoundException if any classes or interfaces required
- * to determine assignment compatibility can't be found
- */
- public boolean isCastableTo( Type t ) throws ClassNotFoundException {
- if (this.equals(Type.NULL)) {
- return true; // If this is ever changed in isAssignmentCompatible()
- }
- return isAssignmentCompatibleWith(t);
- /* Yes, it's true: It's the same definition.
- * See vmspec2 AASTORE / CHECKCAST definitions.
- */
- }
+
- /**
- * Return true iff this is assignment compatible with another type t
- * as defined in the JVM specification; see the AASTORE definition
- * there.
- * @throws ClassNotFoundException if any classes or interfaces required
- * to determine assignment compatibility can't be found
- */
- public boolean isAssignmentCompatibleWith( Type t ) throws ClassNotFoundException {
- if (!(t instanceof ReferenceType)) {
- return false;
- }
- ReferenceType T = (ReferenceType) t;
- if (this.equals(Type.NULL)) {
- return true; // This is not explicitely stated, but clear. Isn't it?
- }
- /* If this is a class type then
- */
- if ((this instanceof ObjectType) && (((ObjectType) this).referencesClassExact())) {
- /* If T is a class type, then this must be the same class as T,
- or this must be a subclass of T;
- */
- if ((T instanceof ObjectType) && (((ObjectType) T).referencesClassExact())) {
- if (this.equals(T)) {
- return true;
- }
- if (Repository.instanceOf(((ObjectType) this).getClassName(), ((ObjectType) T)
- .getClassName())) {
- return true;
- }
- }
- /* If T is an interface type, this must implement interface T.
- */
- if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) {
- if (Repository.implementationOf(((ObjectType) this).getClassName(),
- ((ObjectType) T).getClassName())) {
- return true;
- }
- }
- }
- /* If this is an interface type, then:
- */
- if ((this instanceof ObjectType) && (((ObjectType) this).referencesInterfaceExact())) {
- /* If T is a class type, then T must be Object (�2.4.7).
- */
- if ((T instanceof ObjectType) && (((ObjectType) T).referencesClassExact())) {
- if (T.equals(Type.OBJECT)) {
- return true;
- }
- }
- /* If T is an interface type, then T must be the same interface
- * as this or a superinterface of this (�2.13.2).
- */
- if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) {
- if (this.equals(T)) {
- return true;
- }
- if (Repository.implementationOf(((ObjectType) this).getClassName(),
- ((ObjectType) T).getClassName())) {
- return true;
- }
- }
- }
- /* If this is an array type, namely, the type SC[], that is, an
- * array of components of type SC, then:
- */
- if (this instanceof ArrayType) {
- /* If T is a class type, then T must be Object (�2.4.7).
- */
- if ((T instanceof ObjectType) && (((ObjectType) T).referencesClassExact())) {
- if (T.equals(Type.OBJECT)) {
- return true;
- }
- }
- /* If T is an array type TC[], that is, an array of components
- * of type TC, then one of the following must be true:
- */
- if (T instanceof ArrayType) {
- /* TC and SC are the same primitive type (�2.4.1).
- */
- Type sc = ((ArrayType) this).getElementType();
- Type tc = ((ArrayType) T).getElementType();
- if (sc instanceof BasicType && tc instanceof BasicType && sc.equals(tc)) {
- return true;
- }
- /* TC and SC are reference types (�2.4.6), and type SC is
- * assignable to TC by these runtime rules.
- */
- if (tc instanceof ReferenceType && sc instanceof ReferenceType
- && ((ReferenceType) sc).isAssignmentCompatibleWith(tc)) {
- return true;
- }
- }
- /* If T is an interface type, T must be one of the interfaces implemented by arrays (�2.15). */
- // TODO: Check if this is still valid or find a way to dynamically find out which
- // interfaces arrays implement. However, as of the JVM specification edition 2, there
- // are at least two different pages where assignment compatibility is defined and
- // on one of them "interfaces implemented by arrays" is exchanged with "'Cloneable' or
- // 'java.io.Serializable'"
- if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) {
- for (int ii = 0; ii < Constants.INTERFACES_IMPLEMENTED_BY_ARRAYS.length; ii++) {
- if (T.equals(new ObjectType(Constants.INTERFACES_IMPLEMENTED_BY_ARRAYS[ii]))) {
- return true;
- }
- }
- }
- }
- return false; // default.
- }
+
- /**
- * This commutative operation returns the first common superclass (narrowest ReferenceType
- * referencing a class, not an interface).
- * If one of the types is a superclass of the other, the former is returned.
- * If "this" is Type.NULL, then t is returned.
- * If t is Type.NULL, then "this" is returned.
- * If "this" equals t ['this.equals(t)'] "this" is returned.
- * If "this" or t is an ArrayType, then Type.OBJECT is returned;
- * unless their dimensions match. Then an ArrayType of the same
- * number of dimensions is returned, with its basic type being the
- * first common super class of the basic types of "this" and t.
- * If "this" or t is a ReferenceType referencing an interface, then Type.OBJECT is returned.
- * If not all of the two classes' superclasses cannot be found, "null" is returned.
- * See the JVM specification edition 2, "�4.9.2 The Bytecode Verifier".
- *
- * @throws ClassNotFoundException on failure to find superclasses of this
- * type, or the type passed as a parameter
- */
- public ReferenceType getFirstCommonSuperclass( ReferenceType t ) throws ClassNotFoundException {
- if (this.equals(Type.NULL)) {
- return t;
- }
- if (t.equals(Type.NULL)) {
- return this;
- }
- if (this.equals(t)) {
- return this;
- /*
- * TODO: Above sounds a little arbitrary. On the other hand, there is
- * no object referenced by Type.NULL so we can also say all the objects
- * referenced by Type.NULL were derived from java.lang.Object.
- * However, the Java Language's "instanceof" operator proves us wrong:
- * "null" is not referring to an instance of java.lang.Object :)
- */
- }
- /* This code is from a bug report by Konstantin Shagin <konst@cs.technion.ac.il> */
- if ((this instanceof ArrayType) && (t instanceof ArrayType)) {
- ArrayType arrType1 = (ArrayType) this;
- ArrayType arrType2 = (ArrayType) t;
- if ((arrType1.getDimensions() == arrType2.getDimensions())
- && arrType1.getBasicType() instanceof ObjectType
- && arrType2.getBasicType() instanceof ObjectType) {
- return new ArrayType(((ObjectType) arrType1.getBasicType())
- .getFirstCommonSuperclass((ObjectType) arrType2.getBasicType()), arrType1
- .getDimensions());
- }
- }
- if ((this instanceof ArrayType) || (t instanceof ArrayType)) {
- return Type.OBJECT;
- // TODO: Is there a proof of OBJECT being the direct ancestor of every ArrayType?
- }
- if (((this instanceof ObjectType) && ((ObjectType) this).referencesInterface())
- || ((t instanceof ObjectType) && ((ObjectType) t).referencesInterface())) {
- return Type.OBJECT;
- // TODO: The above line is correct comparing to the vmspec2. But one could
- // make class file verification a bit stronger here by using the notion of
- // superinterfaces or even castability or assignment compatibility.
- }
- // this and t are ObjectTypes, see above.
- ObjectType thiz = (ObjectType) this;
- ObjectType other = (ObjectType) t;
- JavaClass[] thiz_sups = Repository.getSuperClasses(thiz.getClassName());
- JavaClass[] other_sups = Repository.getSuperClasses(other.getClassName());
- if ((thiz_sups == null) || (other_sups == null)) {
- return null;
- }
- // Waaahh...
- JavaClass[] this_sups = new JavaClass[thiz_sups.length + 1];
- JavaClass[] t_sups = new JavaClass[other_sups.length + 1];
- System.arraycopy(thiz_sups, 0, this_sups, 1, thiz_sups.length);
- System.arraycopy(other_sups, 0, t_sups, 1, other_sups.length);
- this_sups[0] = Repository.lookupClass(thiz.getClassName());
- t_sups[0] = Repository.lookupClass(other.getClassName());
- for (int i = 0; i < t_sups.length; i++) {
- for (int j = 0; j < this_sups.length; j++) {
- if (this_sups[j].equals(t_sups[i])) {
- return new ObjectType(this_sups[j].getClassName());
- }
- }
- }
- // Huh? Did you ask for Type.OBJECT's superclass??
- return null;
- }
+
- /**
- * This commutative operation returns the first common superclass (narrowest ReferenceType
- * referencing a class, not an interface).
- * If one of the types is a superclass of the other, the former is returned.
- * If "this" is Type.NULL, then t is returned.
- * If t is Type.NULL, then "this" is returned.
- * If "this" equals t ['this.equals(t)'] "this" is returned.
- * If "this" or t is an ArrayType, then Type.OBJECT is returned.
- * If "this" or t is a ReferenceType referencing an interface, then Type.OBJECT is returned.
- * If not all of the two classes' superclasses cannot be found, "null" is returned.
- * See the JVM specification edition 2, "�4.9.2 The Bytecode Verifier".
- *
- * @deprecated use getFirstCommonSuperclass(ReferenceType t) which has
- * slightly changed semantics.
- * @throws ClassNotFoundException on failure to find superclasses of this
- * type, or the type passed as a parameter
- */
- public ReferenceType firstCommonSuperclass( ReferenceType t ) throws ClassNotFoundException {
- if (this.equals(Type.NULL)) {
- return t;
- }
- if (t.equals(Type.NULL)) {
- return this;
- }
- if (this.equals(t)) {
- return this;
- /*
- * TODO: Above sounds a little arbitrary. On the other hand, there is
- * no object referenced by Type.NULL so we can also say all the objects
- * referenced by Type.NULL were derived from java.lang.Object.
- * However, the Java Language's "instanceof" operator proves us wrong:
- * "null" is not referring to an instance of java.lang.Object :)
- */
- }
- if ((this instanceof ArrayType) || (t instanceof ArrayType)) {
- return Type.OBJECT;
- // TODO: Is there a proof of OBJECT being the direct ancestor of every ArrayType?
- }
- if (((this instanceof ObjectType) && ((ObjectType) this).referencesInterface())
- || ((t instanceof ObjectType) && ((ObjectType) t).referencesInterface())) {
- return Type.OBJECT;
- // TODO: The above line is correct comparing to the vmspec2. But one could
- // make class file verification a bit stronger here by using the notion of
- // superinterfaces or even castability or assignment compatibility.
- }
- // this and t are ObjectTypes, see above.
- ObjectType thiz = (ObjectType) this;
- ObjectType other = (ObjectType) t;
- JavaClass[] thiz_sups = Repository.getSuperClasses(thiz.getClassName());
- JavaClass[] other_sups = Repository.getSuperClasses(other.getClassName());
- if ((thiz_sups == null) || (other_sups == null)) {
- return null;
- }
- // Waaahh...
- JavaClass[] this_sups = new JavaClass[thiz_sups.length + 1];
- JavaClass[] t_sups = new JavaClass[other_sups.length + 1];
- System.arraycopy(thiz_sups, 0, this_sups, 1, thiz_sups.length);
- System.arraycopy(other_sups, 0, t_sups, 1, other_sups.length);
- this_sups[0] = Repository.lookupClass(thiz.getClassName());
- t_sups[0] = Repository.lookupClass(other.getClassName());
- for (int i = 0; i < t_sups.length; i++) {
- for (int j = 0; j < this_sups.length; j++) {
- if (this_sups[j].equals(t_sups[i])) {
- return new ObjectType(this_sups[j].getClassName());
- }
- }
- }
- // Huh? Did you ask for Type.OBJECT's superclass??
- return null;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java Sat Dec 5 23:22:46 2009
@@ -73,10 +73,5 @@
}
- /**
- * @return the target of this ReturnaddressType
- */
- public InstructionHandle getTarget() {
- return returnTarget;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java Sat Dec 5 23:22:46 2009
@@ -41,10 +41,7 @@
}
- public SIPUSH(short b) {
- super(org.apache.tomcat.util.bcel.Constants.SIPUSH, (short) 3);
- this.b = b;
- }
+
/**
@@ -78,9 +75,5 @@
}
- /** @return Type.SHORT
- */
- public Type getType( ConstantPoolGen cp ) {
- return Type.SHORT;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java Sat Dec 5 23:22:46 2009
@@ -50,26 +50,7 @@
}
- /**
- * (Match, target) pairs for switch.
- * `Match' and `targets' must have the same length of course.
- *
- * @param match array of matching values
- * @param targets instruction targets
- * @param defaultTarget default instruction target
- */
- Select(short opcode, int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
- super(opcode, defaultTarget);
- this.targets = targets;
- for (int i = 0; i < targets.length; i++) {
- notifyTarget(null, targets[i], this);
- }
- this.match = match;
- if ((match_length = match.length) != targets.length) {
- throw new ClassGenException("Match and target array have not the same length: Match length: " + match.length + " Target length: " + targets.length);
- }
- indices = new int[match_length];
- }
+
/**
@@ -211,12 +192,7 @@
}
- /**
- * @return array of match indices
- */
- public int[] getMatchs() {
- return match;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java Sat Dec 5 23:22:46 2009
@@ -17,74 +17,25 @@
// For 'class' this points to the class entry in the cpGen
private int idx;
- // ctors for each supported type... type could be inferred but for now lets
- // force it to be passed
- /**
- * Protected ctor used for deserialization, doesn't *put* an entry in the
- * constant pool, assumes the one at the supplied index is correct.
- */
- protected SimpleElementValueGen(int type, int idx, ConstantPoolGen cpGen)
- {
- super(type, cpGen);
- this.idx = idx;
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, int value)
- {
- super(type, cpGen);
- idx = cpGen.addInteger(value);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, long value)
- {
- super(type, cpGen);
- idx = cpGen.addLong(value);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, double value)
- {
- super(type, cpGen);
- idx = cpGen.addDouble(value);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, float value)
- {
- super(type, cpGen);
- idx = cpGen.addFloat(value);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, short value)
- {
- super(type, cpGen);
- idx = cpGen.addInteger(value);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, byte value)
- {
- super(type, cpGen);
- idx = cpGen.addInteger(value);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, char value)
- {
- super(type, cpGen);
- idx = cpGen.addInteger(value);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, boolean value)
- {
- super(type, cpGen);
- if (value)
- idx = cpGen.addInteger(1);
- else
- idx = cpGen.addInteger(0);
- }
+
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, String value)
- {
- super(type, cpGen);
- idx = cpGen.addUtf8(value);
- }
+
/**
* The boolean controls whether we copy info from the 'old' constant pool to
@@ -155,28 +106,11 @@
return new SimpleElementValue(type, idx, cpGen.getConstantPool());
}
- public int getIndex()
- {
- return idx;
- }
+
- public String getValueString()
- {
- if (type != STRING)
- throw new RuntimeException(
- "Dont call getValueString() on a non STRING ElementValue");
- ConstantUtf8 c = (ConstantUtf8) cpGen.getConstant(idx);
- return c.getBytes();
- }
+
- public int getValueInt()
- {
- if (type != PRIMITIVE_INT)
- throw new RuntimeException(
- "Dont call getValueString() on a non STRING ElementValue");
- ConstantInteger c = (ConstantInteger) cpGen.getConstant(idx);
- return c.getBytes();
- }
+
// Whatever kind of value it is, return it as a string
public String stringifyValue()
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java Sat Dec 5 23:22:46 2009
@@ -24,7 +24,5 @@
*/
public interface StackConsumer {
- /** @return how many words are consumed from stack
- */
- public int consumeStack( ConstantPoolGen cpg );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java Sat Dec 5 23:22:46 2009
@@ -25,7 +25,5 @@
*/
public interface StackProducer {
- /** @return how many words are produced on stack
- */
- public int produceStack( ConstantPoolGen cpg );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java Sat Dec 5 23:22:46 2009
@@ -37,18 +37,7 @@
}
- /**
- * @param match sorted array of match values, match[0] must be low value,
- * match[match_length - 1] high value
- * @param targets where to branch for matched values
- * @param defaultTarget default branch
- */
- public TABLESWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
- super(org.apache.tomcat.util.bcel.Constants.TABLESWITCH, match, targets, defaultTarget);
- length = (short) (13 + match_length * 4); /* Alignment remainder assumed
- * 0 here, until dump time */
- fixed_length = length;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java Sat Dec 5 23:22:46 2009
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
import org.apache.tomcat.util.bcel.classfile.Utility;
@@ -47,13 +45,12 @@
public static final ObjectType OBJECT = new ObjectType("java.lang.Object");
public static final ObjectType CLASS = new ObjectType("java.lang.Class");
public static final ObjectType STRING = new ObjectType("java.lang.String");
- public static final ObjectType STRINGBUFFER = new ObjectType("java.lang.StringBuffer");
- public static final ObjectType THROWABLE = new ObjectType("java.lang.Throwable");
- public static final Type[] NO_ARGS = new Type[0];
+
+
+
public static final ReferenceType NULL = new ReferenceType() {
};
- public static final Type UNKNOWN = new Type(Constants.T_UNKNOWN, "<unknown object>") {
- };
+
protected Type(byte t, String s) {
@@ -212,101 +209,16 @@
}
- /**
- * Convert arguments of a method (signature) to an array of Type objects.
- * @param signature signature string such as (Ljava/lang/String;)V
- * @return array of argument types
- */
- public static Type[] getArgumentTypes( String signature ) {
- List vec = new ArrayList();
- int index;
- Type[] types;
- try { // Read all declarations between for `(' and `)'
- if (signature.charAt(0) != '(') {
- throw new ClassFormatException("Invalid method signature: " + signature);
- }
- index = 1; // current string position
- while (signature.charAt(index) != ')') {
- vec.add(getType(signature.substring(index)));
- //corrected concurrent private static field acess
- index += unwrap(consumed_chars); // update position
- }
- } catch (StringIndexOutOfBoundsException e) { // Should never occur
- throw new ClassFormatException("Invalid method signature: " + signature, e);
- }
- types = new Type[vec.size()];
- vec.toArray(types);
- return types;
- }
+
- /** Convert runtime java.lang.Class to BCEL Type object.
- * @param cl Java class
- * @return corresponding Type object
- */
- public static Type getType( java.lang.Class cl ) {
- if (cl == null) {
- throw new IllegalArgumentException("Class must not be null");
- }
- /* That's an amzingly easy case, because getName() returns
- * the signature. That's what we would have liked anyway.
- */
- if (cl.isArray()) {
- return getType(cl.getName());
- } else if (cl.isPrimitive()) {
- if (cl == Integer.TYPE) {
- return INT;
- } else if (cl == Void.TYPE) {
- return VOID;
- } else if (cl == Double.TYPE) {
- return DOUBLE;
- } else if (cl == Float.TYPE) {
- return FLOAT;
- } else if (cl == Boolean.TYPE) {
- return BOOLEAN;
- } else if (cl == Byte.TYPE) {
- return BYTE;
- } else if (cl == Short.TYPE) {
- return SHORT;
- } else if (cl == Byte.TYPE) {
- return BYTE;
- } else if (cl == Long.TYPE) {
- return LONG;
- } else if (cl == Character.TYPE) {
- return CHAR;
- } else {
- throw new IllegalStateException("Ooops, what primitive type is " + cl);
- }
- } else { // "Real" class
- return new ObjectType(cl.getName());
- }
- }
+
- /**
- * Convert runtime java.lang.Class[] to BCEL Type objects.
- * @param classes an array of runtime class objects
- * @return array of corresponding Type objects
- */
- public static Type[] getTypes( java.lang.Class[] classes ) {
- Type[] ret = new Type[classes.length];
- for (int i = 0; i < ret.length; i++) {
- ret[i] = getType(classes[i]);
- }
- return ret;
- }
+
- public static String getSignature( java.lang.reflect.Method meth ) {
- StringBuffer sb = new StringBuffer("(");
- Class[] params = meth.getParameterTypes(); // avoid clone
- for (int j = 0; j < params.length; j++) {
- sb.append(getType(params[j]).getSignature());
- }
- sb.append(")");
- sb.append(getType(meth.getReturnType()).getSignature());
- return sb.toString();
- }
+
private static int size(int coded) {
return coded & 3;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java Sat Dec 5 23:22:46 2009
@@ -25,5 +25,5 @@
*/
public interface TypedInstruction {
- public Type getType( ConstantPoolGen cpg );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java Sat Dec 5 23:22:46 2009
@@ -43,9 +43,7 @@
}
- final void unreadByte() {
- byte_stream.unreadByte();
- }
+
private static final class ByteArrayStream extends ByteArrayInputStream {
@@ -57,12 +55,5 @@
final int getPosition() {
return pos;
} // is protected in ByteArrayInputStream
-
-
- final void unreadByte() {
- if (pos > 0) {
- pos--;
- }
- }
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java Sat Dec 5 23:22:46 2009
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.util.bcel.util;
-import java.io.DataInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
@@ -26,12 +25,10 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
-import java.util.Vector;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -189,49 +186,11 @@
return getClassFile(name, suffix).getInputStream();
}
- /**
- * @param name fully qualified resource name, e.g. java/lang/String.class
- * @return InputStream supplying the resource, or null if no resource with that name.
- */
- public InputStream getResourceAsStream(String name) {
- for (int i = 0; i < paths.length; i++) {
- InputStream is;
- if ((is = paths[i].getResourceAsStream(name)) != null) {
- return is;
- }
- }
- return null;
- }
- /**
- * @param name fully qualified resource name, e.g. java/lang/String.class
- * @return URL supplying the resource, or null if no resource with that name.
- */
- public URL getResource(String name) {
- for (int i = 0; i < paths.length; i++) {
- URL url;
- if ((url = paths[i].getResource(name)) != null) {
- return url;
- }
- }
- return null;
- }
+
+
- /**
- * @param name fully qualified resource name, e.g. java/lang/String.class
- * @return An Enumeration of URLs supplying the resource, or an
- * empty Enumeration if no resource with that name.
- */
- public Enumeration getResources(String name) {
- Vector results = new Vector();
- for (int i = 0; i < paths.length; i++) {
- URL url;
- if ((url = paths[i].getResource(name)) != null) {
- results.add(url);
- }
- }
- return results.elements();
- }
+
/**
* @param name fully qualified file name, e.g. java/lang/String
@@ -249,70 +208,19 @@
}
- /**
- * @param name fully qualified class name, e.g. java.lang.String
- * @return input stream for class
- */
- public ClassFile getClassFile( String name ) throws IOException {
- return getClassFile(name, ".class");
- }
+
- /**
- * @param name fully qualified file name, e.g. java/lang/String
- * @param suffix file name ends with suffix, e.g. .java
- * @return byte array for file on class path
- */
- public byte[] getBytes( String name, String suffix ) throws IOException {
- DataInputStream dis = null;
- try {
- InputStream is = getInputStream(name, suffix);
- if (is == null) {
- throw new IOException("Couldn't find: " + name + suffix);
- }
- dis = new DataInputStream(is);
- byte[] bytes = new byte[is.available()];
- dis.readFully(bytes);
- return bytes;
- } finally {
- if (dis != null) {
- dis.close();
- }
- }
- }
+
- /**
- * @return byte array for class
- */
- public byte[] getBytes( String name ) throws IOException {
- return getBytes(name, ".class");
- }
+
- /**
- * @param name name of file to search for, e.g. java/lang/String.java
- * @return full (canonical) path for file
- */
- public String getPath( String name ) throws IOException {
- int index = name.lastIndexOf('.');
- String suffix = "";
- if (index > 0) {
- suffix = name.substring(index);
- name = name.substring(0, index);
- }
- return getPath(name, suffix);
- }
+
- /**
- * @param name name of file to search for, e.g. java/lang/String
- * @param suffix file name suffix, e.g. .java
- * @return full (canonical) path for file, if it exists
- */
- public String getPath( String name, String suffix ) throws IOException {
- return getClassFile(name, suffix).getPath();
- }
+
private static abstract class PathEntry implements Serializable {
@@ -330,25 +238,16 @@
public abstract InputStream getInputStream() throws IOException;
- /** @return canonical path to class file.
- */
- public abstract String getPath();
+
- /** @return base path of found class, i.e. class is contained relative
- * to that path, which may either denote a directory, or zip file
- */
- public abstract String getBase();
+
- /** @return modification time of class file.
- */
- public abstract long getTime();
+
- /** @return size of class file.
- */
- public abstract long getSize();
+
}
private static class Dir extends PathEntry {
@@ -388,30 +287,6 @@
public InputStream getInputStream() throws IOException {
return new FileInputStream(file);
}
-
-
- public String getPath() {
- try {
- return file.getCanonicalPath();
- } catch (IOException e) {
- return null;
- }
- }
-
-
- public long getTime() {
- return file.lastModified();
- }
-
-
- public long getSize() {
- return file.length();
- }
-
-
- public String getBase() {
- return dir;
- }
} : null;
}
@@ -459,26 +334,6 @@
public InputStream getInputStream() throws IOException {
return zip.getInputStream(entry);
}
-
-
- public String getPath() {
- return entry.toString();
- }
-
-
- public long getTime() {
- return entry.getTime();
- }
-
-
- public long getSize() {
- return entry.getSize();
- }
-
-
- public String getBase() {
- return zip.getName();
- }
};
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java Sat Dec 5 23:22:46 2009
@@ -36,10 +36,7 @@
public void storeClass( JavaClass clazz );
- /**
- * Remove class from repository
- */
- public void removeClass( JavaClass clazz );
+
/**
@@ -56,18 +53,11 @@
public JavaClass loadClass( String className ) throws java.lang.ClassNotFoundException;
- /**
- * Find the JavaClass instance for the given run-time class object
- */
- public JavaClass loadClass( Class clazz ) throws java.lang.ClassNotFoundException;
+
- /** Clear all entries from cache.
- */
- public void clear();
+
- /** Get the ClassPath associated with this Repository
- */
- public ClassPath getClassPath();
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* GETFIELD - Fetch field from object
* <PRE>Stack: ..., objectref -> ..., value</PRE>
@@ -39,9 +36,7 @@
}
- public GETFIELD(int index) {
- super(Constants.GETFIELD, index);
- }
+
public int produceStack( ConstantPoolGen cpg ) {
@@ -49,12 +44,5 @@
}
- public Class[] getExceptions() {
- Class[] cs = new Class[2 + ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 1] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* GETSTATIC - Fetch static field from class
* <PRE>Stack: ..., -> ..., value</PRE>
@@ -38,9 +35,7 @@
}
- public GETSTATIC(int index) {
- super(Constants.GETSTATIC, index);
- }
+
public int produceStack( ConstantPoolGen cpg ) {
@@ -48,11 +43,5 @@
}
- public Class[] getExceptions() {
- Class[] cs = new Class[1 + ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java Sat Dec 5 23:22:46 2009
@@ -35,9 +35,7 @@
}
- public GOTO(InstructionHandle target) {
- super(org.apache.tomcat.util.bcel.Constants.GOTO, target);
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java Sat Dec 5 23:22:46 2009
@@ -36,10 +36,7 @@
}
- public GOTO_W(InstructionHandle target) {
- super(org.apache.tomcat.util.bcel.Constants.GOTO_W, target);
- length = 5;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java Sat Dec 5 23:22:46 2009
@@ -24,9 +24,7 @@
*/
public abstract class GotoInstruction extends BranchInstruction implements UnconditionalBranch {
- GotoInstruction(short opcode, InstructionHandle target) {
- super(opcode, target);
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java Sat Dec 5 23:22:46 2009
@@ -40,17 +40,7 @@
}
- /**
- * @param n index of local variable
- * @param c increment factor
- */
- public IINC(int n, int c) {
- super(); // Default behaviour of LocalVariableInstruction causes error
- this.opcode = org.apache.tomcat.util.bcel.Constants.IINC;
- this.length = (short) 3;
- setIndex(n); // May set wide as side effect
- setIncrement(c);
- }
+
/**
@@ -119,21 +109,10 @@
}
- /**
- * @return increment factor
- */
- public final int getIncrement() {
- return c;
- }
+
- /**
- * Set increment factor.
- */
- public final void setIncrement( int c ) {
- this.c = c;
- setWide();
- }
+
/** @return int type
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java Sat Dec 5 23:22:46 2009
@@ -34,21 +34,11 @@
}
- public INSTANCEOF(int index) {
- super(org.apache.tomcat.util.bcel.Constants.INSTANCEOF, index);
- }
+
- public Class[] getExceptions() {
- return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION;
- }
+
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
- Type t = getType(cpg);
- if (t instanceof ArrayType) {
- t = ((ArrayType) t).getBasicType();
- }
- return (t instanceof ObjectType) ? (ObjectType) t : null;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java Sat Dec 5 23:22:46 2009
@@ -18,8 +18,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
import org.apache.tomcat.util.bcel.classfile.ConstantPool;
import org.apache.tomcat.util.bcel.util.ByteSequence;
@@ -43,14 +41,7 @@
}
- public INVOKEINTERFACE(int index, int nargs) {
- super(Constants.INVOKEINTERFACE, index);
- length = 5;
- if (nargs < 1) {
- throw new ClassGenException("Number of arguments must be > 0 " + nargs);
- }
- this.nargs = nargs;
- }
+
/**
@@ -65,13 +56,7 @@
}
- /**
- * The <B>count</B> argument according to the Java Language Specification,
- * Second Edition.
- */
- public int getCount() {
- return nargs;
- }
+
/**
@@ -98,14 +83,5 @@
}
- public Class[] getExceptions() {
- Class[] cs = new Class[4 + ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION.length + 3] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- cs[ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION.length + 2] = ExceptionConstants.ILLEGAL_ACCESS_ERROR;
- cs[ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION.length + 1] = ExceptionConstants.ABSTRACT_METHOD_ERROR;
- cs[ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION.length] = ExceptionConstants.UNSATISFIED_LINK_ERROR;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* INVOKESPECIAL - Invoke instance method; special handling for superclass, private
* and instance initialization method invocations
@@ -38,19 +35,8 @@
}
- public INVOKESPECIAL(int index) {
- super(Constants.INVOKESPECIAL, index);
- }
+
- public Class[] getExceptions() {
- Class[] cs = new Class[4 + ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 3] = ExceptionConstants.UNSATISFIED_LINK_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 2] = ExceptionConstants.ABSTRACT_METHOD_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 1] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* INVOKESTATIC - Invoke a class (static) method
*
@@ -37,17 +34,8 @@
}
- public INVOKESTATIC(int index) {
- super(Constants.INVOKESTATIC, index);
- }
+
- public Class[] getExceptions() {
- Class[] cs = new Class[2 + ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.UNSATISFIED_LINK_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 1] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* INVOKEVIRTUAL - Invoke instance method; dispatch based on class
*
@@ -37,19 +34,8 @@
}
- public INVOKEVIRTUAL(int index) {
- super(Constants.INVOKEVIRTUAL, index);
- }
+
- public Class[] getExceptions() {
- Class[] cs = new Class[4 + ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 3] = ExceptionConstants.UNSATISFIED_LINK_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 2] = ExceptionConstants.ABSTRACT_METHOD_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 1] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
- cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
- return cs;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java Sat Dec 5 23:22:46 2009
@@ -19,7 +19,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
-import java.util.Locale;
import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.ConstantPool;
import org.apache.tomcat.util.bcel.util.ByteSequence;
@@ -101,28 +100,7 @@
}
- /**
- * Use with caution, since `BranchInstruction's have a `target' reference which
- * is not copied correctly (only basic types are). This also applies for
- * `Select' instructions with their multiple branch targets.
- *
- * @see BranchInstruction
- * @return (shallow) copy of an instruction
- */
- public Instruction copy() {
- Instruction i = null;
- // "Constant" instruction, no need to duplicate
- if (InstructionConstants.INSTRUCTIONS[this.getOpcode()] != null) {
- i = this;
- } else {
- try {
- i = (Instruction) clone();
- } catch (CloneNotSupportedException e) {
- System.err.println(e);
- }
- }
- return i;
- }
+
/**
@@ -511,21 +489,10 @@
}
- /** Get Comparator object used in the equals() method to determine
- * equality of instructions.
- *
- * @return currently used comparator for equals()
- */
- public static InstructionComparator getComparator() {
- return cmp;
- }
+
- /** Set comparator to be used for equals().
- */
- public static void setComparator( InstructionComparator c ) {
- cmp = c;
- }
+
/** Check for equality, delegated to comparator
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java Sat Dec 5 23:22:46 2009
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
-
/**
* This interface contains shareable instruction objects.
*
@@ -37,250 +35,131 @@
*/
public interface InstructionConstants {
- /** Predefined instruction objects
- */
- public static final Instruction NOP = new NOP();
- public static final Instruction ACONST_NULL = new ACONST_NULL();
- public static final Instruction ICONST_M1 = new ICONST(-1);
- public static final Instruction ICONST_0 = new ICONST(0);
- public static final Instruction ICONST_1 = new ICONST(1);
- public static final Instruction ICONST_2 = new ICONST(2);
- public static final Instruction ICONST_3 = new ICONST(3);
- public static final Instruction ICONST_4 = new ICONST(4);
- public static final Instruction ICONST_5 = new ICONST(5);
- public static final Instruction LCONST_0 = new LCONST(0);
- public static final Instruction LCONST_1 = new LCONST(1);
- public static final Instruction FCONST_0 = new FCONST(0);
- public static final Instruction FCONST_1 = new FCONST(1);
- public static final Instruction FCONST_2 = new FCONST(2);
- public static final Instruction DCONST_0 = new DCONST(0);
- public static final Instruction DCONST_1 = new DCONST(1);
- public static final ArrayInstruction IALOAD = new IALOAD();
- public static final ArrayInstruction LALOAD = new LALOAD();
- public static final ArrayInstruction FALOAD = new FALOAD();
- public static final ArrayInstruction DALOAD = new DALOAD();
- public static final ArrayInstruction AALOAD = new AALOAD();
- public static final ArrayInstruction BALOAD = new BALOAD();
- public static final ArrayInstruction CALOAD = new CALOAD();
- public static final ArrayInstruction SALOAD = new SALOAD();
- public static final ArrayInstruction IASTORE = new IASTORE();
- public static final ArrayInstruction LASTORE = new LASTORE();
- public static final ArrayInstruction FASTORE = new FASTORE();
- public static final ArrayInstruction DASTORE = new DASTORE();
- public static final ArrayInstruction AASTORE = new AASTORE();
- public static final ArrayInstruction BASTORE = new BASTORE();
- public static final ArrayInstruction CASTORE = new CASTORE();
- public static final ArrayInstruction SASTORE = new SASTORE();
- public static final StackInstruction POP = new POP();
- public static final StackInstruction POP2 = new POP2();
- public static final StackInstruction DUP = new DUP();
- public static final StackInstruction DUP_X1 = new DUP_X1();
- public static final StackInstruction DUP_X2 = new DUP_X2();
- public static final StackInstruction DUP2 = new DUP2();
- public static final StackInstruction DUP2_X1 = new DUP2_X1();
- public static final StackInstruction DUP2_X2 = new DUP2_X2();
- public static final StackInstruction SWAP = new SWAP();
- public static final ArithmeticInstruction IADD = new IADD();
- public static final ArithmeticInstruction LADD = new LADD();
- public static final ArithmeticInstruction FADD = new FADD();
- public static final ArithmeticInstruction DADD = new DADD();
- public static final ArithmeticInstruction ISUB = new ISUB();
- public static final ArithmeticInstruction LSUB = new LSUB();
- public static final ArithmeticInstruction FSUB = new FSUB();
- public static final ArithmeticInstruction DSUB = new DSUB();
- public static final ArithmeticInstruction IMUL = new IMUL();
- public static final ArithmeticInstruction LMUL = new LMUL();
- public static final ArithmeticInstruction FMUL = new FMUL();
- public static final ArithmeticInstruction DMUL = new DMUL();
- public static final ArithmeticInstruction IDIV = new IDIV();
- public static final ArithmeticInstruction LDIV = new LDIV();
- public static final ArithmeticInstruction FDIV = new FDIV();
- public static final ArithmeticInstruction DDIV = new DDIV();
- public static final ArithmeticInstruction IREM = new IREM();
- public static final ArithmeticInstruction LREM = new LREM();
- public static final ArithmeticInstruction FREM = new FREM();
- public static final ArithmeticInstruction DREM = new DREM();
- public static final ArithmeticInstruction INEG = new INEG();
- public static final ArithmeticInstruction LNEG = new LNEG();
- public static final ArithmeticInstruction FNEG = new FNEG();
- public static final ArithmeticInstruction DNEG = new DNEG();
- public static final ArithmeticInstruction ISHL = new ISHL();
- public static final ArithmeticInstruction LSHL = new LSHL();
- public static final ArithmeticInstruction ISHR = new ISHR();
- public static final ArithmeticInstruction LSHR = new LSHR();
- public static final ArithmeticInstruction IUSHR = new IUSHR();
- public static final ArithmeticInstruction LUSHR = new LUSHR();
- public static final ArithmeticInstruction IAND = new IAND();
- public static final ArithmeticInstruction LAND = new LAND();
- public static final ArithmeticInstruction IOR = new IOR();
- public static final ArithmeticInstruction LOR = new LOR();
- public static final ArithmeticInstruction IXOR = new IXOR();
- public static final ArithmeticInstruction LXOR = new LXOR();
- public static final ConversionInstruction I2L = new I2L();
- public static final ConversionInstruction I2F = new I2F();
- public static final ConversionInstruction I2D = new I2D();
- public static final ConversionInstruction L2I = new L2I();
- public static final ConversionInstruction L2F = new L2F();
- public static final ConversionInstruction L2D = new L2D();
- public static final ConversionInstruction F2I = new F2I();
- public static final ConversionInstruction F2L = new F2L();
- public static final ConversionInstruction F2D = new F2D();
- public static final ConversionInstruction D2I = new D2I();
- public static final ConversionInstruction D2L = new D2L();
- public static final ConversionInstruction D2F = new D2F();
- public static final ConversionInstruction I2B = new I2B();
- public static final ConversionInstruction I2C = new I2C();
- public static final ConversionInstruction I2S = new I2S();
- public static final Instruction LCMP = new LCMP();
- public static final Instruction FCMPL = new FCMPL();
- public static final Instruction FCMPG = new FCMPG();
- public static final Instruction DCMPL = new DCMPL();
- public static final Instruction DCMPG = new DCMPG();
- public static final ReturnInstruction IRETURN = new IRETURN();
- public static final ReturnInstruction LRETURN = new LRETURN();
- public static final ReturnInstruction FRETURN = new FRETURN();
- public static final ReturnInstruction DRETURN = new DRETURN();
- public static final ReturnInstruction ARETURN = new ARETURN();
- public static final ReturnInstruction RETURN = new RETURN();
- public static final Instruction ARRAYLENGTH = new ARRAYLENGTH();
- public static final Instruction ATHROW = new ATHROW();
- public static final Instruction MONITORENTER = new MONITORENTER();
- public static final Instruction MONITOREXIT = new MONITOREXIT();
- /** You can use these constants in multiple places safely, if you can guarantee
- * that you will never alter their internal values, e.g. call setIndex().
- */
- public static final LocalVariableInstruction THIS = new ALOAD(0);
- public static final LocalVariableInstruction ALOAD_0 = THIS;
- public static final LocalVariableInstruction ALOAD_1 = new ALOAD(1);
- public static final LocalVariableInstruction ALOAD_2 = new ALOAD(2);
- public static final LocalVariableInstruction ILOAD_0 = new ILOAD(0);
- public static final LocalVariableInstruction ILOAD_1 = new ILOAD(1);
- public static final LocalVariableInstruction ILOAD_2 = new ILOAD(2);
- public static final LocalVariableInstruction ASTORE_0 = new ASTORE(0);
- public static final LocalVariableInstruction ASTORE_1 = new ASTORE(1);
- public static final LocalVariableInstruction ASTORE_2 = new ASTORE(2);
- public static final LocalVariableInstruction ISTORE_0 = new ISTORE(0);
- public static final LocalVariableInstruction ISTORE_1 = new ISTORE(1);
- public static final LocalVariableInstruction ISTORE_2 = new ISTORE(2);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/** Get object via its opcode, for immutable instructions like
* branch instructions entries are set to null.
*/
public static final Instruction[] INSTRUCTIONS = new Instruction[256];
- /** Interfaces may have no static initializers, so we simulate this
- * with an inner class.
- */
- static final Clinit bla = new Clinit();
-
- static class Clinit {
+
- Clinit() {
- INSTRUCTIONS[Constants.NOP] = NOP;
- INSTRUCTIONS[Constants.ACONST_NULL] = ACONST_NULL;
- INSTRUCTIONS[Constants.ICONST_M1] = ICONST_M1;
- INSTRUCTIONS[Constants.ICONST_0] = ICONST_0;
- INSTRUCTIONS[Constants.ICONST_1] = ICONST_1;
- INSTRUCTIONS[Constants.ICONST_2] = ICONST_2;
- INSTRUCTIONS[Constants.ICONST_3] = ICONST_3;
- INSTRUCTIONS[Constants.ICONST_4] = ICONST_4;
- INSTRUCTIONS[Constants.ICONST_5] = ICONST_5;
- INSTRUCTIONS[Constants.LCONST_0] = LCONST_0;
- INSTRUCTIONS[Constants.LCONST_1] = LCONST_1;
- INSTRUCTIONS[Constants.FCONST_0] = FCONST_0;
- INSTRUCTIONS[Constants.FCONST_1] = FCONST_1;
- INSTRUCTIONS[Constants.FCONST_2] = FCONST_2;
- INSTRUCTIONS[Constants.DCONST_0] = DCONST_0;
- INSTRUCTIONS[Constants.DCONST_1] = DCONST_1;
- INSTRUCTIONS[Constants.IALOAD] = IALOAD;
- INSTRUCTIONS[Constants.LALOAD] = LALOAD;
- INSTRUCTIONS[Constants.FALOAD] = FALOAD;
- INSTRUCTIONS[Constants.DALOAD] = DALOAD;
- INSTRUCTIONS[Constants.AALOAD] = AALOAD;
- INSTRUCTIONS[Constants.BALOAD] = BALOAD;
- INSTRUCTIONS[Constants.CALOAD] = CALOAD;
- INSTRUCTIONS[Constants.SALOAD] = SALOAD;
- INSTRUCTIONS[Constants.IASTORE] = IASTORE;
- INSTRUCTIONS[Constants.LASTORE] = LASTORE;
- INSTRUCTIONS[Constants.FASTORE] = FASTORE;
- INSTRUCTIONS[Constants.DASTORE] = DASTORE;
- INSTRUCTIONS[Constants.AASTORE] = AASTORE;
- INSTRUCTIONS[Constants.BASTORE] = BASTORE;
- INSTRUCTIONS[Constants.CASTORE] = CASTORE;
- INSTRUCTIONS[Constants.SASTORE] = SASTORE;
- INSTRUCTIONS[Constants.POP] = POP;
- INSTRUCTIONS[Constants.POP2] = POP2;
- INSTRUCTIONS[Constants.DUP] = DUP;
- INSTRUCTIONS[Constants.DUP_X1] = DUP_X1;
- INSTRUCTIONS[Constants.DUP_X2] = DUP_X2;
- INSTRUCTIONS[Constants.DUP2] = DUP2;
- INSTRUCTIONS[Constants.DUP2_X1] = DUP2_X1;
- INSTRUCTIONS[Constants.DUP2_X2] = DUP2_X2;
- INSTRUCTIONS[Constants.SWAP] = SWAP;
- INSTRUCTIONS[Constants.IADD] = IADD;
- INSTRUCTIONS[Constants.LADD] = LADD;
- INSTRUCTIONS[Constants.FADD] = FADD;
- INSTRUCTIONS[Constants.DADD] = DADD;
- INSTRUCTIONS[Constants.ISUB] = ISUB;
- INSTRUCTIONS[Constants.LSUB] = LSUB;
- INSTRUCTIONS[Constants.FSUB] = FSUB;
- INSTRUCTIONS[Constants.DSUB] = DSUB;
- INSTRUCTIONS[Constants.IMUL] = IMUL;
- INSTRUCTIONS[Constants.LMUL] = LMUL;
- INSTRUCTIONS[Constants.FMUL] = FMUL;
- INSTRUCTIONS[Constants.DMUL] = DMUL;
- INSTRUCTIONS[Constants.IDIV] = IDIV;
- INSTRUCTIONS[Constants.LDIV] = LDIV;
- INSTRUCTIONS[Constants.FDIV] = FDIV;
- INSTRUCTIONS[Constants.DDIV] = DDIV;
- INSTRUCTIONS[Constants.IREM] = IREM;
- INSTRUCTIONS[Constants.LREM] = LREM;
- INSTRUCTIONS[Constants.FREM] = FREM;
- INSTRUCTIONS[Constants.DREM] = DREM;
- INSTRUCTIONS[Constants.INEG] = INEG;
- INSTRUCTIONS[Constants.LNEG] = LNEG;
- INSTRUCTIONS[Constants.FNEG] = FNEG;
- INSTRUCTIONS[Constants.DNEG] = DNEG;
- INSTRUCTIONS[Constants.ISHL] = ISHL;
- INSTRUCTIONS[Constants.LSHL] = LSHL;
- INSTRUCTIONS[Constants.ISHR] = ISHR;
- INSTRUCTIONS[Constants.LSHR] = LSHR;
- INSTRUCTIONS[Constants.IUSHR] = IUSHR;
- INSTRUCTIONS[Constants.LUSHR] = LUSHR;
- INSTRUCTIONS[Constants.IAND] = IAND;
- INSTRUCTIONS[Constants.LAND] = LAND;
- INSTRUCTIONS[Constants.IOR] = IOR;
- INSTRUCTIONS[Constants.LOR] = LOR;
- INSTRUCTIONS[Constants.IXOR] = IXOR;
- INSTRUCTIONS[Constants.LXOR] = LXOR;
- INSTRUCTIONS[Constants.I2L] = I2L;
- INSTRUCTIONS[Constants.I2F] = I2F;
- INSTRUCTIONS[Constants.I2D] = I2D;
- INSTRUCTIONS[Constants.L2I] = L2I;
- INSTRUCTIONS[Constants.L2F] = L2F;
- INSTRUCTIONS[Constants.L2D] = L2D;
- INSTRUCTIONS[Constants.F2I] = F2I;
- INSTRUCTIONS[Constants.F2L] = F2L;
- INSTRUCTIONS[Constants.F2D] = F2D;
- INSTRUCTIONS[Constants.D2I] = D2I;
- INSTRUCTIONS[Constants.D2L] = D2L;
- INSTRUCTIONS[Constants.D2F] = D2F;
- INSTRUCTIONS[Constants.I2B] = I2B;
- INSTRUCTIONS[Constants.I2C] = I2C;
- INSTRUCTIONS[Constants.I2S] = I2S;
- INSTRUCTIONS[Constants.LCMP] = LCMP;
- INSTRUCTIONS[Constants.FCMPL] = FCMPL;
- INSTRUCTIONS[Constants.FCMPG] = FCMPG;
- INSTRUCTIONS[Constants.DCMPL] = DCMPL;
- INSTRUCTIONS[Constants.DCMPG] = DCMPG;
- INSTRUCTIONS[Constants.IRETURN] = IRETURN;
- INSTRUCTIONS[Constants.LRETURN] = LRETURN;
- INSTRUCTIONS[Constants.FRETURN] = FRETURN;
- INSTRUCTIONS[Constants.DRETURN] = DRETURN;
- INSTRUCTIONS[Constants.ARETURN] = ARETURN;
- INSTRUCTIONS[Constants.RETURN] = RETURN;
- INSTRUCTIONS[Constants.ARRAYLENGTH] = ARRAYLENGTH;
- INSTRUCTIONS[Constants.ATHROW] = ATHROW;
- INSTRUCTIONS[Constants.MONITORENTER] = MONITORENTER;
- INSTRUCTIONS[Constants.MONITOREXIT] = MONITOREXIT;
- }
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java Sat Dec 5 23:22:46 2009
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -83,16 +81,7 @@
}
- /**
- * Temporarily swap the current instruction, without disturbing
- * anything. Meant to be used by a debugger, implementing
- * breakpoints. Current instruction is returned.
- */
- public Instruction swapInstruction( Instruction i ) {
- Instruction oldInstruction = instruction;
- instruction = i;
- return oldInstruction;
- }
+
/*private*/protected InstructionHandle(Instruction i) {
@@ -157,27 +146,10 @@
}
- /**
- * Delete contents, i.e., remove user access and make handle reusable.
- */
- void dispose() {
- next = prev = null;
- instruction.dispose();
- instruction = null;
- i_position = -1;
- attributes = null;
- removeAllTargeters();
- addHandle();
- }
+
- /** Remove all targeters, if any.
- */
- public void removeAllTargeters() {
- if (targeters != null) {
- targeters.clear();
- }
- }
+
/**
@@ -202,22 +174,10 @@
}
- public boolean hasTargeters() {
- return (targeters != null) && (targeters.size() > 0);
- }
+
- /**
- * @return null, if there are no targeters
- */
- public InstructionTargeter[] getTargeters() {
- if (!hasTargeters()) {
- return new InstructionTargeter[0];
- }
- InstructionTargeter[] t = new InstructionTargeter[targeters.size()];
- targeters.toArray(t);
- return t;
- }
+
/** @return a (verbose) string representation of the contained instruction.
@@ -234,48 +194,14 @@
}
- /** Add an attribute to an instruction handle.
- *
- * @param key the key object to store/retrieve the attribute
- * @param attr the attribute to associate with this handle
- */
- public void addAttribute( Object key, Object attr ) {
- if (attributes == null) {
- attributes = new HashMap(3);
- }
- attributes.put(key, attr);
- }
+
- /** Delete an attribute of an instruction handle.
- *
- * @param key the key object to retrieve the attribute
- */
- public void removeAttribute( Object key ) {
- if (attributes != null) {
- attributes.remove(key);
- }
- }
+
- /** Get attribute of an instruction handle.
- *
- * @param key the key object to store/retrieve the attribute
- */
- public Object getAttribute( Object key ) {
- if (attributes != null) {
- return attributes.get(key);
- }
- return null;
- }
+
- /** @return all attributes associated with this handle
- */
- public Collection getAttributes() {
- if (attributes == null) {
- attributes = new HashMap(3);
- }
- return attributes.values();
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java Sat Dec 5 23:22:46 2009
@@ -16,20 +16,9 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.Constant;
-import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* This class is a container for a list of <a
@@ -64,33 +53,13 @@
}
- /**
- * Create instruction list containing one instruction.
- * @param i initial instruction
- */
- public InstructionList(Instruction i) {
- append(i);
- }
+
- /**
- * Create instruction list containing one instruction.
- * @param i initial instruction
- */
- public InstructionList(BranchInstruction i) {
- append(i);
- }
+
- /**
- * Initialize list with (nonnull) compound instruction. Consumes argument
- * list, i.e., it becomes empty.
- *
- * @param c compound instruction (list)
- */
- public InstructionList(CompoundInstruction c) {
- append(c.getInstructionList());
- }
+
/**
@@ -131,94 +100,10 @@
}
- /**
- * Get instruction handle for instruction at byte code position pos.
- * This only works properly, if the list is freshly initialized from a byte array or
- * setPositions() has been called before this method.
- *
- * @param pos byte code position to search for
- * @return target position's instruction handle if available
- */
- public InstructionHandle findHandle( int pos ) {
- int[] positions = byte_positions;
- InstructionHandle ih = start;
- for (int i = 0; i < length; i++) {
- if(positions[i] == pos) {
- return ih;
- }
- ih = ih.next;
- }
- return null;
- }
+
- /**
- * Initialize instruction list from byte array.
- *
- * @param code byte array containing the instructions
- */
- public InstructionList(byte[] code) {
- ByteSequence bytes = new ByteSequence(code);
- InstructionHandle[] ihs = new InstructionHandle[code.length];
- int[] pos = new int[code.length]; // Can't be more than that
- int count = 0; // Contains actual length
- /* Pass 1: Create an object for each byte code and append them
- * to the list.
- */
- try {
- while (bytes.available() > 0) {
- // Remember byte offset and associate it with the instruction
- int off = bytes.getIndex();
- pos[count] = off;
- /* Read one instruction from the byte stream, the byte position is set
- * accordingly.
- */
- Instruction i = Instruction.readInstruction(bytes);
- InstructionHandle ih;
- if (i instanceof BranchInstruction) {
- ih = append((BranchInstruction) i);
- } else {
- ih = append(i);
- }
- ih.setPosition(off);
- ihs[count] = ih;
- count++;
- }
- } catch (IOException e) {
- throw new ClassGenException(e.toString(), e);
- }
- byte_positions = new int[count]; // Trim to proper size
- System.arraycopy(pos, 0, byte_positions, 0, count);
- /* Pass 2: Look for BranchInstruction and update their targets, i.e.,
- * convert offsets to instruction handles.
- */
- for (int i = 0; i < count; i++) {
- if (ihs[i] instanceof BranchHandle) {
- BranchInstruction bi = (BranchInstruction) ihs[i].instruction;
- int target = bi.position + bi.getIndex(); /* Byte code position:
- * relative -> absolute. */
- // Search for target position
- InstructionHandle ih = findHandle(ihs, pos, count, target);
- if (ih == null) {
- throw new ClassGenException("Couldn't find target for branch: " + bi);
- }
- bi.setTarget(ih); // Update target
- // If it is a Select instruction, update all branch targets
- if (bi instanceof Select) { // Either LOOKUPSWITCH or TABLESWITCH
- Select s = (Select) bi;
- int[] indices = s.getIndices();
- for (int j = 0; j < indices.length; j++) {
- target = bi.position + indices[j];
- ih = findHandle(ihs, pos, count, target);
- if (ih == null) {
- throw new ClassGenException("Couldn't find target for switch: " + bi);
- }
- s.setTarget(j, ih); // Update target
- }
- }
- }
- }
- }
+
/**
@@ -251,47 +136,10 @@
}
- /**
- * Append another list after instruction i contained in this list.
- * Consumes argument list, i.e., it becomes empty.
- *
- * @param i where to append the instruction list
- * @param il Instruction list to append to this one
- * @return instruction handle pointing to the <B>first</B> appended instruction
- */
- public InstructionHandle append( Instruction i, InstructionList il ) {
- InstructionHandle ih;
- if ((ih = findInstruction2(i)) == null) {
- throw new ClassGenException("Instruction " + i + " is not contained in this list.");
- }
- return append(ih, il);
- }
+
- /**
- * Append another list to this one.
- * Consumes argument list, i.e., it becomes empty.
- *
- * @param il list to append to end of this list
- * @return instruction handle of the <B>first</B> appended instruction
- */
- public InstructionHandle append( InstructionList il ) {
- if (il == null) {
- throw new ClassGenException("Appending null InstructionList");
- }
- if (il.isEmpty()) {
- return null;
- }
- if (isEmpty()) {
- start = il.start;
- end = il.end;
- length = il.length;
- il.clear();
- return start;
- } else {
- return append(end, il); // was end.instruction
- }
- }
+
/**
@@ -339,455 +187,61 @@
}
- /**
- * Append a single instruction j after another instruction i, which
- * must be in this list of course!
- *
- * @param i Instruction in list
- * @param j Instruction to append after i in list
- * @return instruction handle of the first appended instruction
- */
- public InstructionHandle append( Instruction i, Instruction j ) {
- return append(i, new InstructionList(j));
- }
+
- /**
- * Append a compound instruction, after instruction i.
- *
- * @param i Instruction in list
- * @param c The composite instruction (containing an InstructionList)
- * @return instruction handle of the first appended instruction
- */
- public InstructionHandle append( Instruction i, CompoundInstruction c ) {
- return append(i, c.getInstructionList());
- }
+
- /**
- * Append a compound instruction.
- *
- * @param c The composite instruction (containing an InstructionList)
- * @return instruction handle of the first appended instruction
- */
- public InstructionHandle append( CompoundInstruction c ) {
- return append(c.getInstructionList());
- }
+
- /**
- * Append a compound instruction.
- *
- * @param ih where to append the instruction list
- * @param c The composite instruction (containing an InstructionList)
- * @return instruction handle of the first appended instruction
- */
- public InstructionHandle append( InstructionHandle ih, CompoundInstruction c ) {
- return append(ih, c.getInstructionList());
- }
+
- /**
- * Append an instruction after instruction (handle) ih contained in this list.
- *
- * @param ih where to append the instruction list
- * @param i Instruction to append
- * @return instruction handle pointing to the <B>first</B> appended instruction
- */
- public InstructionHandle append( InstructionHandle ih, Instruction i ) {
- return append(ih, new InstructionList(i));
- }
+
- /**
- * Append an instruction after instruction (handle) ih contained in this list.
- *
- * @param ih where to append the instruction list
- * @param i Instruction to append
- * @return instruction handle pointing to the <B>first</B> appended instruction
- */
- public BranchHandle append( InstructionHandle ih, BranchInstruction i ) {
- BranchHandle bh = BranchHandle.getBranchHandle(i);
- InstructionList il = new InstructionList();
- il.append(bh);
- append(ih, il);
- return bh;
- }
+
- /**
- * Insert another list before Instruction handle ih contained in this list.
- * Consumes argument list, i.e., it becomes empty.
- *
- * @param ih where to append the instruction list
- * @param il Instruction list to insert
- * @return instruction handle of the first inserted instruction
- */
- public InstructionHandle insert( InstructionHandle ih, InstructionList il ) {
- if (il == null) {
- throw new ClassGenException("Inserting null InstructionList");
- }
- if (il.isEmpty()) {
- return ih;
- }
- InstructionHandle prev = ih.prev, ret = il.start;
- ih.prev = il.end;
- il.end.next = ih;
- il.start.prev = prev;
- if (prev != null) {
- prev.next = il.start;
- } else {
- start = il.start; // Update start ...
- }
- length += il.length; // Update length
- il.clear();
- return ret;
- }
+
- /**
- * Insert another list.
- *
- * @param il list to insert before start of this list
- * @return instruction handle of the first inserted instruction
- */
- public InstructionHandle insert( InstructionList il ) {
- if (isEmpty()) {
- append(il); // Code is identical for this case
- return start;
- } else {
- return insert(start, il);
- }
- }
+
- /**
- * Insert an instruction at start of this list.
- *
- * @param ih instruction to insert
- */
- private void insert( InstructionHandle ih ) {
- if (isEmpty()) {
- start = end = ih;
- ih.next = ih.prev = null;
- } else {
- start.prev = ih;
- ih.next = start;
- ih.prev = null;
- start = ih;
- }
- length++;
- }
+
- /**
- * Insert another list before Instruction i contained in this list.
- * Consumes argument list, i.e., it becomes empty.
- *
- * @param i where to append the instruction list
- * @param il Instruction list to insert
- * @return instruction handle pointing to the first inserted instruction,
- * i.e., il.getStart()
- */
- public InstructionHandle insert( Instruction i, InstructionList il ) {
- InstructionHandle ih;
- if ((ih = findInstruction1(i)) == null) {
- throw new ClassGenException("Instruction " + i + " is not contained in this list.");
- }
- return insert(ih, il);
- }
+
- /**
- * Insert an instruction at start of this list.
- *
- * @param i instruction to insert
- * @return instruction handle of the inserted instruction
- */
- public InstructionHandle insert( Instruction i ) {
- InstructionHandle ih = InstructionHandle.getInstructionHandle(i);
- insert(ih);
- return ih;
- }
+
- /**
- * Insert a branch instruction at start of this list.
- *
- * @param i branch instruction to insert
- * @return branch instruction handle of the appended instruction
- */
- public BranchHandle insert( BranchInstruction i ) {
- BranchHandle ih = BranchHandle.getBranchHandle(i);
- insert(ih);
- return ih;
- }
+
- /**
- * Insert a single instruction j before another instruction i, which
- * must be in this list of course!
- *
- * @param i Instruction in list
- * @param j Instruction to insert before i in list
- * @return instruction handle of the first inserted instruction
- */
- public InstructionHandle insert( Instruction i, Instruction j ) {
- return insert(i, new InstructionList(j));
- }
+
- /**
- * Insert a compound instruction before instruction i.
- *
- * @param i Instruction in list
- * @param c The composite instruction (containing an InstructionList)
- * @return instruction handle of the first inserted instruction
- */
- public InstructionHandle insert( Instruction i, CompoundInstruction c ) {
- return insert(i, c.getInstructionList());
- }
+
- /**
- * Insert a compound instruction.
- *
- * @param c The composite instruction (containing an InstructionList)
- * @return instruction handle of the first inserted instruction
- */
- public InstructionHandle insert( CompoundInstruction c ) {
- return insert(c.getInstructionList());
- }
+
- /**
- * Insert an instruction before instruction (handle) ih contained in this list.
- *
- * @param ih where to insert to the instruction list
- * @param i Instruction to insert
- * @return instruction handle of the first inserted instruction
- */
- public InstructionHandle insert( InstructionHandle ih, Instruction i ) {
- return insert(ih, new InstructionList(i));
- }
+
- /**
- * Insert a compound instruction.
- *
- * @param ih where to insert the instruction list
- * @param c The composite instruction (containing an InstructionList)
- * @return instruction handle of the first inserted instruction
- */
- public InstructionHandle insert( InstructionHandle ih, CompoundInstruction c ) {
- return insert(ih, c.getInstructionList());
- }
+
- /**
- * Insert an instruction before instruction (handle) ih contained in this list.
- *
- * @param ih where to insert to the instruction list
- * @param i Instruction to insert
- * @return instruction handle of the first inserted instruction
- */
- public BranchHandle insert( InstructionHandle ih, BranchInstruction i ) {
- BranchHandle bh = BranchHandle.getBranchHandle(i);
- InstructionList il = new InstructionList();
- il.append(bh);
- insert(ih, il);
- return bh;
- }
+
- /**
- * Take all instructions (handles) from "start" to "end" and append them after the
- * new location "target". Of course, "end" must be after "start" and target must
- * not be located withing this range. If you want to move something to the start of
- * the list use null as value for target.<br>
- * Any instruction targeters pointing to handles within the block, keep their targets.
- *
- * @param start of moved block
- * @param end of moved block
- * @param target of moved block
- */
- public void move( InstructionHandle start, InstructionHandle end, InstructionHandle target ) {
- // Step 1: Check constraints
- if ((start == null) || (end == null)) {
- throw new ClassGenException("Invalid null handle: From " + start + " to " + end);
- }
- if ((target == start) || (target == end)) {
- throw new ClassGenException("Invalid range: From " + start + " to " + end
- + " contains target " + target);
- }
- for (InstructionHandle ih = start; ih != end.next; ih = ih.next) {
- if (ih == null) {
- throw new ClassGenException("Invalid range: From " + start + " to " + end);
- } else if (ih == target) {
- throw new ClassGenException("Invalid range: From " + start + " to " + end
- + " contains target " + target);
- }
- }
- // Step 2: Temporarily remove the given instructions from the list
- InstructionHandle prev = start.prev, next = end.next;
- if (prev != null) {
- prev.next = next;
- } else {
- this.start = next;
- }
- if (next != null) {
- next.prev = prev;
- } else {
- this.end = prev;
- }
- start.prev = end.next = null;
- // Step 3: append after target
- if (target == null) { // append to start of list
- if (this.start != null) {
- this.start.prev = end;
- }
- end.next = this.start;
- this.start = start;
- } else {
- next = target.next;
- target.next = start;
- start.prev = target;
- end.next = next;
- if (next != null) {
- next.prev = end;
- } else {
- this.end = end;
- }
- }
- }
-
-
- /**
- * Move a single instruction (handle) to a new location.
- *
- * @param ih moved instruction
- * @param target new location of moved instruction
- */
- public void move( InstructionHandle ih, InstructionHandle target ) {
- move(ih, ih, target);
- }
-
-
- /**
- * Remove from instruction `prev' to instruction `next' both contained
- * in this list. Throws TargetLostException when one of the removed instruction handles
- * is still being targeted.
- *
- * @param prev where to start deleting (predecessor, exclusive)
- * @param next where to end deleting (successor, exclusive)
- */
- private void remove( InstructionHandle prev, InstructionHandle next )
- throws TargetLostException {
- InstructionHandle first, last; // First and last deleted instruction
- if ((prev == null) && (next == null)) {
- first = start;
- last = end;
- start = end = null;
- } else {
- if (prev == null) { // At start of list
- first = start;
- start = next;
- } else {
- first = prev.next;
- prev.next = next;
- }
- if (next == null) { // At end of list
- last = end;
- end = prev;
- } else {
- last = next.prev;
- next.prev = prev;
- }
- }
- first.prev = null; // Completely separated from rest of list
- last.next = null;
- List target_vec = new ArrayList();
- for (InstructionHandle ih = first; ih != null; ih = ih.next) {
- ih.getInstruction().dispose(); // e.g. BranchInstructions release their targets
- }
- StringBuffer buf = new StringBuffer("{ ");
- for (InstructionHandle ih = first; ih != null; ih = next) {
- next = ih.next;
- length--;
- if (ih.hasTargeters()) { // Still got targeters?
- target_vec.add(ih);
- buf.append(ih.toString(true) + " ");
- ih.next = ih.prev = null;
- } else {
- ih.dispose();
- }
- }
- buf.append("}");
- if (!target_vec.isEmpty()) {
- InstructionHandle[] targeted = new InstructionHandle[target_vec.size()];
- target_vec.toArray(targeted);
- throw new TargetLostException(targeted, buf.toString());
- }
- }
-
-
- /**
- * Remove instruction from this list. The corresponding Instruction
- * handles must not be reused!
- *
- * @param ih instruction (handle) to remove
- */
- public void delete( InstructionHandle ih ) throws TargetLostException {
- remove(ih.prev, ih.next);
- }
-
-
- /**
- * Remove instruction from this list. The corresponding Instruction
- * handles must not be reused!
- *
- * @param i instruction to remove
- */
- public void delete( Instruction i ) throws TargetLostException {
- InstructionHandle ih;
- if ((ih = findInstruction1(i)) == null) {
- throw new ClassGenException("Instruction " + i + " is not contained in this list.");
- }
- delete(ih);
- }
-
-
- /**
- * Remove instructions from instruction `from' to instruction `to' contained
- * in this list. The user must ensure that `from' is an instruction before
- * `to', or risk havoc. The corresponding Instruction handles must not be reused!
- *
- * @param from where to start deleting (inclusive)
- * @param to where to end deleting (inclusive)
- */
- public void delete( InstructionHandle from, InstructionHandle to ) throws TargetLostException {
- remove(from.prev, to.next);
- }
-
-
- /**
- * Remove instructions from instruction `from' to instruction `to' contained
- * in this list. The user must ensure that `from' is an instruction before
- * `to', or risk havoc. The corresponding Instruction handles must not be reused!
- *
- * @param from where to start deleting (inclusive)
- * @param to where to end deleting (inclusive)
- */
- public void delete( Instruction from, Instruction to ) throws TargetLostException {
- InstructionHandle from_ih, to_ih;
- if ((from_ih = findInstruction1(from)) == null) {
- throw new ClassGenException("Instruction " + from + " is not contained in this list.");
- }
- if ((to_ih = findInstruction2(to)) == null) {
- throw new ClassGenException("Instruction " + to + " is not contained in this list.");
- }
- delete(from_ih, to_ih);
- }
+
/**
@@ -806,35 +260,6 @@
}
- /**
- * Search for given Instruction reference, start at end of list
- *
- * @param i instruction to search for
- * @return instruction found on success, null otherwise
- */
- private InstructionHandle findInstruction2( Instruction i ) {
- for (InstructionHandle ih = end; ih != null; ih = ih.prev) {
- if (ih.instruction == i) {
- return ih;
- }
- }
- return null;
- }
-
-
- public boolean contains( InstructionHandle i ) {
- if (i == null) {
- return false;
- }
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- if (ih == i) {
- return true;
- }
- }
- return false;
- }
-
-
public boolean contains( Instruction i ) {
return findInstruction1(i) != null;
}
@@ -933,45 +358,10 @@
}
- /**
- * When everything is finished, use this method to convert the instruction
- * list into an array of bytes.
- *
- * @return the byte code ready to be dumped
- */
- public byte[] getByteCode() {
- // Update position indices of instructions
- setPositions();
- ByteArrayOutputStream b = new ByteArrayOutputStream();
- DataOutputStream out = new DataOutputStream(b);
- try {
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- Instruction i = ih.instruction;
- i.dump(out); // Traverse list
- }
- } catch (IOException e) {
- System.err.println(e);
- return new byte[0];
- }
- return b.toByteArray();
- }
+
- /**
- * @return an array of instructions without target information for branch instructions.
- */
- public Instruction[] getInstructions() {
- ByteSequence bytes = new ByteSequence(getByteCode());
- List instructions = new ArrayList();
- try {
- while (bytes.available() > 0) {
- instructions.add(Instruction.readInstruction(bytes));
- }
- } catch (IOException e) {
- throw new ClassGenException(e.toString(), e);
- }
- return (Instruction[]) instructions.toArray(new Instruction[instructions.size()]);
- }
+
public String toString() {
@@ -992,122 +382,19 @@
}
- /**
- * @return Enumeration that lists all instructions (handles)
- */
- public Iterator iterator() {
- return new Iterator() {
+
- private InstructionHandle ih = start;
+
- public Object next() throws NoSuchElementException {
- if (ih == null)
- throw new NoSuchElementException();
- InstructionHandle i = ih;
- ih = ih.next;
- return i;
- }
-
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
-
- public boolean hasNext() {
- return ih != null;
- }
- };
- }
-
-
- /**
- * @return array containing all instructions (handles)
- */
- public InstructionHandle[] getInstructionHandles() {
- InstructionHandle[] ihs = new InstructionHandle[length];
- InstructionHandle ih = start;
- for (int i = 0; i < length; i++) {
- ihs[i] = ih;
- ih = ih.next;
- }
- return ihs;
- }
-
- /**
- * Get positions (offsets) of all instructions in the list. This relies on that
- * the list has been freshly created from an byte code array, or that setPositions()
- * has been called. Otherwise this may be inaccurate.
- *
- * @return array containing all instruction's offset in byte code
- */
- public int[] getInstructionPositions() {
- return byte_positions;
- }
+
- /**
- * @return complete, i.e., deep copy of this list
- */
- public InstructionList copy() {
- Map map = new HashMap();
- InstructionList il = new InstructionList();
- /* Pass 1: Make copies of all instructions, append them to the new list
- * and associate old instruction references with the new ones, i.e.,
- * a 1:1 mapping.
- */
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- Instruction i = ih.instruction;
- Instruction c = i.copy(); // Use clone for shallow copy
- if (c instanceof BranchInstruction) {
- map.put(ih, il.append((BranchInstruction) c));
- } else {
- map.put(ih, il.append(c));
- }
- }
- /* Pass 2: Update branch targets.
- */
- InstructionHandle ih = start;
- InstructionHandle ch = il.start;
- while (ih != null) {
- Instruction i = ih.instruction;
- Instruction c = ch.instruction;
- if (i instanceof BranchInstruction) {
- BranchInstruction bi = (BranchInstruction) i;
- BranchInstruction bc = (BranchInstruction) c;
- InstructionHandle itarget = bi.getTarget(); // old target
- // New target is in hash map
- bc.setTarget((InstructionHandle) map.get(itarget));
- if (bi instanceof Select) { // Either LOOKUPSWITCH or TABLESWITCH
- InstructionHandle[] itargets = ((Select) bi).getTargets();
- InstructionHandle[] ctargets = ((Select) bc).getTargets();
- for (int j = 0; j < itargets.length; j++) { // Update all targets
- ctargets[j] = (InstructionHandle) map.get(itargets[j]);
- }
- }
- }
- ih = ih.next;
- ch = ch.next;
- }
- return il;
- }
+
- /** Replace all references to the old constant pool with references to the new
- * constant pool
- */
- public void replaceConstantPool( ConstantPoolGen old_cp, ConstantPoolGen new_cp ) {
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- Instruction i = ih.instruction;
- if (i instanceof CPInstruction) {
- CPInstruction ci = (CPInstruction) i;
- Constant c = old_cp.getConstant(ci.getIndex());
- ci.setIndex(new_cp.addConstant(c, old_cp));
- }
- }
- }
+
private void clear() {
@@ -1116,22 +403,7 @@
}
- /**
- * Delete contents of list. Provides besser memory utilization,
- * because the system then may reuse the instruction handles. This
- * method is typically called right after
- * <href="MethodGen.html#getMethod()">MethodGen.getMethod()</a>.
- */
- public void dispose() {
- // Traverse in reverse order, because ih.next is overwritten
- for (InstructionHandle ih = end; ih != null; ih = ih.prev) {
- /* Causes BranchInstructions to release target and targeters, because it
- * calls dispose() on the contained instruction.
- */
- ih.dispose();
- }
- clear();
- }
+
/**
@@ -1150,128 +422,28 @@
}
- /**
- * @return length of list (Number of instructions, not bytes)
- */
- public int getLength() {
- return length;
- }
+
- /**
- * @return length of list (Number of instructions, not bytes)
- */
- public int size() {
- return length;
- }
+
- /**
- * Redirect all references from old_target to new_target, i.e., update targets
- * of branch instructions.
- *
- * @param old_target the old target instruction handle
- * @param new_target the new target instruction handle
- */
- public void redirectBranches( InstructionHandle old_target, InstructionHandle new_target ) {
- for (InstructionHandle ih = start; ih != null; ih = ih.next) {
- Instruction i = ih.getInstruction();
- if (i instanceof BranchInstruction) {
- BranchInstruction b = (BranchInstruction) i;
- InstructionHandle target = b.getTarget();
- if (target == old_target) {
- b.setTarget(new_target);
- }
- if (b instanceof Select) { // Either LOOKUPSWITCH or TABLESWITCH
- InstructionHandle[] targets = ((Select) b).getTargets();
- for (int j = 0; j < targets.length; j++) {
- if (targets[j] == old_target) {
- ((Select) b).setTarget(j, new_target);
- }
- }
- }
- }
- }
- }
+
- /**
- * Redirect all references of local variables from old_target to new_target.
- *
- * @param lg array of local variables
- * @param old_target the old target instruction handle
- * @param new_target the new target instruction handle
- * @see MethodGen
- */
- public void redirectLocalVariables( LocalVariableGen[] lg, InstructionHandle old_target,
- InstructionHandle new_target ) {
- for (int i = 0; i < lg.length; i++) {
- InstructionHandle start = lg[i].getStart();
- InstructionHandle end = lg[i].getEnd();
- if (start == old_target) {
- lg[i].setStart(new_target);
- }
- if (end == old_target) {
- lg[i].setEnd(new_target);
- }
- }
- }
+
- /**
- * Redirect all references of exception handlers from old_target to new_target.
- *
- * @param exceptions array of exception handlers
- * @param old_target the old target instruction handle
- * @param new_target the new target instruction handle
- * @see MethodGen
- */
- public void redirectExceptionHandlers( CodeExceptionGen[] exceptions,
- InstructionHandle old_target, InstructionHandle new_target ) {
- for (int i = 0; i < exceptions.length; i++) {
- if (exceptions[i].getStartPC() == old_target) {
- exceptions[i].setStartPC(new_target);
- }
- if (exceptions[i].getEndPC() == old_target) {
- exceptions[i].setEndPC(new_target);
- }
- if (exceptions[i].getHandlerPC() == old_target) {
- exceptions[i].setHandlerPC(new_target);
- }
- }
- }
+
private List observers;
- /** Add observer for this object.
- */
- public void addObserver( InstructionListObserver o ) {
- if (observers == null) {
- observers = new ArrayList();
- }
- observers.add(o);
- }
+
- /** Remove observer for this object.
- */
- public void removeObserver( InstructionListObserver o ) {
- if (observers != null) {
- observers.remove(o);
- }
- }
+
- /** Call notify() method on all observers. This method is not called
- * automatically whenever the state has changed, but has to be
- * called by the user after he has finished editing the object.
- */
- public void update() {
- if (observers != null) {
- for (Iterator e = observers.iterator(); e.hasNext();) {
- ((InstructionListObserver) e.next()).notify(this);
- }
- }
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java Sat Dec 5 23:22:46 2009
@@ -28,8 +28,8 @@
*/
public interface InstructionTargeter {
- public boolean containsTarget( InstructionHandle ih );
+
- public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java Sat Dec 5 23:22:46 2009
@@ -38,12 +38,7 @@
}
- /**
- * @param index to constant pool
- */
- protected InvokeInstruction(short opcode, int index) {
- super(opcode, index);
- }
+
/**
@@ -94,11 +89,7 @@
}
- /** @return name of referenced method.
- */
- public String getMethodName( ConstantPoolGen cpg ) {
- return getName(cpg);
- }
+
/** @return return type of referenced method.
@@ -108,9 +99,5 @@
}
- /** @return argument types of referenced method.
- */
- public Type[] getArgumentTypes( ConstantPoolGen cpg ) {
- return Type.getArgumentTypes(getSignature(cpg));
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java Sat Dec 5 23:22:46 2009
@@ -35,9 +35,7 @@
}
- public JSR(InstructionHandle target) {
- super(org.apache.tomcat.util.bcel.Constants.JSR, target);
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java Sat Dec 5 23:22:46 2009
@@ -36,10 +36,7 @@
}
- public JSR_W(InstructionHandle target) {
- super(org.apache.tomcat.util.bcel.Constants.JSR_W, target);
- length = 5;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java Sat Dec 5 23:22:46 2009
@@ -25,9 +25,7 @@
public abstract class JsrInstruction extends BranchInstruction implements UnconditionalBranch,
TypedInstruction, StackProducer {
- JsrInstruction(short opcode, InstructionHandle target) {
- super(opcode, target);
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java Sat Dec 5 23:22:46 2009
@@ -39,10 +39,7 @@
}
- public LDC(int index) {
- super(org.apache.tomcat.util.bcel.Constants.LDC_W, index);
- setSize();
- }
+
// Adjust to proper size
@@ -89,23 +86,7 @@
}
- public Object getValue( ConstantPoolGen cpg ) {
- org.apache.tomcat.util.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index);
- switch (c.getTag()) {
- case org.apache.tomcat.util.bcel.Constants.CONSTANT_String:
- int i = ((org.apache.tomcat.util.bcel.classfile.ConstantString) c).getStringIndex();
- c = cpg.getConstantPool().getConstant(i);
- return ((org.apache.tomcat.util.bcel.classfile.ConstantUtf8) c).getBytes();
- case org.apache.tomcat.util.bcel.Constants.CONSTANT_Float:
- return new Float(((org.apache.tomcat.util.bcel.classfile.ConstantFloat) c).getBytes());
- case org.apache.tomcat.util.bcel.Constants.CONSTANT_Integer:
- return new Integer(((org.apache.tomcat.util.bcel.classfile.ConstantInteger) c).getBytes());
- case org.apache.tomcat.util.bcel.Constants.CONSTANT_Class:
- return c;
- default: // Never reached
- throw new RuntimeException("Unknown or invalid constant type at " + index);
- }
- }
+
public Type getType( ConstantPoolGen cpg ) {
@@ -124,7 +105,5 @@
}
- public Class[] getExceptions() {
- return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_STRING_RESOLUTION;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java Sat Dec 5 23:22:46 2009
@@ -34,9 +34,7 @@
}
- public LDC2_W(int index) {
- super(org.apache.tomcat.util.bcel.Constants.LDC2_W, index);
- }
+
public Type getType( ConstantPoolGen cpg ) {
@@ -51,15 +49,5 @@
}
- public Number getValue( ConstantPoolGen cpg ) {
- org.apache.tomcat.util.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index);
- switch (c.getTag()) {
- case org.apache.tomcat.util.bcel.Constants.CONSTANT_Long:
- return new Long(((org.apache.tomcat.util.bcel.classfile.ConstantLong) c).getBytes());
- case org.apache.tomcat.util.bcel.Constants.CONSTANT_Double:
- return new Double(((org.apache.tomcat.util.bcel.classfile.ConstantDouble) c).getBytes());
- default: // Never reached
- throw new RuntimeException("Unknown or invalid constant type at " + index);
- }
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java Sat Dec 5 23:22:46 2009
@@ -37,9 +37,7 @@
}
- public LDC_W(int index) {
- super(index);
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java Sat Dec 5 23:22:46 2009
@@ -37,12 +37,7 @@
}
- public LOOKUPSWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
- super(org.apache.tomcat.util.bcel.Constants.LOOKUPSWITCH, match, targets, defaultTarget);
- length = (short) (9 + match_length * 8); /* alignment remainder assumed
- * 0 here, until dump time. */
- fixed_length = length;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java Sat Dec 5 23:22:46 2009
@@ -44,25 +44,10 @@
}
- /**
- * @return true, if ih is target of this line number
- */
- public boolean containsTarget( InstructionHandle ih ) {
- return this.ih == ih;
- }
+
- /**
- * @param old_ih old target
- * @param new_ih new target
- */
- public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
- if (old_ih != ih) {
- throw new ClassGenException("Not targeting " + old_ih + ", but " + ih + "}");
- } else {
- setInstruction(new_ih);
- }
- }
+
/**
@@ -92,9 +77,7 @@
}
- public InstructionHandle getInstruction() {
- return ih;
- }
+
public void setSourceLine( int src_line ) {
@@ -102,7 +85,5 @@
}
- public int getSourceLine() {
- return src_line;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java Sat Dec 5 23:22:46 2009
@@ -25,26 +25,8 @@
*/
public interface LoadClass {
- /**
- * Returns the ObjectType of the referenced class or interface
- * that may be loaded and resolved.
- * @return object type that may be loaded or null if a primitive is
- * referenced
- */
- public ObjectType getLoadClassType( ConstantPoolGen cpg );
+
- /**
- * Returns the type associated with this instruction.
- * LoadClass instances are always typed, but this type
- * does not always refer to the type of the class or interface
- * that it possibly forces to load. For example, GETFIELD would
- * return the type of the field and not the type of the class
- * where the field is defined.
- * If no class is forced to be loaded, <B>null</B> is returned.
- * An example for this is an ANEWARRAY instruction that creates
- * an int[][].
- * @see #getLoadClassType(ConstantPoolGen)
- */
- public Type getType( ConstantPoolGen cpg );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java Sat Dec 5 23:22:46 2009
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.LocalVariable;
/**
@@ -39,27 +38,7 @@
private InstructionHandle start, end;
- /**
- * Generate a local variable that with index `index'. Note that double and long
- * variables need two indexs. Index indices have to be provided by the user.
- *
- * @param index index of local variable
- * @param name its name
- * @param type its type
- * @param start from where the instruction is valid (null means from the start)
- * @param end until where the instruction is valid (null means to the end)
- */
- public LocalVariableGen(int index, String name, Type type, InstructionHandle start,
- InstructionHandle end) {
- if ((index < 0) || (index > Constants.MAX_SHORT)) {
- throw new ClassGenException("Invalid index index: " + index);
- }
- this.name = name;
- this.type = type;
- this.index = index;
- setStart(start);
- setEnd(end);
- }
+
/**
@@ -89,9 +68,7 @@
}
- public void setIndex( int index ) {
- this.index = index;
- }
+
public int getIndex() {
@@ -114,9 +91,7 @@
}
- public Type getType() {
- return type;
- }
+
public InstructionHandle getStart() {
@@ -141,33 +116,10 @@
}
- /**
- * @param old_ih old target, either start or end
- * @param new_ih new target
- */
- public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
- boolean targeted = false;
- if (start == old_ih) {
- targeted = true;
- setStart(new_ih);
- }
- if (end == old_ih) {
- targeted = true;
- setEnd(new_ih);
- }
- if (!targeted) {
- throw new ClassGenException("Not targeting " + old_ih + ", but {" + start + ", " + end
- + "}");
- }
- }
+
- /**
- * @return true, if ih is target of this variable
- */
- public boolean containsTarget( InstructionHandle ih ) {
- return (start == ih) || (end == ih);
- }
+
/** @return a hash code value for the object.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java Sat Dec 5 23:22:46 2009
@@ -163,11 +163,7 @@
}
- /** @return canonical tag for instruction, e.g., ALOAD for ALOAD_0
- */
- public short getCanonicalTag() {
- return canon_tag;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java Sat Dec 5 23:22:46 2009
@@ -18,7 +18,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
import org.apache.tomcat.util.bcel.classfile.ConstantPool;
import org.apache.tomcat.util.bcel.util.ByteSequence;
@@ -43,14 +42,7 @@
}
- public MULTIANEWARRAY(int index, short dimensions) {
- super(org.apache.tomcat.util.bcel.Constants.MULTIANEWARRAY, index);
- if (dimensions < 1) {
- throw new ClassGenException("Invalid dimensions value: " + dimensions);
- }
- this.dimensions = dimensions;
- length = 4;
- }
+
/**
@@ -74,12 +66,7 @@
}
- /**
- * @return number of dimensions to be created
- */
- public final short getDimensions() {
- return dimensions;
- }
+
/**
@@ -108,21 +95,8 @@
}
- public Class[] getExceptions() {
- Class[] cs = new Class[2 + ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length + 1] = ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION;
- cs[ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length] = ExceptionConstants.ILLEGAL_ACCESS_ERROR;
- return cs;
- }
+
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
- Type t = getType(cpg);
- if (t instanceof ArrayType) {
- t = ((ArrayType) t).getBasicType();
- }
- return (t instanceof ObjectType) ? (ObjectType) t : null;
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -16,28 +16,12 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayReader;
-import java.io.CharArrayWriter;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.FilterReader;
import java.io.FilterWriter;
import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.generic.AnnotationEntryGen;
-import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
@@ -168,10 +152,7 @@
}
- public static final String codeToString( byte[] code, ConstantPool constant_pool, int index,
- int length ) {
- return codeToString(code, constant_pool, index, length, true);
- }
+
/**
@@ -427,10 +408,7 @@
}
- public static final String codeToString( ByteSequence bytes, ConstantPool constant_pool )
- throws IOException {
- return codeToString(bytes, constant_pool, true);
- }
+
/**
@@ -484,145 +462,34 @@
}
- /**
- * @return `flag' with bit `i' set to 1
- */
- public static final int setBit( int flag, int i ) {
- return flag | pow2(i);
- }
+
- /**
- * @return `flag' with bit `i' set to 0
- */
- public static final int clearBit( int flag, int i ) {
- int bit = pow2(i);
- return (flag & bit) == 0 ? flag : flag ^ bit;
- }
+
- /**
- * @return true, if bit `i' in `flag' is set
- */
- public static final boolean isSet( int flag, int i ) {
- return (flag & pow2(i)) != 0;
- }
+
- /**
- * Converts string containing the method return and argument types
- * to a byte code method signature.
- *
- * @param ret Return type of method
- * @param argv Types of method arguments
- * @return Byte code representation of method signature
- */
- public final static String methodTypeToSignature( String ret, String[] argv )
- throws ClassFormatException {
- StringBuffer buf = new StringBuffer("(");
- String str;
- if (argv != null) {
- for (int i = 0; i < argv.length; i++) {
- str = getSignature(argv[i]);
- if (str.endsWith("V")) {
- throw new ClassFormatException("Invalid type: " + argv[i]);
- }
- buf.append(str);
- }
- }
- str = getSignature(ret);
- buf.append(")").append(str);
- return buf.toString();
- }
+
- /**
- * @param signature Method signature
- * @return Array of argument types
- * @throws ClassFormatException
- */
- public static final String[] methodSignatureArgumentTypes( String signature )
- throws ClassFormatException {
- return methodSignatureArgumentTypes(signature, true);
- }
+
- /**
- * @param signature Method signature
- * @param chopit Shorten class names ?
- * @return Array of argument types
- * @throws ClassFormatException
- */
- public static final String[] methodSignatureArgumentTypes( String signature, boolean chopit )
- throws ClassFormatException {
- List vec = new ArrayList();
- int index;
- try { // Read all declarations between for `(' and `)'
- if (signature.charAt(0) != '(') {
- throw new ClassFormatException("Invalid method signature: " + signature);
- }
- index = 1; // current string position
- while (signature.charAt(index) != ')') {
- vec.add(signatureToString(signature.substring(index), chopit));
- //corrected concurrent private static field acess
- index += unwrap(consumed_chars); // update position
- }
- } catch (StringIndexOutOfBoundsException e) { // Should never occur
- throw new ClassFormatException("Invalid method signature: " + signature, e);
- }
- return (String[]) vec.toArray(new String[vec.size()]);
- }
+
- /**
- * @param signature Method signature
- * @return return type of method
- * @throws ClassFormatException
- */
- public static final String methodSignatureReturnType( String signature )
- throws ClassFormatException {
- return methodSignatureReturnType(signature, true);
- }
+
- /**
- * @param signature Method signature
- * @param chopit Shorten class names ?
- * @return return type of method
- * @throws ClassFormatException
- */
- public static final String methodSignatureReturnType( String signature, boolean chopit )
- throws ClassFormatException {
- int index;
- String type;
- try {
- // Read return type after `)'
- index = signature.lastIndexOf(')') + 1;
- type = signatureToString(signature.substring(index), chopit);
- } catch (StringIndexOutOfBoundsException e) { // Should never occur
- throw new ClassFormatException("Invalid method signature: " + signature, e);
- }
- return type;
- }
+
- /**
- * Converts method signature to string with all class names compacted.
- *
- * @param signature to convert
- * @param name of method
- * @param access flags of method
- * @return Human readable signature
- */
- public static final String methodSignatureToString( String signature, String name, String access ) {
- return methodSignatureToString(signature, name, access, true);
- }
+
- public static final String methodSignatureToString( String signature, String name,
- String access, boolean chopit ) {
- return methodSignatureToString(signature, name, access, chopit, null);
- }
+
/**
@@ -839,113 +706,7 @@
}
- /** Parse Java type such as "char", or "java.lang.String[]" and return the
- * signature in byte code format, e.g. "C" or "[Ljava/lang/String;" respectively.
- *
- * @param type Java type
- * @return byte code signature
- */
- public static String getSignature( String type ) {
- StringBuffer buf = new StringBuffer();
- char[] chars = type.toCharArray();
- boolean char_found = false, delim = false;
- int index = -1;
- loop: for (int i = 0; i < chars.length; i++) {
- switch (chars[i]) {
- case ' ':
- case '\t':
- case '\n':
- case '\r':
- case '\f':
- if (char_found) {
- delim = true;
- }
- break;
- case '[':
- if (!char_found) {
- throw new RuntimeException("Illegal type: " + type);
- }
- index = i;
- break loop;
- default:
- char_found = true;
- if (!delim) {
- buf.append(chars[i]);
- }
- }
- }
- int brackets = 0;
- if (index > 0) {
- brackets = countBrackets(type.substring(index));
- }
- type = buf.toString();
- buf.setLength(0);
- for (int i = 0; i < brackets; i++) {
- buf.append('[');
- }
- boolean found = false;
- for (int i = Constants.T_BOOLEAN; (i <= Constants.T_VOID) && !found; i++) {
- if (Constants.TYPE_NAMES[i].equals(type)) {
- found = true;
- buf.append(Constants.SHORT_TYPE_NAMES[i]);
- }
- }
- if (!found) {
- buf.append('L').append(type.replace('.', '/')).append(';');
- }
- return buf.toString();
- }
-
-
- private static int countBrackets( String brackets ) {
- char[] chars = brackets.toCharArray();
- int count = 0;
- boolean open = false;
- for (int i = 0; i < chars.length; i++) {
- switch (chars[i]) {
- case '[':
- if (open) {
- throw new RuntimeException("Illegally nested brackets:" + brackets);
- }
- open = true;
- break;
- case ']':
- if (!open) {
- throw new RuntimeException("Illegally nested brackets:" + brackets);
- }
- open = false;
- count++;
- break;
- default:
- // Don't care
- }
- }
- if (open) {
- throw new RuntimeException("Illegally nested brackets:" + brackets);
- }
- return count;
- }
-
-
- /**
- * Return type of method signature as a byte value as defined in <em>Constants</em>
- *
- * @param signature in format described above
- * @return type of method signature
- * @see Constants
- */
- public static final byte typeOfMethodSignature( String signature ) throws ClassFormatException {
- int index;
- try {
- if (signature.charAt(0) != '(') {
- throw new ClassFormatException("Invalid method signature: " + signature);
- }
- index = signature.lastIndexOf(')') + 1;
- return typeOfSignature(signature.substring(index));
- } catch (StringIndexOutOfBoundsException e) {
- throw new ClassFormatException("Invalid method signature: " + signature, e);
- }
- }
+
/**
@@ -989,17 +750,7 @@
}
- /** Map opcode names to opcode numbers. E.g., return Constants.ALOAD for "aload"
- */
- public static short searchOpcode( String name ) {
- name = name.toLowerCase(Locale.ENGLISH);
- for (short i = 0; i < Constants.OPCODE_NAMES.length; i++) {
- if (Constants.OPCODE_NAMES[i].equals(name)) {
- return i;
- }
- }
- return -1;
- }
+
/**
@@ -1069,64 +820,22 @@
}
- static final boolean equals( byte[] a, byte[] b ) {
- int size;
- if ((size = a.length) != b.length) {
- return false;
- }
- for (int i = 0; i < size; i++) {
- if (a[i] != b[i]) {
- return false;
- }
- }
- return true;
- }
+
- public static final void printArray( PrintStream out, Object[] obj ) {
- out.println(printArray(obj, true));
- }
+
- public static final void printArray( PrintWriter out, Object[] obj ) {
- out.println(printArray(obj, true));
- }
+
- public static final String printArray( Object[] obj ) {
- return printArray(obj, true);
- }
+
- public static final String printArray( Object[] obj, boolean braces ) {
- return printArray(obj, braces, false);
- }
+
- public static final String printArray( Object[] obj, boolean braces, boolean quote ) {
- if (obj == null) {
- return null;
- }
- StringBuffer buf = new StringBuffer();
- if (braces) {
- buf.append('{');
- }
- for (int i = 0; i < obj.length; i++) {
- if (obj[i] != null) {
- buf.append((quote ? "\"" : "")).append(obj[i].toString()).append(
- (quote ? "\"" : ""));
- } else {
- buf.append("null");
- }
- if (i < obj.length - 1) {
- buf.append(", ");
- }
- }
- if (braces) {
- buf.append('}');
- }
- return buf.toString();
- }
+
/** @return true, if character is one of (a, ... z, A, ... Z, 0, ... 9, _)
@@ -1137,72 +846,10 @@
}
- /** Encode byte array it into Java identifier string, i.e., a string
- * that only contains the following characters: (a, ... z, A, ... Z,
- * 0, ... 9, _, $). The encoding algorithm itself is not too
- * clever: if the current byte's ASCII value already is a valid Java
- * identifier part, leave it as it is. Otherwise it writes the
- * escape character($) followed by <p><ul><li> the ASCII value as a
- * hexadecimal string, if the value is not in the range
- * 200..247</li> <li>a Java identifier char not used in a lowercase
- * hexadecimal string, if the value is in the range
- * 200..247</li><ul></p>
- *
- * <p>This operation inflates the original byte array by roughly 40-50%</p>
- *
- * @param bytes the byte array to convert
- * @param compress use gzip to minimize string
- */
- public static String encode( byte[] bytes, boolean compress ) throws IOException {
- if (compress) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- GZIPOutputStream gos = new GZIPOutputStream(baos);
- gos.write(bytes, 0, bytes.length);
- gos.close();
- baos.close();
- bytes = baos.toByteArray();
- }
- CharArrayWriter caw = new CharArrayWriter();
- JavaWriter jw = new JavaWriter(caw);
- for (int i = 0; i < bytes.length; i++) {
- int in = bytes[i] & 0x000000ff; // Normalize to unsigned
- jw.write(in);
- }
- return caw.toString();
- }
+
- /** Decode a string back to a byte array.
- *
- * @param s the string to convert
- * @param uncompress use gzip to uncompress the stream of bytes
- */
- public static byte[] decode( String s, boolean uncompress ) throws IOException {
- char[] chars = s.toCharArray();
- CharArrayReader car = new CharArrayReader(chars);
- JavaReader jr = new JavaReader(car);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- int ch;
- while ((ch = jr.read()) >= 0) {
- bos.write(ch);
- }
- bos.close();
- car.close();
- jr.close();
- byte[] bytes = bos.toByteArray();
- if (uncompress) {
- GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(bytes));
- byte[] tmp = new byte[bytes.length * 3]; // Rough estimate
- int count = 0;
- int b;
- while ((b = gis.read()) >= 0) {
- tmp[count++] = (byte) b;
- }
- bytes = new byte[count];
- System.arraycopy(tmp, 0, bytes, 0, count);
- }
- return bytes;
- }
+
// A-Z, g-z, _, $
private static final int FREE_CHARS = 48;
@@ -1347,179 +994,9 @@
}
- /**
- * Converts a list of AnnotationGen objects into a set of attributes
- * that can be attached to the class file.
- *
- * @param cp The constant pool gen where we can create the necessary name refs
- * @param vec A list of AnnotationGen objects
- */
- public static Attribute[] getAnnotationAttributes(ConstantPoolGen cp,List vec) {
-
- if (vec.isEmpty()) return new Attribute[0];
-
- try {
- int countVisible = 0;
- int countInvisible = 0;
-
- // put the annotations in the right output stream
- for (int i=0; i<vec.size(); i++) {
- AnnotationEntryGen a = (AnnotationEntryGen)vec.get(i);
- if (a.isRuntimeVisible()) countVisible++;
- else countInvisible++;
- }
-
- ByteArrayOutputStream rvaBytes = new ByteArrayOutputStream();
- ByteArrayOutputStream riaBytes = new ByteArrayOutputStream();
- DataOutputStream rvaDos = new DataOutputStream(rvaBytes);
- DataOutputStream riaDos = new DataOutputStream(riaBytes);
-
- rvaDos.writeShort(countVisible);
- riaDos.writeShort(countInvisible);
-
- // put the annotations in the right output stream
- for (int i=0; i<vec.size(); i++) {
- AnnotationEntryGen a = (AnnotationEntryGen)vec.get(i);
- if (a.isRuntimeVisible()) a.dump(rvaDos);
- else a.dump(riaDos);
- }
-
- rvaDos.close();
- riaDos.close();
-
- byte[] rvaData = rvaBytes.toByteArray();
- byte[] riaData = riaBytes.toByteArray();
-
- int rvaIndex = -1;
- int riaIndex = -1;
-
- if (rvaData.length>2) rvaIndex = cp.addUtf8("RuntimeVisibleAnnotations");
- if (riaData.length>2) riaIndex = cp.addUtf8("RuntimeInvisibleAnnotations");
-
- List newAttributes = new ArrayList();
- if (rvaData.length>2) {
-
- newAttributes.add(
- new RuntimeVisibleAnnotations(rvaIndex,rvaData.length,new DataInputStream(new ByteArrayInputStream(rvaData)),cp.getConstantPool()));
- }
- if (riaData.length>2) {
- newAttributes.add(
- new RuntimeInvisibleAnnotations(riaIndex,riaData.length,new DataInputStream(new ByteArrayInputStream(riaData)),cp.getConstantPool()));
- }
-
- return (Attribute[])newAttributes.toArray(new Attribute[newAttributes.size()]);
- } catch (IOException e) {
- System.err.println("IOException whilst processing annotations");
- e.printStackTrace();
- }
- return null;
- }
+
- /**
- * Annotations against a class are stored in one of four attribute kinds:
- * - RuntimeVisibleParameterAnnotations
- * - RuntimeInvisibleParameterAnnotations
- */
- public static Attribute[] getParameterAnnotationAttributes(
- ConstantPoolGen cp,
- List[] /*Array of lists, array size depends on #params */vec)
- {
- int visCount[] = new int[vec.length];
- int totalVisCount = 0;
- int invisCount[] = new int[vec.length];
- int totalInvisCount = 0;
- try
- {
- for (int i = 0; i < vec.length; i++)
- {
- List l = vec[i];
- if (l != null)
- {
- for (Iterator iter = l.iterator(); iter.hasNext();)
- {
- AnnotationEntryGen element = (AnnotationEntryGen) iter.next();
- if (element.isRuntimeVisible())
- {
- visCount[i]++;
- totalVisCount++;
- }
- else
- {
- invisCount[i]++;
- totalInvisCount++;
- }
- }
- }
- }
- // Lets do the visible ones
- ByteArrayOutputStream rvaBytes = new ByteArrayOutputStream();
- DataOutputStream rvaDos = new DataOutputStream(rvaBytes);
- rvaDos.writeByte(vec.length); // First goes number of parameters
- for (int i = 0; i < vec.length; i++)
- {
- rvaDos.writeShort(visCount[i]);
- if (visCount[i] > 0)
- {
- List l = vec[i];
- for (Iterator iter = l.iterator(); iter.hasNext();)
- {
- AnnotationEntryGen element = (AnnotationEntryGen) iter.next();
- if (element.isRuntimeVisible())
- element.dump(rvaDos);
- }
- }
- }
- rvaDos.close();
- // Lets do the invisible ones
- ByteArrayOutputStream riaBytes = new ByteArrayOutputStream();
- DataOutputStream riaDos = new DataOutputStream(riaBytes);
- riaDos.writeByte(vec.length); // First goes number of parameters
- for (int i = 0; i < vec.length; i++)
- {
- riaDos.writeShort(invisCount[i]);
- if (invisCount[i] > 0)
- {
- List l = vec[i];
- for (Iterator iter = l.iterator(); iter.hasNext();)
- {
- AnnotationEntryGen element = (AnnotationEntryGen) iter.next();
- if (!element.isRuntimeVisible())
- element.dump(riaDos);
- }
- }
- }
- riaDos.close();
- byte[] rvaData = rvaBytes.toByteArray();
- byte[] riaData = riaBytes.toByteArray();
- int rvaIndex = -1;
- int riaIndex = -1;
- if (totalVisCount > 0)
- rvaIndex = cp.addUtf8("RuntimeVisibleParameterAnnotations");
- if (totalInvisCount > 0)
- riaIndex = cp.addUtf8("RuntimeInvisibleParameterAnnotations");
- List newAttributes = new ArrayList();
- if (totalVisCount > 0)
- {
- newAttributes
- .add(new RuntimeVisibleParameterAnnotations(rvaIndex,
- rvaData.length, new DataInputStream(new ByteArrayInputStream(rvaData)), cp.getConstantPool()));
- }
- if (totalInvisCount > 0)
- {
- newAttributes
- .add(new RuntimeInvisibleParameterAnnotations(riaIndex,
- riaData.length, new DataInputStream(new ByteArrayInputStream(riaData)), cp.getConstantPool()));
- }
- return (Attribute[]) newAttributes.toArray(new Attribute[newAttributes.size()]);
- }
- catch (IOException e)
- {
- System.err
- .println("IOException whilst processing parameter annotations");
- e.printStackTrace();
- }
- return null;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java Sat Dec 5 23:22:46 2009
@@ -28,7 +28,7 @@
{
public void visitCode(Code obj);
- public void visitCodeException(CodeException obj);
+
public void visitConstantClass(ConstantClass obj);
@@ -48,7 +48,7 @@
public void visitConstantNameAndType(ConstantNameAndType obj);
- public void visitConstantPool(ConstantPool obj);
+
public void visitConstantString(ConstantString obj);
@@ -60,23 +60,23 @@
public void visitExceptionTable(ExceptionTable obj);
- public void visitField(Field obj);
+
- public void visitInnerClass(InnerClass obj);
+
public void visitInnerClasses(InnerClasses obj);
- public void visitJavaClass(JavaClass obj);
+
- public void visitLineNumber(LineNumber obj);
+
public void visitLineNumberTable(LineNumberTable obj);
- public void visitLocalVariable(LocalVariable obj);
+
public void visitLocalVariableTable(LocalVariableTable obj);
- public void visitMethod(Method obj);
+
public void visitSignature(Signature obj);
@@ -88,19 +88,19 @@
public void visitStackMap(StackMap obj);
- public void visitStackMapEntry(StackMapEntry obj);
+
public void visitStackMapTable(StackMapTable obj);
- public void visitStackMapTableEntry(StackMapTableEntry obj);
+
public void visitAnnotation(Annotations obj);
- public void visitParameterAnnotation(ParameterAnnotations obj);
+
- public void visitAnnotationEntry(AnnotationEntry obj);
+
- public void visitAnnotationDefault(AnnotationDefault obj);
+
public void visitLocalVariableTypeTable(LocalVariableTypeTable obj);
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java Sat Dec 5 23:22:46 2009
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* ANEWARRAY - Create new array of references
* <PRE>Stack: ..., count -> ..., arrayref</PRE>
@@ -36,25 +34,11 @@
}
- public ANEWARRAY(int index) {
- super(org.apache.tomcat.util.bcel.Constants.ANEWARRAY, index);
- }
+
- public Class[] getExceptions() {
- Class[] cs = new Class[1 + ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length] = ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION;
- return cs;
- }
+
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
- Type t = getType(cpg);
- if (t instanceof ArrayType) {
- t = ((ArrayType) t).getBasicType();
- }
- return (t instanceof ObjectType) ? (ObjectType) t : null;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java Sat Dec 5 23:22:46 2009
@@ -10,21 +10,9 @@
// For annotation element values, this is the annotation
private AnnotationEntryGen a;
- public AnnotationElementValueGen(AnnotationEntryGen a, ConstantPoolGen cpool)
- {
- super(ANNOTATION, cpool);
- this.a = a;
- }
+
- public AnnotationElementValueGen(int type, AnnotationEntryGen annotation,
- ConstantPoolGen cpool)
- {
- super(type, cpool);
- if (type != ANNOTATION)
- throw new RuntimeException(
- "Only element values of type annotation can be built with this ctor - type specified: " + type);
- this.a = annotation;
- }
+
public AnnotationElementValueGen(AnnotationElementValue value,
ConstantPoolGen cpool, boolean copyPoolEntries)
@@ -53,8 +41,5 @@
.getConstantPool());
}
- public AnnotationEntryGen getAnnotation()
- {
- return a;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java Sat Dec 5 23:22:46 2009
@@ -1,6 +1,5 @@
package org.apache.tomcat.util.bcel.generic;
-import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -58,11 +57,6 @@
return out;
}
- private AnnotationEntryGen(ConstantPoolGen cpool)
- {
- this.cpool = cpool;
- }
-
/**
* Retrieve an immutable version of this AnnotationGen
*/
@@ -79,31 +73,9 @@
return a;
}
- public AnnotationEntryGen(ObjectType type,
- List /* ElementNameValuePairGen */elements, boolean vis,
- ConstantPoolGen cpool)
- {
- this.cpool = cpool;
- this.typeIndex = cpool.addUtf8(type.getSignature());
- evs = elements;
- isRuntimeVisible = vis;
- }
+
- public static AnnotationEntryGen read(DataInputStream dis,
- ConstantPoolGen cpool, boolean b) throws IOException
- {
- AnnotationEntryGen a = new AnnotationEntryGen(cpool);
- a.typeIndex = dis.readUnsignedShort();
- int elemValuePairCount = dis.readUnsignedShort();
- for (int i = 0; i < elemValuePairCount; i++)
- {
- int nidx = dis.readUnsignedShort();
- a.addElementNameValuePair(new ElementValuePairGen(nidx,
- ElementValueGen.readElementValue(dis, cpool), cpool));
- }
- a.isRuntimeVisible(b);
- return a;
- }
+
public void dump(DataOutputStream dos) throws IOException
{
@@ -116,17 +88,9 @@
}
}
- public void addElementNameValuePair(ElementValuePairGen evp)
- {
- if (evs == null)
- evs = new ArrayList();
- evs.add(evp);
- }
+
- public int getTypeIndex()
- {
- return typeIndex;
- }
+
public final String getTypeSignature()
{
@@ -142,13 +106,7 @@
// Utility.signatureToString(getTypeSignature());
}
- /**
- * Returns list of ElementNameValuePair objects
- */
- public List getValues()
- {
- return evs;
- }
+
public String toString()
{
@@ -164,27 +122,7 @@
return s.toString();
}
- public String toShortString()
- {
- StringBuffer s = new StringBuffer();
- s.append("@" + getTypeName() + "(");
- for (int i = 0; i < evs.size(); i++)
- {
- s.append(evs.get(i));
- if (i + 1 < evs.size())
- s.append(",");
- }
- s.append(")");
- return s.toString();
- }
-
- private void isRuntimeVisible(boolean b)
- {
- isRuntimeVisible = b;
- }
+
- public boolean isRuntimeVisible()
- {
- return isRuntimeVisible;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java Sat Dec 5 23:22:46 2009
@@ -14,25 +14,9 @@
// modify ...
private List /* ElementValueGen */evalues;
- public ArrayElementValueGen(ConstantPoolGen cp)
- {
- super(ARRAY, cp);
- evalues = new ArrayList();
- }
+
- public ArrayElementValueGen(int type, ElementValue[] datums,
- ConstantPoolGen cpool)
- {
- super(type, cpool);
- if (type != ARRAY)
- throw new RuntimeException(
- "Only element values of type array can be built with this ctor - type specified: " + type);
- this.evalues = new ArrayList();
- for (int i = 0; i < datums.length; i++)
- {
- evalues.add(datums[i]);
- }
- }
+
/**
* Return immutable variant of this ArrayElementValueGen
@@ -92,18 +76,9 @@
return sb.toString();
}
- public List getElementValues()
- {
- return evalues;
- }
+
- public int getElementValuesSize()
- {
- return evalues.size();
- }
+
- public void addElement(ElementValueGen gen)
- {
- evalues.add(gen);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java Sat Dec 5 23:22:46 2009
@@ -30,24 +30,10 @@
private Type basic_type;
- /**
- * Convenience constructor for array type, e.g. int[]
- *
- * @param type array type, e.g. T_INT
- */
- public ArrayType(byte type, int dimensions) {
- this(BasicType.getType(type), dimensions);
- }
+
- /**
- * Convenience constructor for reference array type, e.g. Object[]
- *
- * @param class_name complete name of class (java.lang.String, e.g.)
- */
- public ArrayType(String class_name, int dimensions) {
- this(new ObjectType(class_name), dimensions);
- }
+
/**
@@ -82,30 +68,13 @@
}
- /**
- * @return basic type of array, i.e., for int[][][] the basic type is int
- */
- public Type getBasicType() {
- return basic_type;
- }
+
- /**
- * @return element type of array, i.e., for int[][][] the element type is int[][]
- */
- public Type getElementType() {
- if (dimensions == 1) {
- return basic_type;
- }
- return new ArrayType(basic_type, dimensions - 1);
- }
+
- /** @return number of dimensions of array
- */
- public int getDimensions() {
- return dimensions;
- }
+
/** @return a hash code value for the object.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java Sat Dec 5 23:22:46 2009
@@ -41,12 +41,7 @@
}
- /** Push byte on stack
- */
- public BIPUSH(byte b) {
- super(org.apache.tomcat.util.bcel.Constants.BIPUSH, (short) 2);
- this.b = b;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java Sat Dec 5 23:22:46 2009
@@ -83,28 +83,13 @@
}
- /**
- * Pass new target to instruction.
- */
- public void setTarget( InstructionHandle ih ) {
- bi.setTarget(ih);
- }
+
- /**
- * Update target of instruction.
- */
- public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
- bi.updateTarget(old_ih, new_ih);
- }
+
- /**
- * @return target of instruction.
- */
- public InstructionHandle getTarget() {
- return bi.getTarget();
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java Sat Dec 5 23:22:46 2009
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import org.apache.tomcat.util.bcel.ExceptionConstants;
-
/**
* CHECKCAST - Check whether object is of given type
* <PRE>Stack: ..., objectref -> ..., objectref</PRE>
@@ -36,30 +34,11 @@
}
- /** Check whether object is of given type
- * @param index index to class in constant pool
- */
- public CHECKCAST(int index) {
- super(org.apache.tomcat.util.bcel.Constants.CHECKCAST, index);
- }
+
- /** @return exceptions this instruction may cause
- */
- public Class[] getExceptions() {
- Class[] cs = new Class[1 + ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length];
- System.arraycopy(ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION, 0, cs, 0,
- ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length);
- cs[ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION.length] = ExceptionConstants.CLASS_CAST_EXCEPTION;
- return cs;
- }
+
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
- Type t = getType(cpg);
- if (t instanceof ArrayType) {
- t = ((ArrayType) t).getBasicType();
- }
- return (t instanceof ObjectType) ? (ObjectType) t : null;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java Sat Dec 5 23:22:46 2009
@@ -6,7 +6,6 @@
import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
import org.apache.tomcat.util.bcel.classfile.ClassElementValue;
import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
-import org.apache.tomcat.util.bcel.generic.ObjectType;
import org.apache.tomcat.util.bcel.generic.ElementValueGen;
public class ClassElementValueGen extends ElementValueGen
@@ -16,18 +15,9 @@
// For 'class' this points to the class entry in the cpool
private int idx;
- protected ClassElementValueGen(int typeIdx, ConstantPoolGen cpool)
- {
- super(ElementValueGen.CLASS, cpool);
- this.idx = typeIdx;
- }
+
- public ClassElementValueGen(ObjectType t, ConstantPoolGen cpool)
- {
- super(ElementValueGen.CLASS, cpool);
- // this.idx = cpool.addClass(t);
- idx = cpool.addUtf8(t.getSignature());
- }
+
/**
* Return immutable variant of this ClassElementValueGen
@@ -52,10 +42,7 @@
}
}
- public int getIndex()
- {
- return idx;
- }
+
public String getClassString()
{
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java Sat Dec 5 23:22:46 2009
@@ -17,22 +17,11 @@
package org.apache.tomcat.util.bcel.generic;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.AccessFlags;
-import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
-import org.apache.tomcat.util.bcel.classfile.Annotations;
-import org.apache.tomcat.util.bcel.classfile.Attribute;
-import org.apache.tomcat.util.bcel.classfile.ConstantPool;
-import org.apache.tomcat.util.bcel.classfile.Field;
import org.apache.tomcat.util.bcel.classfile.JavaClass;
-import org.apache.tomcat.util.bcel.classfile.Method;
-import org.apache.tomcat.util.bcel.classfile.RuntimeInvisibleAnnotations;
-import org.apache.tomcat.util.bcel.classfile.RuntimeVisibleAnnotations;
-import org.apache.tomcat.util.bcel.classfile.SourceFile;
-import org.apache.tomcat.util.bcel.classfile.Utility;
import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
@@ -74,491 +63,84 @@
};
- /** Convenience constructor to set up some important values initially.
- *
- * @param class_name fully qualified class name
- * @param super_class_name fully qualified superclass name
- * @param file_name source file name
- * @param access_flags access qualifiers
- * @param interfaces implemented interfaces
- * @param cp constant pool to use
- */
- public ClassGen(String class_name, String super_class_name, String file_name, int access_flags,
- String[] interfaces, ConstantPoolGen cp) {
- this.class_name = class_name;
- this.super_class_name = super_class_name;
- this.file_name = file_name;
- this.access_flags = access_flags;
- this.cp = cp;
- // Put everything needed by default into the constant pool and the vectors
- if (file_name != null) {
- addAttribute(new SourceFile(cp.addUtf8("SourceFile"), 2, cp.addUtf8(file_name), cp
- .getConstantPool()));
- }
- class_name_index = cp.addClass(class_name);
- superclass_name_index = cp.addClass(super_class_name);
- if (interfaces != null) {
- for (int i = 0; i < interfaces.length; i++) {
- addInterface(interfaces[i]);
- }
- }
- }
-
-
- /** Convenience constructor to set up some important values initially.
- *
- * @param class_name fully qualified class name
- * @param super_class_name fully qualified superclass name
- * @param file_name source file name
- * @param access_flags access qualifiers
- * @param interfaces implemented interfaces
- */
- public ClassGen(String class_name, String super_class_name, String file_name, int access_flags,
- String[] interfaces) {
- this(class_name, super_class_name, file_name, access_flags, interfaces,
- new ConstantPoolGen());
- }
-
-
- /**
- * Initialize with existing class.
- * @param clazz JavaClass object (e.g. read from file)
- */
- public ClassGen(JavaClass clazz) {
- class_name_index = clazz.getClassNameIndex();
- superclass_name_index = clazz.getSuperclassNameIndex();
- class_name = clazz.getClassName();
- super_class_name = clazz.getSuperclassName();
- file_name = clazz.getSourceFileName();
- access_flags = clazz.getAccessFlags();
- cp = new ConstantPoolGen(clazz.getConstantPool());
- major = clazz.getMajor();
- minor = clazz.getMinor();
- Attribute[] attributes = clazz.getAttributes();
- // J5TODO: Could make unpacking lazy, done on first reference
- AnnotationEntryGen[] annotations = unpackAnnotations(attributes);
- Method[] methods = clazz.getMethods();
- Field[] fields = clazz.getFields();
- String[] interfaces = clazz.getInterfaceNames();
- for (int i = 0; i < interfaces.length; i++) {
- addInterface(interfaces[i]);
- }
- for (int i = 0; i < attributes.length; i++) {
- if (!(attributes[i] instanceof Annotations)) {
- addAttribute(attributes[i]);
- }
- }
- for(int i=0; i < annotations.length; i++) {
- addAnnotationEntry(annotations[i]);
- }
- for (int i = 0; i < methods.length; i++) {
- addMethod(methods[i]);
- }
- for (int i = 0; i < fields.length; i++) {
- addField(fields[i]);
- }
- }
- /**
- * Look for attributes representing annotations and unpack them.
- */
- private AnnotationEntryGen[] unpackAnnotations(Attribute[] attrs)
- {
- List /* AnnotationGen */annotationGenObjs = new ArrayList();
- for (int i = 0; i < attrs.length; i++)
- {
- Attribute attr = attrs[i];
- if (attr instanceof RuntimeVisibleAnnotations)
- {
- RuntimeVisibleAnnotations rva = (RuntimeVisibleAnnotations) attr;
- AnnotationEntry[] annos = rva.getAnnotationEntries();
- for (int j = 0; j < annos.length; j++)
- {
- AnnotationEntry a = annos[j];
- annotationGenObjs.add(new AnnotationEntryGen(a,
- getConstantPool(), false));
- }
- }
- else
- if (attr instanceof RuntimeInvisibleAnnotations)
- {
- RuntimeInvisibleAnnotations ria = (RuntimeInvisibleAnnotations) attr;
- AnnotationEntry[] annos = ria.getAnnotationEntries();
- for (int j = 0; j < annos.length; j++)
- {
- AnnotationEntry a = annos[j];
- annotationGenObjs.add(new AnnotationEntryGen(a,
- getConstantPool(), false));
- }
- }
- }
- return (AnnotationEntryGen[]) annotationGenObjs
- .toArray(new AnnotationEntryGen[annotationGenObjs.size()]);
- }
-
-
- /**
- * @return the (finally) built up Java class object.
- */
- public JavaClass getJavaClass() {
- int[] interfaces = getInterfaces();
- Field[] fields = getFields();
- Method[] methods = getMethods();
- Attribute[] attributes = null;
- if (annotation_vec.isEmpty()) {
- attributes = getAttributes();
- } else {
- // TODO: Sometime later, trash any attributes called 'RuntimeVisibleAnnotations' or 'RuntimeInvisibleAnnotations'
- Attribute[] annAttributes = Utility.getAnnotationAttributes(cp,annotation_vec);
- attributes = new Attribute[attribute_vec.size()+annAttributes.length];
- attribute_vec.toArray(attributes);
- System.arraycopy(annAttributes,0,attributes,attribute_vec.size(),annAttributes.length);
- }
- // Must be last since the above calls may still add something to it
- ConstantPool _cp = this.cp.getFinalConstantPool();
- return new JavaClass(class_name_index, superclass_name_index, file_name, major, minor,
- access_flags, _cp, interfaces, fields, methods, attributes);
- }
-
-
- /**
- * Add an interface to this class, i.e., this class has to implement it.
- * @param name interface to implement (fully qualified class name)
- */
- public void addInterface( String name ) {
- interface_vec.add(name);
- }
-
-
- /**
- * Remove an interface from this class.
- * @param name interface to remove (fully qualified name)
- */
- public void removeInterface( String name ) {
- interface_vec.remove(name);
- }
-
-
- /**
- * @return major version number of class file
- */
- public int getMajor() {
- return major;
- }
-
-
- /** Set major version number of class file, default value is 45 (JDK 1.1)
- * @param major major version number
- */
- public void setMajor( int major ) {
- this.major = major;
- }
- /** Set minor version number of class file, default value is 3 (JDK 1.1)
- * @param minor minor version number
- */
- public void setMinor( int minor ) {
- this.minor = minor;
- }
-
-
- /**
- * @return minor version number of class file
- */
- public int getMinor() {
- return minor;
- }
-
-
- /**
- * Add an attribute to this class.
- * @param a attribute to add
- */
- public void addAttribute( Attribute a ) {
- attribute_vec.add(a);
- }
- public void addAnnotationEntry(AnnotationEntryGen a) {
- annotation_vec.add(a);
- }
-
-
- /**
- * Add a method to this class.
- * @param m method to add
- */
- public void addMethod( Method m ) {
- method_vec.add(m);
- }
-
-
- /**
- * Convenience method.
- *
- * Add an empty constructor to this class that does nothing but calling super().
- * @param access_flags rights for constructor
- */
- public void addEmptyConstructor( int access_flags ) {
- InstructionList il = new InstructionList();
- il.append(InstructionConstants.THIS); // Push `this'
- il.append(new INVOKESPECIAL(cp.addMethodref(super_class_name, "<init>", "()V")));
- il.append(InstructionConstants.RETURN);
- MethodGen mg = new MethodGen(access_flags, Type.VOID, Type.NO_ARGS, null, "<init>",
- class_name, il, cp);
- mg.setMaxStack(1);
- addMethod(mg.getMethod());
- }
-
-
- /**
- * Add a field to this class.
- * @param f field to add
- */
- public void addField( Field f ) {
- field_vec.add(f);
- }
-
-
- public boolean containsField( Field f ) {
- return field_vec.contains(f);
- }
-
-
- /** @return field object with given name, or null
- */
- public Field containsField( String name ) {
- for (Iterator e = field_vec.iterator(); e.hasNext();) {
- Field f = (Field) e.next();
- if (f.getName().equals(name)) {
- return f;
- }
- }
- return null;
- }
-
-
- /** @return method object with given name and signature, or null
- */
- public Method containsMethod( String name, String signature ) {
- for (Iterator e = method_vec.iterator(); e.hasNext();) {
- Method m = (Method) e.next();
- if (m.getName().equals(name) && m.getSignature().equals(signature)) {
- return m;
- }
- }
- return null;
- }
-
-
- /**
- * Remove an attribute from this class.
- * @param a attribute to remove
- */
- public void removeAttribute( Attribute a ) {
- attribute_vec.remove(a);
- }
-
-
- /**
- * Remove a method from this class.
- * @param m method to remove
- */
- public void removeMethod( Method m ) {
- method_vec.remove(m);
- }
-
-
- /** Replace given method with new one. If the old one does not exist
- * add the new_ method to the class anyway.
- */
- public void replaceMethod( Method old, Method new_ ) {
- if (new_ == null) {
- throw new ClassGenException("Replacement method must not be null");
- }
- int i = method_vec.indexOf(old);
- if (i < 0) {
- method_vec.add(new_);
- } else {
- method_vec.set(i, new_);
- }
- }
-
-
- /** Replace given field with new one. If the old one does not exist
- * add the new_ field to the class anyway.
- */
- public void replaceField( Field old, Field new_ ) {
- if (new_ == null) {
- throw new ClassGenException("Replacement method must not be null");
- }
- int i = field_vec.indexOf(old);
- if (i < 0) {
- field_vec.add(new_);
- } else {
- field_vec.set(i, new_);
- }
- }
-
-
- /**
- * Remove a field to this class.
- * @param f field to remove
- */
- public void removeField( Field f ) {
- field_vec.remove(f);
- }
+
+
public String getClassName() {
return class_name;
}
- public String getSuperclassName() {
- return super_class_name;
- }
+
- public String getFileName() {
- return file_name;
- }
+
- public void setClassName( String name ) {
- class_name = name.replace('/', '.');
- class_name_index = cp.addClass(name);
- }
+
- public void setSuperclassName( String name ) {
- super_class_name = name.replace('/', '.');
- superclass_name_index = cp.addClass(name);
- }
+
- public Method[] getMethods() {
- return (Method[]) method_vec.toArray(new Method[method_vec.size()]);
- }
+
- public void setMethods( Method[] methods ) {
- method_vec.clear();
- for (int m = 0; m < methods.length; m++) {
- addMethod(methods[m]);
- }
- }
+
- public void setMethodAt( Method method, int pos ) {
- method_vec.set(pos, method);
- }
+
- public Method getMethodAt( int pos ) {
- return (Method) method_vec.get(pos);
- }
+
- public String[] getInterfaceNames() {
- int size = interface_vec.size();
- String[] interfaces = new String[size];
- interface_vec.toArray(interfaces);
- return interfaces;
- }
+
- public int[] getInterfaces() {
- int size = interface_vec.size();
- int[] interfaces = new int[size];
- for (int i = 0; i < size; i++) {
- interfaces[i] = cp.addClass((String) interface_vec.get(i));
- }
- return interfaces;
- }
+
- public Field[] getFields() {
- return (Field[]) field_vec.toArray(new Field[field_vec.size()]);
- }
+
- public Attribute[] getAttributes() {
- return (Attribute[]) attribute_vec.toArray(new Attribute[attribute_vec.size()]);
- }
- // J5TODO: Should we make calling unpackAnnotations() lazy and put it in here?
- public AnnotationEntryGen[] getAnnotationEntries() {
- return (AnnotationEntryGen[]) annotation_vec.toArray(new AnnotationEntryGen[annotation_vec.size()]);
- }
+
+
- public ConstantPoolGen getConstantPool() {
- return cp;
- }
+
- public void setConstantPool( ConstantPoolGen constant_pool ) {
- cp = constant_pool;
- }
+
- public void setClassNameIndex( int class_name_index ) {
- this.class_name_index = class_name_index;
- class_name = cp.getConstantPool().getConstantString(class_name_index,
- Constants.CONSTANT_Class).replace('/', '.');
- }
+
- public void setSuperclassNameIndex( int superclass_name_index ) {
- this.superclass_name_index = superclass_name_index;
- super_class_name = cp.getConstantPool().getConstantString(superclass_name_index,
- Constants.CONSTANT_Class).replace('/', '.');
- }
+
- public int getSuperclassNameIndex() {
- return superclass_name_index;
- }
+
- public int getClassNameIndex() {
- return class_name_index;
- }
+
private ArrayList observers;
- /** Add observer for this object.
- */
- public void addObserver( ClassObserver o ) {
- if (observers == null) {
- observers = new ArrayList();
- }
- observers.add(o);
- }
+
- /** Remove observer for this object.
- */
- public void removeObserver( ClassObserver o ) {
- if (observers != null) {
- observers.remove(o);
- }
- }
+
- /** Call notify() method on all observers. This method is not called
- * automatically whenever the state has changed, but has to be
- * called by the user after he has finished editing the object.
- */
- public void update() {
- if (observers != null) {
- for (Iterator e = observers.iterator(); e.hasNext();) {
- ((ClassObserver) e.next()).notify(this);
- }
- }
- }
+
public Object clone() {
@@ -571,20 +153,10 @@
}
- /**
- * @return Comparison strategy object
- */
- public static BCELComparator getComparator() {
- return _cmp;
- }
+
- /**
- * @param comparator Comparison strategy object
- */
- public static void setComparator( BCELComparator comparator ) {
- _cmp = comparator;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java Sat Dec 5 23:22:46 2009
@@ -34,7 +34,5 @@
super(s);
}
- public ClassGenException(String s, Throwable initCause) {
- super(s, initCause);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java Sat Dec 5 23:22:46 2009
@@ -38,7 +38,6 @@
private InstructionHandle start_pc;
private InstructionHandle end_pc;
private InstructionHandle handler_pc;
- private ObjectType catch_type;
/**
@@ -55,24 +54,10 @@
setStartPC(start_pc);
setEndPC(end_pc);
setHandlerPC(handler_pc);
- this.catch_type = catch_type;
}
- /**
- * Get CodeException object.<BR>
- *
- * This relies on that the instruction list has already been dumped
- * to byte code or or that the `setPositions' methods has been
- * called for the instruction list.
- *
- * @param cp constant pool
- */
- public CodeException getCodeException( ConstantPoolGen cp ) {
- return new CodeException(start_pc.getPosition(), end_pc.getPosition()
- + end_pc.getInstruction().getLength(), handler_pc.getPosition(),
- (catch_type == null) ? 0 : cp.addClass(catch_type));
- }
+
/* Set start of handler
@@ -102,70 +87,25 @@
}
- /**
- * @param old_ih old target, either start or end
- * @param new_ih new target
- */
- public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
- boolean targeted = false;
- if (start_pc == old_ih) {
- targeted = true;
- setStartPC(new_ih);
- }
- if (end_pc == old_ih) {
- targeted = true;
- setEndPC(new_ih);
- }
- if (handler_pc == old_ih) {
- targeted = true;
- setHandlerPC(new_ih);
- }
- if (!targeted) {
- throw new ClassGenException("Not targeting " + old_ih + ", but {" + start_pc + ", "
- + end_pc + ", " + handler_pc + "}");
- }
- }
+
- /**
- * @return true, if ih is target of this handler
- */
- public boolean containsTarget( InstructionHandle ih ) {
- return (start_pc == ih) || (end_pc == ih) || (handler_pc == ih);
- }
+
- /** Sets the type of the Exception to catch. Set 'null' for ANY. */
- public void setCatchType( ObjectType catch_type ) {
- this.catch_type = catch_type;
- }
+
- /** Gets the type of the Exception to catch, 'null' for ANY. */
- public ObjectType getCatchType() {
- return catch_type;
- }
+
- /** @return start of handled region (inclusive)
- */
- public InstructionHandle getStartPC() {
- return start_pc;
- }
+
- /** @return end of handled region (inclusive)
- */
- public InstructionHandle getEndPC() {
- return end_pc;
- }
+
- /** @return start of handler
- */
- public InstructionHandle getHandlerPC() {
- return handler_pc;
- }
+
public String toString() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java Sat Dec 5 23:22:46 2009
@@ -18,9 +18,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.Constant;
-import org.apache.tomcat.util.bcel.classfile.ConstantCP;
import org.apache.tomcat.util.bcel.classfile.ConstantClass;
import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
@@ -69,98 +67,10 @@
}
- /**
- * Initialize with given array of constants.
- *
- * @param cs array of given constants, new ones will be appended
- */
- public ConstantPoolGen(Constant[] cs) {
- StringBuffer sb = new StringBuffer(256);
-
- size = Math.max(256, cs.length + 64);
- constants = new Constant[size];
-
- System.arraycopy(cs, 0, constants, 0, cs.length);
- if (cs.length > 0) {
- index = cs.length;
- }
-
-
- for (int i = 1; i < index; i++) {
- Constant c = constants[i];
- if (c instanceof ConstantString) {
- ConstantString s = (ConstantString) c;
- ConstantUtf8 u8 = (ConstantUtf8) constants[s.getStringIndex()];
- String key = u8.getBytes();
- if (!string_table.containsKey(key)) {
- string_table.put(key, new Index(i));
- }
- } else if (c instanceof ConstantClass) {
- ConstantClass s = (ConstantClass) c;
- ConstantUtf8 u8 = (ConstantUtf8) constants[s.getNameIndex()];
- String key = u8.getBytes();
- if (!class_table.containsKey(key)) {
- class_table.put(key, new Index(i));
- }
- } else if (c instanceof ConstantNameAndType) {
- ConstantNameAndType n = (ConstantNameAndType) c;
- ConstantUtf8 u8 = (ConstantUtf8) constants[n.getNameIndex()];
- ConstantUtf8 u8_2 = (ConstantUtf8) constants[n.getSignatureIndex()];
-
- sb.append(u8.getBytes());
- sb.append(NAT_DELIM);
- sb.append(u8_2.getBytes());
- String key = sb.toString();
- sb.delete(0, sb.length());
-
- if (!n_a_t_table.containsKey(key)) {
- n_a_t_table.put(key, new Index(i));
- }
- } else if (c instanceof ConstantUtf8) {
- ConstantUtf8 u = (ConstantUtf8) c;
- String key = u.getBytes();
- if (!utf8_table.containsKey(key)) {
- utf8_table.put(key, new Index(i));
- }
- } else if (c instanceof ConstantCP) {
- ConstantCP m = (ConstantCP) c;
- ConstantClass clazz = (ConstantClass) constants[m.getClassIndex()];
- ConstantNameAndType n = (ConstantNameAndType) constants[m.getNameAndTypeIndex()];
- ConstantUtf8 u8 = (ConstantUtf8) constants[clazz.getNameIndex()];
- String class_name = u8.getBytes().replace('/', '.');
- u8 = (ConstantUtf8) constants[n.getNameIndex()];
- String method_name = u8.getBytes();
- u8 = (ConstantUtf8) constants[n.getSignatureIndex()];
- String signature = u8.getBytes();
- String delim = METHODREF_DELIM;
- if (c instanceof ConstantInterfaceMethodref) {
- delim = IMETHODREF_DELIM;
- } else if (c instanceof ConstantFieldref) {
- delim = FIELDREF_DELIM;
- }
-
- sb.append(class_name);
- sb.append(delim);
- sb.append(method_name);
- sb.append(delim);
- sb.append(signature);
- String key = sb.toString();
- sb.delete(0, sb.length());
-
- if (!cp_table.containsKey(key)) {
- cp_table.put(key, new Index(i));
- }
- }
- }
- }
+
- /**
- * Initialize with given constant pool.
- */
- public ConstantPoolGen(ConstantPool cp) {
- this(cp.getConstantPool());
- }
+
/**
@@ -273,16 +183,7 @@
}
- /**
- * Add a reference to an array class (e.g. String[][]) as needed by MULTIANEWARRAY
- * instruction, e.g. to the ConstantPool.
- *
- * @param type type of array class
- * @return index of entry
- */
- public int addArrayClass( ArrayType type ) {
- return addClass_(type.getSignature());
- }
+
/**
@@ -531,9 +432,7 @@
}
- public int lookupMethodref( MethodGen method ) {
- return lookupMethodref(method.getClassName(), method.getName(), method.getSignature());
- }
+
/**
@@ -563,9 +462,7 @@
}
- public int addMethodref( MethodGen method ) {
- return addMethodref(method.getClassName(), method.getName(), method.getSignature());
- }
+
/**
@@ -583,10 +480,7 @@
}
- public int lookupInterfaceMethodref( MethodGen method ) {
- return lookupInterfaceMethodref(method.getClassName(), method.getName(), method
- .getSignature());
- }
+
/**
@@ -616,9 +510,7 @@
}
- public int addInterfaceMethodref( MethodGen method ) {
- return addInterfaceMethodref(method.getClassName(), method.getName(), method.getSignature());
- }
+
/**
@@ -673,15 +565,7 @@
}
- /**
- * Use with care!
- *
- * @param i index in constant pool
- * @param c new constant pool entry at index i
- */
- public void setConstant( int i, Constant c ) {
- constants[i] = c;
- }
+
/**
@@ -692,22 +576,10 @@
}
- /**
- * @return current size of constant pool
- */
- public int getSize() {
- return index;
- }
+
- /**
- * @return constant pool with proper length
- */
- public ConstantPool getFinalConstantPool() {
- Constant[] cs = new Constant[index];
- System.arraycopy(constants, 0, cs, 0, index);
- return new ConstantPool(cs);
- }
+
/**
@@ -722,62 +594,5 @@
}
- /** Import constant from another ConstantPool and return new index.
- */
- public int addConstant( Constant c, ConstantPoolGen cp ) {
- Constant[] constants = cp.getConstantPool().getConstantPool();
- switch (c.getTag()) {
- case Constants.CONSTANT_String: {
- ConstantString s = (ConstantString) c;
- ConstantUtf8 u8 = (ConstantUtf8) constants[s.getStringIndex()];
- return addString(u8.getBytes());
- }
- case Constants.CONSTANT_Class: {
- ConstantClass s = (ConstantClass) c;
- ConstantUtf8 u8 = (ConstantUtf8) constants[s.getNameIndex()];
- return addClass(u8.getBytes());
- }
- case Constants.CONSTANT_NameAndType: {
- ConstantNameAndType n = (ConstantNameAndType) c;
- ConstantUtf8 u8 = (ConstantUtf8) constants[n.getNameIndex()];
- ConstantUtf8 u8_2 = (ConstantUtf8) constants[n.getSignatureIndex()];
- return addNameAndType(u8.getBytes(), u8_2.getBytes());
- }
- case Constants.CONSTANT_Utf8:
- return addUtf8(((ConstantUtf8) c).getBytes());
- case Constants.CONSTANT_Double:
- return addDouble(((ConstantDouble) c).getBytes());
- case Constants.CONSTANT_Float:
- return addFloat(((ConstantFloat) c).getBytes());
- case Constants.CONSTANT_Long:
- return addLong(((ConstantLong) c).getBytes());
- case Constants.CONSTANT_Integer:
- return addInteger(((ConstantInteger) c).getBytes());
- case Constants.CONSTANT_InterfaceMethodref:
- case Constants.CONSTANT_Methodref:
- case Constants.CONSTANT_Fieldref: {
- ConstantCP m = (ConstantCP) c;
- ConstantClass clazz = (ConstantClass) constants[m.getClassIndex()];
- ConstantNameAndType n = (ConstantNameAndType) constants[m.getNameAndTypeIndex()];
- ConstantUtf8 u8 = (ConstantUtf8) constants[clazz.getNameIndex()];
- String class_name = u8.getBytes().replace('/', '.');
- u8 = (ConstantUtf8) constants[n.getNameIndex()];
- String name = u8.getBytes();
- u8 = (ConstantUtf8) constants[n.getSignatureIndex()];
- String signature = u8.getBytes();
- switch (c.getTag()) {
- case Constants.CONSTANT_InterfaceMethodref:
- return addInterfaceMethodref(class_name, name, signature);
- case Constants.CONSTANT_Methodref:
- return addMethodref(class_name, name, signature);
- case Constants.CONSTANT_Fieldref:
- return addFieldref(class_name, name, signature);
- default: // Never reached
- throw new RuntimeException("Unknown constant type " + c);
- }
- }
- default: // Never reached
- throw new RuntimeException("Unknown constant type " + c);
- }
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java Sat Dec 5 23:22:46 2009
@@ -1,11 +1,9 @@
package org.apache.tomcat.util.bcel.generic;
-import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.tomcat.util.bcel.classfile.AnnotationElementValue;
-import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
import org.apache.tomcat.util.bcel.classfile.ArrayElementValue;
import org.apache.tomcat.util.bcel.classfile.ClassElementValue;
import org.apache.tomcat.util.bcel.classfile.ElementValue;
@@ -29,10 +27,7 @@
*/
public abstract ElementValue getElementValue();
- public int getElementValueType()
- {
- return type;
- }
+
public abstract String stringifyValue();
@@ -64,64 +59,7 @@
public static final int PRIMITIVE_BOOLEAN = 'Z';
- public static ElementValueGen readElementValue(DataInputStream dis,
- ConstantPoolGen cpGen) throws IOException
- {
- int type = dis.readUnsignedByte();
- switch (type)
- {
- case 'B': // byte
- return new SimpleElementValueGen(PRIMITIVE_BYTE, dis
- .readUnsignedShort(), cpGen);
- case 'C': // char
- return new SimpleElementValueGen(PRIMITIVE_CHAR, dis
- .readUnsignedShort(), cpGen);
- case 'D': // double
- return new SimpleElementValueGen(PRIMITIVE_DOUBLE, dis
- .readUnsignedShort(), cpGen);
- case 'F': // float
- return new SimpleElementValueGen(PRIMITIVE_FLOAT, dis
- .readUnsignedShort(), cpGen);
- case 'I': // int
- return new SimpleElementValueGen(PRIMITIVE_INT, dis
- .readUnsignedShort(), cpGen);
- case 'J': // long
- return new SimpleElementValueGen(PRIMITIVE_LONG, dis
- .readUnsignedShort(), cpGen);
- case 'S': // short
- return new SimpleElementValueGen(PRIMITIVE_SHORT, dis
- .readUnsignedShort(), cpGen);
- case 'Z': // boolean
- return new SimpleElementValueGen(PRIMITIVE_BOOLEAN, dis
- .readUnsignedShort(), cpGen);
- case 's': // String
- return new SimpleElementValueGen(STRING, dis.readUnsignedShort(),
- cpGen);
- case 'e': // Enum constant
- return new EnumElementValueGen(dis.readUnsignedShort(), dis
- .readUnsignedShort(), cpGen);
- case 'c': // Class
- return new ClassElementValueGen(dis.readUnsignedShort(), cpGen);
- case '@': // Annotation
- // TODO: isRuntimeVisible ??????????
- // FIXME
- return new AnnotationElementValueGen(ANNOTATION,
- new AnnotationEntryGen(AnnotationEntry.read(dis, cpGen
- .getConstantPool(), true), cpGen, false), cpGen);
- case '[': // Array
- int numArrayVals = dis.readUnsignedShort();
- ElementValue[] evalues = new ElementValue[numArrayVals];
- for (int j = 0; j < numArrayVals; j++)
- {
- evalues[j] = ElementValue.readElementValue(dis, cpGen
- .getConstantPool());
- }
- return new ArrayElementValueGen(ARRAY, evalues, cpGen);
- default:
- throw new RuntimeException(
- "Unexpected element value kind in annotation: " + type);
- }
- }
+
protected ConstantPoolGen getConstantPool()
{
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java Sat Dec 5 23:22:46 2009
@@ -47,21 +47,9 @@
.getConstantPool());
}
- protected ElementValuePairGen(int idx, ElementValueGen value,
- ConstantPoolGen cpool)
- {
- this.nameIdx = idx;
- this.value = value;
- this.cpool = cpool;
- }
+
- public ElementValuePairGen(String name, ElementValueGen value,
- ConstantPoolGen cpool)
- {
- this.nameIdx = cpool.addUtf8(name);
- this.value = value;
- this.cpool = cpool;
- }
+
protected void dump(DataOutputStream dos) throws IOException
{
@@ -69,10 +57,7 @@
value.dump(dos);
}
- public int getNameIndex()
- {
- return nameIdx;
- }
+
public final String getNameString()
{
@@ -80,10 +65,7 @@
return ((ConstantUtf8) cpool.getConstant(nameIdx)).getBytes();
}
- public final ElementValueGen getValue()
- {
- return value;
- }
+
public String toString()
{
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java Sat Dec 5 23:22:46 2009
@@ -13,21 +13,7 @@
private int valueIdx;
- /**
- * This ctor assumes the constant pool already contains the right type and
- * value - as indicated by typeIdx and valueIdx. This ctor is used for
- * deserialization
- */
- protected EnumElementValueGen(int typeIdx, int valueIdx,
- ConstantPoolGen cpool)
- {
- super(ElementValueGen.ENUM_CONSTANT, cpool);
- if (type != ENUM_CONSTANT)
- throw new RuntimeException(
- "Only element values of type enum can be built with this ctor - type specified: " + type);
- this.typeIdx = typeIdx;
- this.valueIdx = valueIdx;
- }
+
/**
* Return immutable variant of this EnumElementValue
@@ -40,12 +26,7 @@
.getConstantPool());
}
- public EnumElementValueGen(ObjectType t, String value, ConstantPoolGen cpool)
- {
- super(ElementValueGen.ENUM_CONSTANT, cpool);
- typeIdx = cpool.addUtf8(t.getSignature());// was addClass(t);
- valueIdx = cpool.addUtf8(value);// was addString(value);
- }
+
public EnumElementValueGen(EnumElementValue value, ConstantPoolGen cpool,
boolean copyPoolEntries)
@@ -107,13 +88,7 @@
// ((ConstantUtf8)getConstantPool().getConstant(cu8.getStringIndex())).getBytes();
}
- public int getValueIndex()
- {
- return valueIdx;
- }
+
- public int getTypeIndex()
- {
- return typeIdx;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java Sat Dec 5 23:22:46 2009
@@ -38,5 +38,5 @@
*/
public interface ExceptionThrower {
- public java.lang.Class[] getExceptions();
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java Sat Dec 5 23:22:46 2009
@@ -16,17 +16,7 @@
*/
package org.apache.tomcat.util.bcel.generic;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
-import org.apache.tomcat.util.bcel.classfile.Annotations;
-import org.apache.tomcat.util.bcel.classfile.Attribute;
-import org.apache.tomcat.util.bcel.classfile.Constant;
-import org.apache.tomcat.util.bcel.classfile.ConstantObject;
-import org.apache.tomcat.util.bcel.classfile.ConstantPool;
-import org.apache.tomcat.util.bcel.classfile.ConstantValue;
import org.apache.tomcat.util.bcel.classfile.Field;
import org.apache.tomcat.util.bcel.classfile.Utility;
import org.apache.tomcat.util.bcel.util.BCELComparator;
@@ -60,199 +50,10 @@
};
- /**
- * Declare a field. If it is static (isStatic() == true) and has a
- * basic type like int or String it may have an initial value
- * associated with it as defined by setInitValue().
- *
- * @param access_flags access qualifiers
- * @param type field type
- * @param name field name
- * @param cp constant pool
- */
- public FieldGen(int access_flags, Type type, String name, ConstantPoolGen cp) {
- setAccessFlags(access_flags);
- setType(type);
- setName(name);
- setConstantPool(cp);
- }
-
-
- /**
- * Instantiate from existing field.
- *
- * @param field Field object
- * @param cp constant pool (must contain the same entries as the field's constant pool)
- */
- public FieldGen(Field field, ConstantPoolGen cp) {
- this(field.getAccessFlags(), Type.getType(field.getSignature()), field.getName(), cp);
- Attribute[] attrs = field.getAttributes();
- for (int i = 0; i < attrs.length; i++) {
- if (attrs[i] instanceof ConstantValue) {
- setValue(((ConstantValue) attrs[i]).getConstantValueIndex());
- } else if (attrs[i] instanceof Annotations) {
- Annotations runtimeAnnotations = (Annotations)attrs[i];
- AnnotationEntry[] annotationEntries = runtimeAnnotations.getAnnotationEntries();
- for (int j = 0; j < annotationEntries.length; j++) {
- AnnotationEntry element = annotationEntries[j];
- addAnnotationEntry(new AnnotationEntryGen(element,cp,false));
- }
- } else {
- addAttribute(attrs[i]);
- }
- }
- }
-
-
- private void setValue( int index ) {
- ConstantPool cp = this.cp.getConstantPool();
- Constant c = cp.getConstant(index);
- value = ((ConstantObject) c).getConstantValue(cp);
- }
-
-
- /**
- * Set (optional) initial value of field, otherwise it will be set to null/0/false
- * by the JVM automatically.
- */
- public void setInitValue( String str ) {
- checkType(new ObjectType("java.lang.String"));
- if (str != null) {
- value = str;
- }
- }
-
-
- public void setInitValue( long l ) {
- checkType(Type.LONG);
- if (l != 0L) {
- value = new Long(l);
- }
- }
-
-
- public void setInitValue( int i ) {
- checkType(Type.INT);
- if (i != 0) {
- value = new Integer(i);
- }
- }
-
-
- public void setInitValue( short s ) {
- checkType(Type.SHORT);
- if (s != 0) {
- value = new Integer(s);
- }
- }
-
-
- public void setInitValue( char c ) {
- checkType(Type.CHAR);
- if (c != 0) {
- value = new Integer(c);
- }
- }
-
-
- public void setInitValue( byte b ) {
- checkType(Type.BYTE);
- if (b != 0) {
- value = new Integer(b);
- }
- }
-
-
- public void setInitValue( boolean b ) {
- checkType(Type.BOOLEAN);
- if (b) {
- value = new Integer(1);
- }
- }
-
-
- public void setInitValue( float f ) {
- checkType(Type.FLOAT);
- if (f != 0.0) {
- value = new Float(f);
- }
- }
-
-
- public void setInitValue( double d ) {
- checkType(Type.DOUBLE);
- if (d != 0.0) {
- value = new Double(d);
- }
- }
-
-
- /** Remove any initial value.
- */
- public void cancelInitValue() {
- value = null;
- }
-
-
- private void checkType( Type atype ) {
- if (type == null) {
- throw new ClassGenException("You haven't defined the type of the field yet");
- }
- if (!isFinal()) {
- throw new ClassGenException("Only final fields may have an initial value!");
- }
- if (!type.equals(atype)) {
- throw new ClassGenException("Types are not compatible: " + type + " vs. " + atype);
- }
- }
+
- /**
- * Get field object after having set up all necessary values.
- */
- public Field getField() {
- String signature = getSignature();
- int name_index = cp.addUtf8(name);
- int signature_index = cp.addUtf8(signature);
- if (value != null) {
- checkType(type);
- int index = addConstant();
- addAttribute(new ConstantValue(cp.addUtf8("ConstantValue"), 2, index, cp
- .getConstantPool()));
- }
- addAnnotationsAsAttribute(cp);
- return new Field(access_flags, name_index, signature_index, getAttributes(), cp
- .getConstantPool());
- }
- private void addAnnotationsAsAttribute(ConstantPoolGen cp) {
- Attribute[] attrs = Utility.getAnnotationAttributes(cp,annotation_vec);
- for (int i = 0; i < attrs.length; i++) {
- addAttribute(attrs[i]);
- }
- }
-
-
- private int addConstant() {
- switch (type.getType()) {
- case Constants.T_INT:
- case Constants.T_CHAR:
- case Constants.T_BYTE:
- case Constants.T_BOOLEAN:
- case Constants.T_SHORT:
- return cp.addInteger(((Integer) value).intValue());
- case Constants.T_FLOAT:
- return cp.addFloat(((Float) value).floatValue());
- case Constants.T_DOUBLE:
- return cp.addDouble(((Double) value).doubleValue());
- case Constants.T_LONG:
- return cp.addLong(((Long) value).longValue());
- case Constants.T_REFERENCE:
- return cp.addString(((String) value));
- default:
- throw new RuntimeException("Oops: Unhandled : " + type.getType());
- }
- }
public String getSignature() {
@@ -262,36 +63,13 @@
private List observers;
- /** Add observer for this object.
- */
- public void addObserver( FieldObserver o ) {
- if (observers == null) {
- observers = new ArrayList();
- }
- observers.add(o);
- }
+
- /** Remove observer for this object.
- */
- public void removeObserver( FieldObserver o ) {
- if (observers != null) {
- observers.remove(o);
- }
- }
+
- /** Call notify() method on all observers. This method is not called
- * automatically whenever the state has changed, but has to be
- * called by the user after he has finished editing the object.
- */
- public void update() {
- if (observers != null) {
- for (Iterator e = observers.iterator(); e.hasNext();) {
- ((FieldObserver) e.next()).notify(this);
- }
- }
- }
+
public String getInitValue() {
@@ -325,29 +103,13 @@
}
- /** @return deep copy of this field
- */
- public FieldGen copy( ConstantPoolGen cp ) {
- FieldGen fg = (FieldGen) clone();
- fg.setConstantPool(cp);
- return fg;
- }
+
- /**
- * @return Comparison strategy object
- */
- public static BCELComparator getComparator() {
- return _cmp;
- }
+
- /**
- * @param comparator Comparison strategy object
- */
- public static void setComparator( BCELComparator comparator ) {
- _cmp = comparator;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java Sat Dec 5 23:22:46 2009
@@ -50,9 +50,7 @@
}
- public Type getType() {
- return type;
- }
+
/** @return name of method/field.
@@ -67,9 +65,7 @@
}
- public ConstantPoolGen getConstantPool() {
- return cp;
- }
+
public void setConstantPool( ConstantPoolGen cp ) {
@@ -89,36 +85,17 @@
attribute_vec.add(a);
}
- public void addAnnotationEntry(AnnotationEntryGen ag)
- {
- annotation_vec.add(ag);
- }
+
- /**
- * Remove an attribute.
- */
- public void removeAttribute( Attribute a ) {
- attribute_vec.remove(a);
- }
- public void removeAnnotationEntry(AnnotationEntryGen ag)
- {
- annotation_vec.remove(ag);
- }
+
+
- /**
- * Remove all attributes.
- */
- public void removeAttributes() {
- attribute_vec.clear();
- }
- public void removeAnnotationEntries()
- {
- annotation_vec.clear();
- }
+
+
/**
@@ -130,11 +107,7 @@
return attributes;
}
- public AnnotationEntryGen[] getAnnotationEntries() {
- AnnotationEntryGen[] annotations = new AnnotationEntryGen[annotation_vec.size()];
- annotation_vec.toArray(annotations);
- return annotations;
- }
+
/** @return signature of method/field.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java Sat Dec 5 23:22:46 2009
@@ -34,12 +34,7 @@
}
- /**
- * @param index to constant pool
- */
- protected FieldInstruction(short opcode, int index) {
- super(opcode, index);
- }
+
/**
@@ -72,9 +67,5 @@
}
- /** @return name of referenced field.
- */
- public String getFieldName( ConstantPoolGen cpg ) {
- return getName(cpg);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java Sat Dec 5 23:22:46 2009
@@ -38,12 +38,7 @@
}
- /**
- * @param index to constant pool
- */
- protected FieldOrMethod(short opcode, int index) {
- super(opcode, index);
- }
+
/** @return signature of referenced method/field.
@@ -56,14 +51,7 @@
}
- /** @return name of referenced method/field.
- */
- public String getName( ConstantPoolGen cpg ) {
- ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
- ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(cmr.getNameAndTypeIndex());
- return ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes();
- }
+
/** @return name of the referenced class/interface
@@ -88,41 +76,11 @@
}
- /** @return type of the referenced class/interface
- * @deprecated If the instruction references an array class,
- * the ObjectType returned will be invalid. Use
- * getReferenceType() instead.
- */
- public ObjectType getClassType( ConstantPoolGen cpg ) {
- return new ObjectType(getClassName(cpg));
- }
+
- /**
- * Return the reference type representing the class, interface,
- * or array class referenced by the instruction.
- * @param cpg the ConstantPoolGen used to create the instruction
- * @return an ObjectType (if the referenced class type is a class
- * or interface), or an ArrayType (if the referenced class
- * type is an array class)
- */
- public ReferenceType getReferenceType( ConstantPoolGen cpg ) {
- ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
- String className = cp.getConstantString(cmr.getClassIndex(),
- org.apache.tomcat.util.bcel.Constants.CONSTANT_Class);
- if (className.startsWith("[")) {
- return (ArrayType) Type.getType(className);
- } else {
- className = className.replace('/', '.');
- return new ObjectType(className);
- }
- }
+
- /** @return type of the referenced class/interface
- */
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
- return getClassType(cpg);
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java Sat Dec 5 23:22:46 2009
@@ -28,12 +28,7 @@
*/
public final class ConstantMethodref extends ConstantCP {
- /**
- * Initialize from another object.
- */
- public ConstantMethodref(ConstantMethodref c) {
- super(Constants.CONSTANT_Methodref, c.getClassIndex(), c.getNameAndTypeIndex());
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java Sat Dec 5 23:22:46 2009
@@ -38,12 +38,7 @@
private int signature_index; // and its signature.
- /**
- * Initialize from another object.
- */
- public ConstantNameAndType(ConstantNameAndType c) {
- this(c.getNameIndex(), c.getSignatureIndex());
- }
+
/**
@@ -101,11 +96,7 @@
}
- /** @return name
- */
- public final String getName( ConstantPool cp ) {
- return cp.constantToString(getNameIndex(), Constants.CONSTANT_Utf8);
- }
+
/**
@@ -116,27 +107,13 @@
}
- /** @return signature
- */
- public final String getSignature( ConstantPool cp ) {
- return cp.constantToString(getSignatureIndex(), Constants.CONSTANT_Utf8);
- }
+
- /**
- * @param name_index the name index of this constant
- */
- public final void setNameIndex( int name_index ) {
- this.name_index = name_index;
- }
+
- /**
- * @param signature_index the signature index in the constant pool of this type
- */
- public final void setSignatureIndex( int signature_index ) {
- this.signature_index = signature_index;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java Sat Dec 5 23:22:46 2009
@@ -26,7 +26,5 @@
*/
public interface ConstantObject {
- /** @return object representing the constant, e.g., Long for ConstantLong
- */
- public abstract Object getConstantValue( ConstantPool cp );
+
}
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
import org.apache.tomcat.util.bcel.Constants;
@@ -80,16 +79,7 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitConstantPool(this);
- }
+
/**
@@ -191,20 +181,7 @@
}
- /**
- * Dump constant pool to file stream in binary format.
- *
- * @param file Output file stream
- * @throws IOException
- */
- public void dump( DataOutputStream file ) throws IOException {
- file.writeShort(constant_pool_count);
- for (int i = 1; i < constant_pool_count; i++) {
- if (constant_pool[i] != null) {
- constant_pool[i].dump(file);
- }
- }
- }
+
/**
@@ -247,13 +224,7 @@
}
- /**
- * @return Array of constants.
- * @see Constant
- */
- public Constant[] getConstantPool() {
- return constant_pool;
- }
+
/**
@@ -304,12 +275,7 @@
}
- /**
- * @param constant Constant to set
- */
- public void setConstant( int index, Constant constant ) {
- constant_pool[index] = constant;
- }
+
/**
@@ -333,21 +299,5 @@
}
- /**
- * @return deep copy of this constant pool
- */
- public ConstantPool copy() {
- ConstantPool c = null;
- try {
- c = (ConstantPool) clone();
- c.constant_pool = new Constant[constant_pool_count];
- for (int i = 1; i < constant_pool_count; i++) {
- if (constant_pool[i] != null) {
- c.constant_pool[i] = constant_pool[i].copy();
- }
- }
- } catch (CloneNotSupportedException e) {
- }
- return c;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java Sat Dec 5 23:22:46 2009
@@ -36,12 +36,7 @@
private int string_index; // Identical to ConstantClass except for this name
- /**
- * Initialize from another object.
- */
- public ConstantString(ConstantString c) {
- this(c.getStringIndex());
- }
+
/**
@@ -96,12 +91,7 @@
}
- /**
- * @param string_index the index into the constant of the string value
- */
- public final void setStringIndex( int string_index ) {
- this.string_index = string_index;
- }
+
/**
@@ -112,17 +102,8 @@
}
- /** @return String object
- */
- public Object getConstantValue( ConstantPool cp ) {
- Constant c = cp.getConstant(string_index, Constants.CONSTANT_Utf8);
- return ((ConstantUtf8) c).getBytes();
- }
+
- /** @return dereferenced string
- */
- public String getBytes( ConstantPool cp ) {
- return (String) getConstantValue(cp);
- }
+
}
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -36,12 +36,7 @@
private String bytes;
- /**
- * Initialize from another object.
- */
- public ConstantUtf8(ConstantUtf8 c) {
- this(c.getBytes());
- }
+
/**
@@ -100,12 +95,7 @@
}
- /**
- * @param bytes the raw bytes of this Utf-8
- */
- public final void setBytes( String bytes ) {
- this.bytes = bytes;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java Sat Dec 5 23:22:46 2009
@@ -36,13 +36,7 @@
private int constantvalue_index;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public ConstantValue(ConstantValue c) {
- this(c.getNameIndex(), c.getLength(), c.getConstantValueIndex(), c.getConstantPool());
- }
+
/**
@@ -96,20 +90,10 @@
}
- /**
- * @return Index in constant pool of constant value.
- */
- public final int getConstantValueIndex() {
- return constantvalue_index;
- }
+
- /**
- * @param constantvalue_index the index info the constant pool of this constant value
- */
- public final void setConstantValueIndex( int constantvalue_index ) {
- this.constantvalue_index = constantvalue_index;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.java Sat Dec 5 23:22:46 2009
@@ -35,13 +35,7 @@
private byte[] bytes;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public Deprecated(Deprecated c) {
- this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool());
- }
+
/**
@@ -101,20 +95,10 @@
}
- /**
- * @return data bytes.
- */
- public final byte[] getBytes() {
- return bytes;
- }
+
- /**
- * @param bytes the raw bytes that represents this byte array
- */
- public final void setBytes( byte[] bytes ) {
- this.bytes = bytes;
- }
+
/**
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -133,10 +133,5 @@
}
}
- public String toShortString()
- {
- StringBuffer result = new StringBuffer();
- result.append(stringifyValue());
- return result.toString();
- }
+
}
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -60,13 +60,7 @@
return elementNameIndex;
}
- public String toShortString()
- {
- StringBuffer result = new StringBuffer();
- result.append(getNameString()).append("=").append(
- getValue().toShortString());
- return result.toString();
- }
+
protected void dump(DataOutputStream dos) throws IOException {
dos.writeShort(elementNameIndex); // u2 name of the element
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java Sat Dec 5 23:22:46 2009
@@ -59,25 +59,15 @@
// return (EnclosingMethod)clone();
}
- // Accessors
- public final int getEnclosingClassIndex() { return classIndex; }
- public final int getEnclosingMethodIndex(){ return methodIndex;}
+
+
+
+
- public final void setEnclosingClassIndex(int idx) {classIndex = idx;}
- public final void setEnclosingMethodIndex(int idx){methodIndex= idx;}
- public final ConstantClass getEnclosingClass() {
- ConstantClass c =
- (ConstantClass)constant_pool.getConstant(classIndex,Constants.CONSTANT_Class);
- return c;
- }
- public final ConstantNameAndType getEnclosingMethod() {
- if (methodIndex == 0) return null;
- ConstantNameAndType nat =
- (ConstantNameAndType)constant_pool.getConstant(methodIndex,Constants.CONSTANT_NameAndType);
- return nat;
- }
+
+
public final void dump(DataOutputStream file) throws IOException {
super.dump(file);
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java Sat Dec 5 23:22:46 2009
@@ -39,13 +39,7 @@
private int[] exception_index_table; // constant pool
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use copy() for a physical copy.
- */
- public ExceptionTable(ExceptionTable c) {
- this(c.getNameIndex(), c.getLength(), c.getExceptionIndexTable(), c.getConstantPool());
- }
+
/**
@@ -107,33 +101,13 @@
}
- /**
- * @return Array of indices into constant pool of thrown exceptions.
- */
- public final int[] getExceptionIndexTable() {
- return exception_index_table;
- }
+
- /**
- * @return Length of exception table.
- */
- public final int getNumberOfExceptions() {
- return number_of_exceptions;
- }
+
- /**
- * @return class names of thrown exceptions
- */
- public final String[] getExceptionNames() {
- String[] names = new String[number_of_exceptions];
- for (int i = 0; i < number_of_exceptions; i++) {
- names[i] = constant_pool.getConstantString(exception_index_table[i],
- Constants.CONSTANT_Class).replace('/', '.');
- }
- return names;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java Sat Dec 5 23:22:46 2009
@@ -19,7 +19,6 @@
import java.io.DataInputStream;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.generic.Type;
import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
@@ -48,13 +47,7 @@
};
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public Field(Field c) {
- super(c);
- }
+
/**
@@ -67,29 +60,10 @@
}
- /**
- * @param access_flags Access rights of field
- * @param name_index Points to field name in constant pool
- * @param signature_index Points to encoded signature
- * @param attributes Collection of attributes
- * @param constant_pool Array of constants
- */
- public Field(int access_flags, int name_index, int signature_index, Attribute[] attributes,
- ConstantPool constant_pool) {
- super(access_flags, name_index, signature_index, attributes, constant_pool);
- }
+
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitField(this);
- }
+
/**
@@ -134,36 +108,16 @@
}
- /**
- * @return deep copy of this field
- */
- public final Field copy( ConstantPool _constant_pool ) {
- return (Field) copy_(_constant_pool);
- }
+
- /**
- * @return type of field
- */
- public Type getType() {
- return Type.getReturnType(getSignature());
- }
+
- /**
- * @return Comparison strategy object
- */
- public static BCELComparator getComparator() {
- return _cmp;
- }
+
- /**
- * @param comparator Comparison strategy object
- */
- public static void setComparator( BCELComparator comparator ) {
- _cmp = comparator;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java Sat Dec 5 23:22:46 2009
@@ -17,13 +17,9 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.tomcat.util.bcel.Constants;
import org.apache.tomcat.util.bcel.classfile.Attribute;
-import org.apache.tomcat.util.bcel.classfile.Signature;
/**
* Abstract super class for fields and methods.
@@ -37,7 +33,7 @@
protected int signature_index; // Points to encoded signature
protected int attributes_count; // No. of attributes
protected Attribute[] attributes; // Collection of attributes
- protected AnnotationEntry[] annotationEntries; // annotations defined on the field or method
+
protected ConstantPool constant_pool;
private String signatureAttributeString = null;
@@ -51,14 +47,7 @@
}
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- protected FieldOrMethod(FieldOrMethod c) {
- this(c.getAccessFlags(), c.getNameIndex(), c.getSignatureIndex(), c.getAttributes(), c
- .getConstantPool());
- }
+
/**
@@ -96,29 +85,10 @@
}
- /**
- * Dump object to file stream on binary format.
- *
- * @param file Output file stream
- * @throws IOException
- */
- public final void dump( DataOutputStream file ) throws IOException {
- file.writeShort(access_flags);
- file.writeShort(name_index);
- file.writeShort(signature_index);
- file.writeShort(attributes_count);
- for (int i = 0; i < attributes_count; i++) {
- attributes[i].dump(file);
- }
- }
+
- /**
- * @return Collection of object attributes.
- */
- public final Attribute[] getAttributes() {
- return attributes;
- }
+
/**
@@ -130,52 +100,22 @@
}
- /**
- * @return Constant pool used by this object.
- */
- public final ConstantPool getConstantPool() {
- return constant_pool;
- }
+
- /**
- * @param constant_pool Constant pool to be used for this object.
- */
- public final void setConstantPool( ConstantPool constant_pool ) {
- this.constant_pool = constant_pool;
- }
+
- /**
- * @return Index in constant pool of object's name.
- */
- public final int getNameIndex() {
- return name_index;
- }
+
- /**
- * @param name_index Index in constant pool of object's name.
- */
- public final void setNameIndex( int name_index ) {
- this.name_index = name_index;
- }
+
- /**
- * @return Index in constant pool of field signature.
- */
- public final int getSignatureIndex() {
- return signature_index;
- }
+
- /**
- * @param signature_index Index in constant pool of field signature.
- */
- public final void setSignatureIndex( int signature_index ) {
- this.signature_index = signature_index;
- }
+
/**
@@ -198,93 +138,11 @@
}
- /**
- * @return deep copy of this field
- */
- protected FieldOrMethod copy_( ConstantPool _constant_pool ) {
- FieldOrMethod c = null;
-
- try {
- c = (FieldOrMethod)clone();
- } catch(CloneNotSupportedException e) {}
+
- c.constant_pool = constant_pool;
- c.attributes = new Attribute[attributes_count];
+
- for(int i=0; i < attributes_count; i++)
- c.attributes[i] = attributes[i].copy(constant_pool);
+
- return c;
- }
-
- /**
- * Ensure we have unpacked any attributes that contain annotations.
- * We don't remove these annotation attributes from the attributes list, they
- * remain there.
- */
- private void ensureAnnotationsUpToDate()
- {
- if (annotationsOutOfDate)
- {
- // Find attributes that contain annotation data
- Attribute[] attrs = getAttributes();
- List accumulatedAnnotations = new ArrayList();
- for (int i = 0; i < attrs.length; i++)
- {
- Attribute attribute = attrs[i];
- if (attribute instanceof Annotations)
- {
- Annotations annotations = (Annotations) attribute;
- for (int j = 0; j < annotations.getAnnotationEntries().length; j++)
- {
- accumulatedAnnotations.add(annotations
- .getAnnotationEntries()[j]);
- }
- }
- }
- annotationEntries = (AnnotationEntry[]) accumulatedAnnotations
- .toArray(new AnnotationEntry[accumulatedAnnotations.size()]);
- annotationsOutOfDate = false;
- }
- }
-
- public AnnotationEntry[] getAnnotationEntries()
- {
- ensureAnnotationsUpToDate();
- return annotationEntries;
- }
-
- public void addAnnotationEntry(AnnotationEntry a)
- {
- ensureAnnotationsUpToDate();
- int len = annotationEntries.length;
- AnnotationEntry[] newAnnotations = new AnnotationEntry[len + 1];
- System.arraycopy(annotationEntries, 0, newAnnotations, 0, len);
- newAnnotations[len] = a;
- annotationEntries = newAnnotations;
- }
-
- /**
- * Hunts for a signature attribute on the member and returns its contents. So where the 'regular' signature
- * may be (Ljava/util/Vector;)V the signature attribute may in fact say 'Ljava/lang/Vector<Ljava/lang/String>;'
- * Coded for performance - searches for the attribute only when requested - only searches for it once.
- */
- public final String getGenericSignature()
- {
- if (!searchedForSignatureAttribute)
- {
- boolean found = false;
- for (int i = 0; !found && i < attributes_count; i++)
- {
- if (attributes[i] instanceof Signature)
- {
- signatureAttributeString = ((Signature) attributes[i])
- .getSignature();
- found = true;
- }
- }
- searchedForSignatureAttribute = true;
- }
- return signatureAttributeString;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java Sat Dec 5 23:22:46 2009
@@ -40,13 +40,7 @@
private int inner_access_flags;
- /**
- * Initialize from another object.
- */
- public InnerClass(InnerClass c) {
- this(c.getInnerClassIndex(), c.getOuterClassIndex(), c.getInnerNameIndex(), c
- .getInnerAccessFlags());
- }
+
/**
@@ -75,16 +69,7 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitInnerClass(this);
- }
+
/**
@@ -101,68 +86,28 @@
}
- /**
- * @return access flags of inner class.
- */
- public final int getInnerAccessFlags() {
- return inner_access_flags;
- }
+
- /**
- * @return class index of inner class.
- */
- public final int getInnerClassIndex() {
- return inner_class_index;
- }
+
- /**
- * @return name index of inner class.
- */
- public final int getInnerNameIndex() {
- return inner_name_index;
- }
+
- /**
- * @return class index of outer class.
- */
- public final int getOuterClassIndex() {
- return outer_class_index;
- }
+
- /**
- * @param inner_access_flags access flags for this inner class
- */
- public final void setInnerAccessFlags( int inner_access_flags ) {
- this.inner_access_flags = inner_access_flags;
- }
+
- /**
- * @param inner_class_index index into the constant pool for this class
- */
- public final void setInnerClassIndex( int inner_class_index ) {
- this.inner_class_index = inner_class_index;
- }
+
- /**
- * @param inner_name_index index into the constant pool for this class's name
- */
- public final void setInnerNameIndex( int inner_name_index ) {
- this.inner_name_index = inner_name_index;
- }
+
- /**
- * @param outer_class_index index into the constant pool for the owning class
- */
- public final void setOuterClassIndex( int outer_class_index ) {
- this.outer_class_index = outer_class_index;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java Sat Dec 5 23:22:46 2009
@@ -37,13 +37,7 @@
private int number_of_classes;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public InnerClasses(InnerClasses c) {
- this(c.getNameIndex(), c.getLength(), c.getInnerClasses(), c.getConstantPool());
- }
+
/**
@@ -106,12 +100,7 @@
}
- /**
- * @return array of inner class "records"
- */
- public final InnerClass[] getInnerClasses() {
- return inner_classes;
- }
+
/**
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -16,19 +16,12 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeSet;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.generic.Type;
import org.apache.tomcat.util.bcel.util.BCELComparator;
import org.apache.tomcat.util.bcel.util.ClassQueue;
import org.apache.tomcat.util.bcel.util.SyntheticRepository;
@@ -69,8 +62,8 @@
public static final byte HEAP = 1;
public static final byte FILE = 2;
public static final byte ZIP = 3;
- static boolean debug = false; // Debugging on/off
- static char sep = '/'; // directory separator
+
+
// Annotations are collected from certain attributes, don't do it more than necessary!
private boolean annotationsOutOfDate = true;
@@ -179,153 +172,28 @@
}
- /**
- * Constructor gets all contents as arguments.
- *
- * @param class_name_index Class name
- * @param superclass_name_index Superclass name
- * @param file_name File name
- * @param major Major compiler version
- * @param minor Minor compiler version
- * @param access_flags Access rights defined by bit flags
- * @param constant_pool Array of constants
- * @param interfaces Implemented interfaces
- * @param fields Class fields
- * @param methods Class methods
- * @param attributes Class attributes
- */
- public JavaClass(int class_name_index, int superclass_name_index, String file_name, int major,
- int minor, int access_flags, ConstantPool constant_pool, int[] interfaces,
- Field[] fields, Method[] methods, Attribute[] attributes) {
- this(class_name_index, superclass_name_index, file_name, major, minor, access_flags,
- constant_pool, interfaces, fields, methods, attributes, HEAP);
- }
+
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitJavaClass(this);
- }
+
- /* Print debug information depending on `JavaClass.debug'
- */
- static final void Debug( String str ) {
- if (debug) {
- System.out.println(str);
- }
- }
+
- /**
- * Dump class to a file.
- *
- * @param file Output file
- * @throws IOException
- */
- public void dump( File file ) throws IOException {
- String parent = file.getParent();
- if (parent != null) {
- File dir = new File(parent);
- dir.mkdirs();
- }
- DataOutputStream dos = null;
- try {
- dos = new DataOutputStream(new FileOutputStream(file));
- dump(dos);
- } finally {
- if (dos != null) {
- dos.close();
- }
- }
- }
+
- /**
- * Dump class to a file named file_name.
- *
- * @param _file_name Output file name
- * @exception IOException
- */
- public void dump( String _file_name ) throws IOException {
- dump(new File(_file_name));
- }
+
- /**
- * @return class in binary format
- */
- public byte[] getBytes() {
- ByteArrayOutputStream s = new ByteArrayOutputStream();
- DataOutputStream ds = new DataOutputStream(s);
- try {
- dump(ds);
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- ds.close();
- } catch (IOException e2) {
- e2.printStackTrace();
- }
- }
- return s.toByteArray();
- }
+
- /**
- * Dump Java class to output stream in binary format.
- *
- * @param file Output stream
- * @exception IOException
- */
- public void dump( OutputStream file ) throws IOException {
- dump(new DataOutputStream(file));
- }
+
- /**
- * Dump Java class to output stream in binary format.
- *
- * @param file Output stream
- * @exception IOException
- */
- public void dump( DataOutputStream file ) throws IOException {
- file.writeInt(0xcafebabe);
- file.writeShort(minor);
- file.writeShort(major);
- constant_pool.dump(file);
- file.writeShort(access_flags);
- file.writeShort(class_name_index);
- file.writeShort(superclass_name_index);
- file.writeShort(interfaces.length);
- for (int i = 0; i < interfaces.length; i++) {
- file.writeShort(interfaces[i]);
- }
- file.writeShort(fields.length);
- for (int i = 0; i < fields.length; i++) {
- fields[i].dump(file);
- }
- file.writeShort(methods.length);
- for (int i = 0; i < methods.length; i++) {
- methods[i].dump(file);
- }
- if (attributes != null) {
- file.writeShort(attributes.length);
- for (int i = 0; i < attributes.length; i++) {
- attributes[i].dump(file);
- }
- } else {
- file.writeShort(0);
- }
- file.flush();
- }
+
/**
@@ -361,46 +229,19 @@
}
- /**
- * @return Package name.
- */
- public String getPackageName() {
- return package_name;
- }
+
- /**
- * @return Class name index.
- */
- public int getClassNameIndex() {
- return class_name_index;
- }
+
- /**
- * @return Constant pool.
- */
- public ConstantPool getConstantPool() {
- return constant_pool;
- }
+
- /**
- * @return Fields, i.e., variables of the class. Like the JVM spec
- * mandates for the classfile format, these fields are those specific to
- * this class, and not those of the superclass or superinterfaces.
- */
- public Field[] getFields() {
- return fields;
- }
+
- /**
- * @return File name of class, aka SourceFile attribute value
- */
- public String getFileName() {
- return file_name;
- }
+
/**
@@ -411,60 +252,22 @@
}
- /**
- * @return Indices in constant pool of implemented interfaces.
- */
- public int[] getInterfaceIndices() {
- return interfaces;
- }
+
- /**
- * @return Major number of class file version.
- */
- public int getMajor() {
- return major;
- }
+
- /**
- * @return Methods of the class.
- */
- public Method[] getMethods() {
- return methods;
- }
+
- /**
- * @return A org.apache.tomcat.util.bcel.classfile.Method corresponding to
- * java.lang.reflect.Method if any
- */
- public Method getMethod( java.lang.reflect.Method m ) {
- for (int i = 0; i < methods.length; i++) {
- Method method = methods[i];
- if (m.getName().equals(method.getName()) && (m.getModifiers() == method.getModifiers())
- && Type.getSignature(m).equals(method.getSignature())) {
- return method;
- }
- }
- return null;
- }
+
- /**
- * @return Minor number of class file version.
- */
- public int getMinor() {
- return minor;
- }
+
- /**
- * @return sbsolute path to file where this class was read from
- */
- public String getSourceFileName() {
- return source_file_name;
- }
+
/**
@@ -476,139 +279,6 @@
/**
- * @return Class name index.
- */
- public int getSuperclassNameIndex() {
- return superclass_name_index;
- }
-
- static {
- // Debugging ... on/off
- debug = Boolean.getBoolean("JavaClass.debug");
- // Get path separator either / or \ usually
- String _sep = System.getProperty("file.separator");
- if (_sep != null) {
- try {
- JavaClass.sep = _sep.charAt(0);
- } catch (StringIndexOutOfBoundsException e) {
- } // Never reached
- }
- }
-
-
- /**
- * @param attributes .
- */
- public void setAttributes( Attribute[] attributes ) {
- this.attributes = attributes;
- }
-
-
- /**
- * @param class_name .
- */
- public void setClassName( String class_name ) {
- this.class_name = class_name;
- }
-
-
- /**
- * @param class_name_index .
- */
- public void setClassNameIndex( int class_name_index ) {
- this.class_name_index = class_name_index;
- }
-
-
- /**
- * @param constant_pool .
- */
- public void setConstantPool( ConstantPool constant_pool ) {
- this.constant_pool = constant_pool;
- }
-
-
- /**
- * @param fields .
- */
- public void setFields( Field[] fields ) {
- this.fields = fields;
- }
-
-
- /**
- * Set File name of class, aka SourceFile attribute value
- */
- public void setFileName( String file_name ) {
- this.file_name = file_name;
- }
-
-
- /**
- * @param interface_names .
- */
- public void setInterfaceNames( String[] interface_names ) {
- this.interface_names = interface_names;
- }
-
-
- /**
- * @param interfaces .
- */
- public void setInterfaces( int[] interfaces ) {
- this.interfaces = interfaces;
- }
-
-
- /**
- * @param major .
- */
- public void setMajor( int major ) {
- this.major = major;
- }
-
-
- /**
- * @param methods .
- */
- public void setMethods( Method[] methods ) {
- this.methods = methods;
- }
-
-
- /**
- * @param minor .
- */
- public void setMinor( int minor ) {
- this.minor = minor;
- }
-
-
- /**
- * Set absolute path to file this class was read from.
- */
- public void setSourceFileName( String source_file_name ) {
- this.source_file_name = source_file_name;
- }
-
-
- /**
- * @param superclass_name .
- */
- public void setSuperclassName( String superclass_name ) {
- this.superclass_name = superclass_name;
- }
-
-
- /**
- * @param superclass_name_index .
- */
- public void setSuperclassNameIndex( int superclass_name_index ) {
- this.superclass_name_index = superclass_name_index;
- }
-
-
- /**
* @return String representing class contents.
*/
public String toString() {
@@ -673,32 +343,7 @@
}
- /**
- * @return deep copy of this class
- */
- public JavaClass copy() {
- JavaClass c = null;
- try {
- c = (JavaClass) clone();
- c.constant_pool = constant_pool.copy();
- c.interfaces = (int[]) interfaces.clone();
- c.interface_names = (String[]) interface_names.clone();
- c.fields = new Field[fields.length];
- for (int i = 0; i < fields.length; i++) {
- c.fields[i] = fields[i].copy(c.constant_pool);
- }
- c.methods = new Method[methods.length];
- for (int i = 0; i < methods.length; i++) {
- c.methods[i] = methods[i].copy(c.constant_pool);
- }
- c.attributes = new Attribute[attributes.length];
- for (int i = 0; i < attributes.length; i++) {
- c.attributes[i] = attributes[i].copy(c.constant_pool);
- }
- } catch (CloneNotSupportedException e) {
- }
- return c;
- }
+
public final boolean isSuper() {
@@ -706,63 +351,12 @@
}
- public final boolean isClass() {
- return (access_flags & Constants.ACC_INTERFACE) == 0;
- }
- public final boolean isAnonymous() {
- computeNestedTypeStatus();
- return this.isAnonymous;
- }
- public final boolean isNested() {
- computeNestedTypeStatus();
- return this.isNested;
- }
- private final void computeNestedTypeStatus() {
- if (computedNestedTypeStatus) return;
- for (int i = 0; i < this.attributes.length; i++) {
- if (this.attributes[i] instanceof InnerClasses) {
- InnerClass[] innerClasses = ((InnerClasses) this.attributes[i]).getInnerClasses();
- for (int j = 0; j < innerClasses.length; j++) {
- boolean innerClassAttributeRefersToMe = false;
- String inner_class_name = constant_pool.getConstantString(innerClasses[j].getInnerClassIndex(),
- Constants.CONSTANT_Class);
- inner_class_name = Utility.compactClassName(inner_class_name);
- if (inner_class_name.equals(getClassName())) {
- innerClassAttributeRefersToMe = true;
- }
- if (innerClassAttributeRefersToMe) {
- this.isNested = true;
- if (innerClasses[j].getInnerNameIndex() == 0) {
- this.isAnonymous = true;
- }
- }
- }
- }
- }
- this.computedNestedTypeStatus = true;
- }
-
-
- /** @return returns either HEAP (generated), FILE, or ZIP
- */
- public final byte getSource() {
- return source;
- }
-
-
- /********************* New repository functionality *********************/
- /**
- * Gets the ClassRepository which holds its definition. By default
- * this is the same as SyntheticRepository.getInstance();
- */
- public org.apache.tomcat.util.bcel.util.Repository getRepository() {
- return repository;
- }
-
-
+
+
+
/**
* Sets the ClassRepository which loaded the JavaClass.
* Should be called immediately after parsing is done.
@@ -884,20 +478,10 @@
}
- /**
- * @return Comparison strategy object
- */
- public static BCELComparator getComparator() {
- return _cmp;
- }
+
- /**
- * @param comparator Comparison strategy object
- */
- public static void setComparator( BCELComparator comparator ) {
- _cmp = comparator;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java Sat Dec 5 23:22:46 2009
@@ -36,12 +36,7 @@
private int line_number; // number in source file
- /**
- * Initialize from another object.
- */
- public LineNumber(LineNumber c) {
- this(c.getStartPC(), c.getLineNumber());
- }
+
/**
@@ -64,16 +59,7 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLineNumber(this);
- }
+
/**
@@ -88,36 +74,16 @@
}
- /**
- * @return Corresponding source line
- */
- public final int getLineNumber() {
- return line_number;
- }
+
- /**
- * @return PC in code
- */
- public final int getStartPC() {
- return start_pc;
- }
+
- /**
- * @param line_number the source line number
- */
- public final void setLineNumber( int line_number ) {
- this.line_number = line_number;
- }
+
- /**
- * @param start_pc the pc for this line number
- */
- public final void setStartPC( int start_pc ) {
- this.start_pc = start_pc;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java Sat Dec 5 23:22:46 2009
@@ -37,13 +37,7 @@
private LineNumber[] line_number_table; // Table of line/numbers pairs
- /*
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use copy() for a physical copy.
- */
- public LineNumberTable(LineNumberTable c) {
- this(c.getNameIndex(), c.getLength(), c.getLineNumberTable(), c.getConstantPool());
- }
+
/*
@@ -105,12 +99,7 @@
}
- /**
- * @return Array of (pc offset, line number) pairs.
- */
- public final LineNumber[] getLineNumberTable() {
- return line_number_table;
- }
+
/**
@@ -145,47 +134,7 @@
}
- /**
- * Map byte code positions to source code lines.
- *
- * @param pos byte code offset
- * @return corresponding line in source code
- */
- public int getSourceLine( int pos ) {
- int l = 0, r = line_number_table_length - 1;
- if (r < 0) {
- return -1;
- }
- int min_index = -1, min = -1;
- /* Do a binary search since the array is ordered.
- */
- do {
- int i = (l + r) / 2;
- int j = line_number_table[i].getStartPC();
- if (j == pos) {
- return line_number_table[i].getLineNumber();
- } else if (pos < j) {
- r = i - 1;
- } else {
- l = i + 1;
- }
- /* If exact match can't be found (which is the most common case)
- * return the line number that corresponds to the greatest index less
- * than pos.
- */
- if (j < pos && j > min) {
- min = j;
- min_index = i;
- }
- } while (l <= r);
- /* It's possible that we did not find any valid entry for the bytecode
- * offset we were looking for.
- */
- if (min_index < 0) {
- return -1;
- }
- return line_number_table[min_index].getLineNumber();
- }
+
/**
@@ -202,7 +151,5 @@
}
- public final int getTableLength() {
- return line_number_table_length;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java Sat Dec 5 23:22:46 2009
@@ -43,14 +43,7 @@
private ConstantPool constant_pool;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use copy() for a physical copy.
- */
- public LocalVariable(LocalVariable c) {
- this(c.getStartPC(), c.getLength(), c.getNameIndex(), c.getSignatureIndex(), c.getIndex(),
- c.getConstantPool());
- }
+
/**
@@ -83,16 +76,7 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLocalVariable(this);
- }
+
/**
@@ -110,20 +94,10 @@
}
- /**
- * @return Constant pool used by this object.
- */
- public final ConstantPool getConstantPool() {
- return constant_pool;
- }
+
- /**
- * @return Variable is valid within getStartPC() .. getStartPC()+getLength()
- */
- public final int getLength() {
- return length;
- }
+
/**
@@ -136,12 +110,7 @@
}
- /**
- * @return Index in constant pool of variable name.
- */
- public final int getNameIndex() {
- return name_index;
- }
+
/**
@@ -154,12 +123,7 @@
}
- /**
- * @return Index in constant pool of variable signature.
- */
- public final int getSignatureIndex() {
- return signature_index;
- }
+
/**
@@ -170,60 +134,25 @@
}
- /**
- * @return Start of range where he variable is valid
- */
- public final int getStartPC() {
- return start_pc;
- }
+
- /**
- * @param constant_pool Constant pool to be used for this object.
- */
- public final void setConstantPool( ConstantPool constant_pool ) {
- this.constant_pool = constant_pool;
- }
+
- /**
- * @param length the length of this local variable
- */
- public final void setLength( int length ) {
- this.length = length;
- }
+
- /**
- * @param name_index the index into the constant pool for the name of this variable
- */
- public final void setNameIndex( int name_index ) {
- this.name_index = name_index;
- }
+
- /**
- * @param signature_index the index into the constant pool for the signature of this variable
- */
- public final void setSignatureIndex( int signature_index ) {
- this.signature_index = signature_index;
- }
+
- /**
- * @param index the index in the local variable table of this variable
- */
- public final void setIndex( int index ) {
- this.index = index;
- }
+
- /**
- * @param start_pc Specify range where the local variable is valid.
- */
- public final void setStartPC( int start_pc ) {
- this.start_pc = start_pc;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java Sat Dec 5 23:22:46 2009
@@ -36,13 +36,7 @@
private LocalVariable[] local_variable_table; // variables
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use copy() for a physical copy.
- */
- public LocalVariableTable(LocalVariableTable c) {
- this(c.getNameIndex(), c.getLength(), c.getLocalVariableTable(), c.getConstantPool());
- }
+
/**
@@ -104,12 +98,7 @@
}
- /**
- * @return Array of local variables of method.
- */
- public final LocalVariable[] getLocalVariableTable() {
- return local_variable_table;
- }
+
/**
@@ -132,26 +121,7 @@
}
- /**
- * @return matching variable using index when variable is used at supplied pc
- *
- * @param index the variable slot
- * @param pc the current pc that this variable is alive
- *
- * @return the LocalVariable that matches or null if not found
- */
- public final LocalVariable getLocalVariable( int index, int pc ) {
- for (int i = 0; i < local_variable_table_length; i++) {
- if (local_variable_table[i].getIndex() == index) {
- int start_pc = local_variable_table[i].getStartPC();
- int end_pc = start_pc + local_variable_table[i].getLength();
- if ((pc >= start_pc) && (pc <= end_pc)) {
- return local_variable_table[i];
- }
- }
- }
- return null;
- }
+
public final void setLocalVariableTable( LocalVariable[] local_variable_table ) {
@@ -191,7 +161,5 @@
}
- public final int getTableLength() {
- return local_variable_table_length;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java Sat Dec 5 23:22:46 2009
@@ -48,10 +48,7 @@
private int local_variable_type_table_length; // Table of local
private LocalVariable[] local_variable_type_table; // variables
- public LocalVariableTypeTable(LocalVariableTypeTable c) {
- this(c.getNameIndex(), c.getLength(), c.getLocalVariableTypeTable(),
- c.getConstantPool());
- }
+
public LocalVariableTypeTable(int name_index, int length,
LocalVariable[] local_variable_table,
@@ -83,17 +80,9 @@
local_variable_type_table[i].dump(file);
}
- public final LocalVariable[] getLocalVariableTypeTable() {
- return local_variable_type_table;
- }
+
- public final LocalVariable getLocalVariable(int index) {
- for(int i=0; i < local_variable_type_table_length; i++)
- if(local_variable_type_table[i].getIndex() == index)
- return local_variable_type_table[i];
-
- return null;
- }
+
public final void setLocalVariableTable(LocalVariable[] local_variable_table)
{
@@ -131,5 +120,5 @@
return c;
}
- public final int getTableLength() { return local_variable_type_table_length; }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java Sat Dec 5 23:22:46 2009
@@ -19,7 +19,6 @@
import java.io.DataInputStream;
import java.io.IOException;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.generic.Type;
import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
@@ -57,13 +56,7 @@
}
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public Method(Method c) {
- super(c);
- }
+
/**
@@ -78,29 +71,10 @@
}
- /**
- * @param access_flags Access rights of method
- * @param name_index Points to field name in constant pool
- * @param signature_index Points to encoded signature
- * @param attributes Collection of attributes
- * @param constant_pool Array of constants
- */
- public Method(int access_flags, int name_index, int signature_index, Attribute[] attributes,
- ConstantPool constant_pool) {
- super(access_flags, name_index, signature_index, attributes, constant_pool);
- }
+
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitMethod(this);
- }
+
/**
@@ -142,16 +116,7 @@
}
- /** @return LineNumberTable of code attribute if any, i.e. the call is forwarded
- * to the Code atribute.
- */
- public final LineNumberTable getLineNumberTable() {
- Code code = getCode();
- if (code == null) {
- return null;
- }
- return code.getLineNumberTable();
- }
+
/**
@@ -190,44 +155,19 @@
}
- /**
- * @return deep copy of this method
- */
- public final Method copy( ConstantPool _constant_pool ) {
- return (Method) copy_(_constant_pool);
- }
+
- /**
- * @return return type of method
- */
- public Type getReturnType() {
- return Type.getReturnType(getSignature());
- }
+
- /**
- * @return array of method argument types
- */
- public Type[] getArgumentTypes() {
- return Type.getArgumentTypes(getSignature());
- }
+
- /**
- * @return Comparison strategy object
- */
- public static BCELComparator getComparator() {
- return _cmp;
- }
+
- /**
- * @param comparator Comparison strategy object
- */
- public static void setComparator( BCELComparator comparator ) {
- _cmp = comparator;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Node.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Node.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Node.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Node.java Sat Dec 5 23:22:46 2009
@@ -24,5 +24,5 @@
*/
public interface Node {
- public void accept( Visitor obj );
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java Sat Dec 5 23:22:46 2009
@@ -35,14 +35,7 @@
private int pmg_class_index, pmg_index;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public PMGClass(PMGClass c) {
- this(c.getNameIndex(), c.getLength(), c.getPMGIndex(), c.getPMGClassIndex(), c
- .getConstantPool());
- }
+
/**
@@ -99,36 +92,16 @@
}
- /**
- * @return Index in constant pool of source file name.
- */
- public final int getPMGClassIndex() {
- return pmg_class_index;
- }
+
- /**
- * @param pmg_class_index
- */
- public final void setPMGClassIndex( int pmg_class_index ) {
- this.pmg_class_index = pmg_class_index;
- }
+
- /**
- * @return Index in constant pool of source file name.
- */
- public final int getPMGIndex() {
- return pmg_index;
- }
+
- /**
- * @param pmg_index
- */
- public final void setPMGIndex( int pmg_index ) {
- this.pmg_index = pmg_index;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java Sat Dec 5 23:22:46 2009
@@ -48,30 +48,11 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- // v.visitParameterAnnotationEntry(this);
- }
+
- /**
- * @return the number of annotation entries in this parameter annotation
- */
- public final int getNumAnnotations() {
- return annotation_table_length;
- }
+
- /**
- * returns the array of annotation entries in this annotation
- */
- public AnnotationEntry[] getAnnotationEntries() {
- return annotation_table;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java Sat Dec 5 23:22:46 2009
@@ -89,26 +89,11 @@
}
- /**
- * @return the parameter annotation entry table
- */
- public final ParameterAnnotationEntry[] getParameterAnnotationTable() {
- return parameter_annotation_table;
- }
+
- /**
- * returns the array of parameter annotation entries in this parameter annotation
- */
- public ParameterAnnotationEntry[] getParameterAnnotationEntries() {
- return parameter_annotation_table;
- }
+
- /**
- * @return the number of parameter annotation entries in this parameter annotation
- */
- public final int getNumParameterAnnotation() {
- return num_parameters;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java Sat Dec 5 23:22:46 2009
@@ -36,13 +36,7 @@
private int signature_index;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public Signature(Signature c) {
- this(c.getNameIndex(), c.getLength(), c.getSignatureIndex(), c.getConstantPool());
- }
+
/**
@@ -96,20 +90,10 @@
}
- /**
- * @return Index in constant pool of source file name.
- */
- public final int getSignatureIndex() {
- return signature_index;
- }
+
- /**
- * @param signature_index the index info the constant pool of this signature
- */
- public final void setSignatureIndex( int signature_index ) {
- this.signature_index = signature_index;
- }
+
/**
@@ -129,130 +113,6 @@
MyByteArrayInputStream(String data) {
super(data.getBytes());
}
-
-
- final int mark() {
- return pos;
- }
-
-
- final String getData() {
- return new String(buf);
- }
-
-
- final void reset( int p ) {
- pos = p;
- }
-
-
- final void unread() {
- if (pos > 0) {
- pos--;
- }
- }
- }
-
-
- private static boolean identStart( int ch ) {
- return ch == 'T' || ch == 'L';
- }
-
-
- private static final void matchIdent( MyByteArrayInputStream in, StringBuffer buf ) {
- int ch;
- if ((ch = in.read()) == -1) {
- throw new RuntimeException("Illegal signature: " + in.getData()
- + " no ident, reaching EOF");
- }
- //System.out.println("return from ident:" + (char)ch);
- if (!identStart(ch)) {
- StringBuffer buf2 = new StringBuffer();
- int count = 1;
- while (Character.isJavaIdentifierPart((char) ch)) {
- buf2.append((char) ch);
- count++;
- ch = in.read();
- }
- if (ch == ':') { // Ok, formal parameter
- in.skip("Ljava/lang/Object".length());
- buf.append(buf2);
- ch = in.read();
- in.unread();
- //System.out.println("so far:" + buf2 + ":next:" +(char)ch);
- } else {
- for (int i = 0; i < count; i++) {
- in.unread();
- }
- }
- return;
- }
- StringBuffer buf2 = new StringBuffer();
- ch = in.read();
- do {
- buf2.append((char) ch);
- ch = in.read();
- //System.out.println("within ident:"+ (char)ch);
- } while ((ch != -1) && (Character.isJavaIdentifierPart((char) ch) || (ch == '/')));
- buf.append(buf2.toString().replace('/', '.'));
- //System.out.println("regular return ident:"+ (char)ch + ":" + buf2);
- if (ch != -1) {
- in.unread();
- }
- }
-
-
- private static final void matchGJIdent( MyByteArrayInputStream in, StringBuffer buf ) {
- int ch;
- matchIdent(in, buf);
- ch = in.read();
- if ((ch == '<') || ch == '(') { // Parameterized or method
- //System.out.println("Enter <");
- buf.append((char) ch);
- matchGJIdent(in, buf);
- while (((ch = in.read()) != '>') && (ch != ')')) { // List of parameters
- if (ch == -1) {
- throw new RuntimeException("Illegal signature: " + in.getData()
- + " reaching EOF");
- }
- //System.out.println("Still no >");
- buf.append(", ");
- in.unread();
- matchGJIdent(in, buf); // Recursive call
- }
- //System.out.println("Exit >");
- buf.append((char) ch);
- } else {
- in.unread();
- }
- ch = in.read();
- if (identStart(ch)) {
- in.unread();
- matchGJIdent(in, buf);
- } else if (ch == ')') {
- in.unread();
- return;
- } else if (ch != ';') {
- throw new RuntimeException("Illegal signature: " + in.getData() + " read " + (char) ch);
- }
- }
-
-
- public static String translate( String s ) {
- //System.out.println("Sig:" + s);
- StringBuffer buf = new StringBuffer();
- matchGJIdent(new MyByteArrayInputStream(s), buf);
- return buf.toString();
- }
-
-
- public static final boolean isFormalParameterList( String s ) {
- return s.startsWith("<") && (s.indexOf(':') > 0);
- }
-
-
- public static final boolean isActualParameterList( String s ) {
- return s.startsWith("L") && s.endsWith(">;");
}
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -38,10 +38,7 @@
return index;
}
- public void setIndex(int index)
- {
- this.index = index;
- }
+
public String getValueString()
{
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java Sat Dec 5 23:22:46 2009
@@ -37,13 +37,7 @@
private int sourcefile_index;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public SourceFile(SourceFile c) {
- this(c.getNameIndex(), c.getLength(), c.getSourceFileIndex(), c.getConstantPool());
- }
+
/**
@@ -103,20 +97,10 @@
}
- /**
- * @return Index in constant pool of source file name.
- */
- public final int getSourceFileIndex() {
- return sourcefile_index;
- }
+
- /**
- * @param sourcefile_index
- */
- public final void setSourceFileIndex( int sourcefile_index ) {
- this.sourcefile_index = sourcefile_index;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java Sat Dec 5 23:22:46 2009
@@ -88,12 +88,7 @@
}
- /**
- * @return Array of stack map entries
- */
- public final StackMapEntry[] getStackMap() {
- return map;
- }
+
/**
@@ -147,7 +142,5 @@
}
- public final int getMapLength() {
- return map_length;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java Sat Dec 5 23:22:46 2009
@@ -121,54 +121,34 @@
}
- public void setByteCodeOffset( int b ) {
- byte_code_offset = b;
- }
+
- public int getByteCodeOffset() {
- return byte_code_offset;
- }
+
- public void setNumberOfLocals( int n ) {
- number_of_locals = n;
- }
+
- public int getNumberOfLocals() {
- return number_of_locals;
- }
+
- public void setTypesOfLocals( StackMapType[] t ) {
- types_of_locals = t;
- }
+
- public StackMapType[] getTypesOfLocals() {
- return types_of_locals;
- }
+
- public void setNumberOfStackItems( int n ) {
- number_of_stack_items = n;
- }
+
- public int getNumberOfStackItems() {
- return number_of_stack_items;
- }
+
- public void setTypesOfStackItems( StackMapType[] t ) {
- types_of_stack_items = t;
- }
+
- public StackMapType[] getTypesOfStackItems() {
- return types_of_stack_items;
- }
+
/**
@@ -183,30 +163,11 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackMapEntry(this);
- }
+
- /**
- * @return Constant pool used by this object.
- */
- public final ConstantPool getConstantPool() {
- return constant_pool;
- }
+
- /**
- * @param constant_pool Constant pool to be used for this object.
- */
- public final void setConstantPool( ConstantPool constant_pool ) {
- this.constant_pool = constant_pool;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java Sat Dec 5 23:22:46 2009
@@ -88,12 +88,7 @@
}
- /**
- * @return Array of stack map entries
- */
- public final StackMapTableEntry[] getStackMapTable() {
- return map;
- }
+
/**
@@ -147,7 +142,5 @@
}
- public final int getMapLength() {
- return map_length;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java Sat Dec 5 23:22:46 2009
@@ -194,54 +194,34 @@
}
- public void setByteCodeOffsetDelta( int b ) {
- byte_code_offset_delta = b;
- }
+
- public int getByteCodeOffsetDelta() {
- return byte_code_offset_delta;
- }
+
- public void setNumberOfLocals( int n ) {
- number_of_locals = n;
- }
+
- public int getNumberOfLocals() {
- return number_of_locals;
- }
+
- public void setTypesOfLocals( StackMapType[] t ) {
- types_of_locals = t;
- }
+
- public StackMapType[] getTypesOfLocals() {
- return types_of_locals;
- }
+
- public void setNumberOfStackItems( int n ) {
- number_of_stack_items = n;
- }
+
- public int getNumberOfStackItems() {
- return number_of_stack_items;
- }
+
- public void setTypesOfStackItems( StackMapType[] t ) {
- types_of_stack_items = t;
- }
+
- public StackMapType[] getTypesOfStackItems() {
- return types_of_stack_items;
- }
+
/**
@@ -256,30 +236,11 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackMapTableEntry(this);
- }
+
- /**
- * @return Constant pool used by this object.
- */
- public final ConstantPool getConstantPool() {
- return constant_pool;
- }
+
- /**
- * @param constant_pool Constant pool to be used for this object.
- */
- public final void setConstantPool( ConstantPool constant_pool ) {
- this.constant_pool = constant_pool;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java Sat Dec 5 23:22:46 2009
@@ -72,9 +72,7 @@
}
- public byte getType() {
- return type;
- }
+
public void setIndex( int t ) {
@@ -133,24 +131,10 @@
}
- /**
- * @return deep copy of this object
- */
- public StackMapType copy() {
- try {
- return (StackMapType) clone();
- } catch (CloneNotSupportedException e) {
- }
- return null;
- }
+
- /**
- * @return Constant pool used by this object.
- */
- public final ConstantPool getConstantPool() {
- return constant_pool;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java Sat Dec 5 23:22:46 2009
@@ -39,13 +39,7 @@
private byte[] bytes;
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use copy() for a physical copy.
- */
- public Synthetic(Synthetic c) {
- this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool());
- }
+
/**
@@ -107,20 +101,10 @@
}
- /**
- * @return data bytes.
- */
- public final byte[] getBytes() {
- return bytes;
- }
+
- /**
- * @param bytes
- */
- public final void setBytes( byte[] bytes ) {
- this.bytes = bytes;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java Sat Dec 5 23:22:46 2009
@@ -20,7 +20,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.tomcat.util.bcel.Constants;
@@ -47,26 +46,10 @@
private static Map unknown_attributes = new HashMap();
- /** @return array of unknown attributes, but just one for each kind.
- */
- static Unknown[] getUnknownAttributes() {
- Unknown[] unknowns = new Unknown[unknown_attributes.size()];
- Iterator entries = unknown_attributes.values().iterator();
- for (int i = 0; entries.hasNext(); i++) {
- unknowns[i] = (Unknown) entries.next();
- }
- unknown_attributes.clear();
- return unknowns;
- }
+
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public Unknown(Unknown c) {
- this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool());
- }
+
/**
@@ -130,12 +113,7 @@
}
- /**
- * @return data bytes.
- */
- public final byte[] getBytes() {
- return bytes;
- }
+
/**
@@ -146,12 +124,7 @@
}
- /**
- * @param bytes the bytes to set
- */
- public final void setBytes( byte[] bytes ) {
- this.bytes = bytes;
- }
+
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Author: markt
Date: Sat Dec 5 23:22:46 2009
New Revision: 887610
URL: http://svn.apache.org/viewvc?rev=887610&view=rev
Log:
Remove unused code identified by Eclipse / UCDetector.
Not complete - still more to remove.
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/ExceptionConstants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArithmeticInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassObserver.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CompoundInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConversionInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionListObserver.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUSH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TargetLostException.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoaderRepository.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/Repository.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.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/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.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/ConstantFieldref.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/ConstantInterfaceMethodref.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodref.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantNameAndType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantObject.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantString.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Deprecated.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/EnclosingMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ExceptionTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Field.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/FieldOrMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/InnerClasses.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumber.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LineNumberTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Method.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Node.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Sat Dec 5 23:22:46 2009
@@ -34,65 +34,29 @@
* */
public final static short MINOR_1_1 = 3;
- /** Major version number of class files for Java 1.2.
- * @see #MINOR_1_2
- * */
- public final static short MAJOR_1_2 = 46;
+
- /** Minor version number of class files for Java 1.2.
- * @see #MAJOR_1_2
- * */
- public final static short MINOR_1_2 = 0;
+
- /** Major version number of class files for Java 1.2.
- * @see #MINOR_1_2
- * */
- public final static short MAJOR_1_3 = 47;
+
- /** Minor version number of class files for Java 1.3.
- * @see #MAJOR_1_3
- * */
- public final static short MINOR_1_3 = 0;
+
- /** Major version number of class files for Java 1.3.
- * @see #MINOR_1_3
- * */
- public final static short MAJOR_1_4 = 48;
+
- /** Minor version number of class files for Java 1.4.
- * @see #MAJOR_1_4
- * */
- public final static short MINOR_1_4 = 0;
+
- /** Major version number of class files for Java 1.4.
- * @see #MINOR_1_4
- * */
- public final static short MAJOR_1_5 = 49;
+
- /** Minor version number of class files for Java 1.5.
- * @see #MAJOR_1_5
- * */
- public final static short MINOR_1_5 = 0;
+
- /** Major version number of class files for Java 1.5.
- * @see #MINOR_1_5
- * */
- public final static short MAJOR_1_6 = 50;
+
- /** Minor version number of class files for Java 1.6.
- * @see #MAJOR_1_6
- * */
- public final static short MINOR_1_6 = 0;
+
- /** Default major version number. Class file is for Java 1.1.
- * @see #MAJOR_1_1
- * */
- public final static short MAJOR = MAJOR_1_1;
+
- /** Default major version number. Class file is for Java 1.1.
- * @see #MAJOR_1_1
- * */
- public final static short MINOR = MINOR_1_1;
+
/** Maximum value for an unsigned short.
*/
@@ -102,22 +66,11 @@
*/
public final static int MAX_BYTE = 255; // 2^8 - 1
- /** One of the access flags for fields, methods, or classes.
- * @see <a href='http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#2877'>Flag definitions for Fields in the Java Virtual Machine Specification (2nd edition).</a>
- * @see <a href='http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#1513'>Flag definitions for Methods in the Java Virtual Machine Specification (2nd edition).</a>
- * @see <a href='http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#88478'>Flag definitions for Classes in the Java Virtual Machine Specification (2nd edition).</a>
- */
- public final static short ACC_PUBLIC = 0x0001;
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_PRIVATE = 0x0002;
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_PROTECTED = 0x0004;
+
/** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
@@ -129,35 +82,17 @@
*/
public final static short ACC_FINAL = 0x0010;
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_SYNCHRONIZED = 0x0020;
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_SYPER = 0x0020;
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_VOLATILE = 0x0040;
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_BRIDGE = 0x0040;
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_TRANSIENT = 0x0080;
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_VARARGS = 0x0080;
+
/** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
@@ -174,20 +109,11 @@
*/
public final static short ACC_ABSTRACT = 0x0400;
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_STRICT = 0x0800;
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_SYNTHETIC = 0x1000;
+
+
- /** One of the access flags for fields, methods, or classes.
- * @see #ACC_PUBLIC
- */
- public final static short ACC_ANNOTATION = 0x2000;
+
/** One of the access flags for fields, methods, or classes.
* @see #ACC_PUBLIC
@@ -253,82 +179,34 @@
"CONSTANT_Methodref", "CONSTANT_InterfaceMethodref",
"CONSTANT_NameAndType" };
- /** The name of the static initializer, also called "class
- * initialization method" or "interface initialization
- * method". This is "<clinit>".
- */
- public final static String STATIC_INITIALIZER_NAME = "<clinit>";
+
- /** The name of every constructor method in a class, also called
- * "instance initialization method". This is "<init>".
- */
- public final static String CONSTRUCTOR_NAME = "<init>";
+
- /** The names of the interfaces implemented by arrays */
- public final static String[] INTERFACES_IMPLEMENTED_BY_ARRAYS = {"java.lang.Cloneable", "java.io.Serializable"};
+
- /**
- * One of the limitations of the Java Virtual Machine.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#88659"> The Java Virtual Machine Specification, Second Edition, page 152, chapter 4.10.</a>
- */
- public static final int MAX_CP_ENTRIES = 65535;
+
- /**
- * One of the limitations of the Java Virtual Machine.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#88659"> The Java Virtual Machine Specification, Second Edition, page 152, chapter 4.10.</a>
- */
- public static final int MAX_CODE_SIZE = 65536; //bytes
+
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short NOP = 0;
+
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ACONST_NULL = 1;
+
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ICONST_M1 = 2;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ICONST_0 = 3;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ICONST_1 = 4;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ICONST_2 = 5;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ICONST_3 = 6;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ICONST_4 = 7;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ICONST_5 = 8;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LCONST_0 = 9;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LCONST_1 = 10;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FCONST_0 = 11;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FCONST_1 = 12;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FCONST_2 = 13;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DCONST_0 = 14;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DCONST_1 = 15;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short BIPUSH = 16;
@@ -542,33 +420,15 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short SASTORE = 86;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short POP = 87;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short POP2 = 88;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DUP = 89;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DUP_X1 = 90;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DUP_X2 = 91;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DUP2 = 92;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DUP2_X1 = 93;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DUP2_X2 = 94;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short SWAP = 95;
+
+
+
+
+
+
+
+
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short IADD = 96;
@@ -719,36 +579,20 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short I2B = 145;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short INT2BYTE = 145; // Old notion
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short I2C = 146;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short INT2CHAR = 146; // Old notion
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short I2S = 147;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short INT2SHORT = 147; // Old notion
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short LCMP = 148;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FCMPL = 149;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short FCMPG = 150;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DCMPL = 151;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short DCMPG = 152;
+
+
+
+
+
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short IFEQ = 153;
@@ -842,18 +686,14 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short INVOKESPECIAL = 183;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short INVOKENONVIRTUAL = 183; // Old name in JDK 1.0
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short INVOKESTATIC = 184;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short INVOKEINTERFACE = 185;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short INVOKEDYNAMIC = 186;
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short NEW = 187;
@@ -863,24 +703,16 @@
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short ANEWARRAY = 189;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ARRAYLENGTH = 190;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short ATHROW = 191;
+
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short CHECKCAST = 192;
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short INSTANCEOF = 193;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short MONITORENTER = 194;
- /** Java VM opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
- public static final short MONITOREXIT = 195;
+
+
/** Java VM opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html">Opcode definitions in The Java Virtual Machine Specification</a> */
public static final short WIDE = 196;
@@ -903,106 +735,31 @@
/** JVM internal opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
public static final short BREAKPOINT = 202;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short LDC_QUICK = 203;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short LDC_W_QUICK = 204;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short LDC2_W_QUICK = 205;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short GETFIELD_QUICK = 206;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short PUTFIELD_QUICK = 207;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short GETFIELD2_QUICK = 208;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short PUTFIELD2_QUICK = 209;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short GETSTATIC_QUICK = 210;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short PUTSTATIC_QUICK = 211;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short GETSTATIC2_QUICK = 212;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short PUTSTATIC2_QUICK = 213;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INVOKEVIRTUAL_QUICK = 214;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INVOKENONVIRTUAL_QUICK = 215;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INVOKESUPER_QUICK = 216;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INVOKESTATIC_QUICK = 217;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INVOKEINTERFACE_QUICK = 218;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INVOKEVIRTUALOBJECT_QUICK = 219;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short NEW_QUICK = 221;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short ANEWARRAY_QUICK = 222;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short MULTIANEWARRAY_QUICK = 223;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short CHECKCAST_QUICK = 224;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INSTANCEOF_QUICK = 225;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short INVOKEVIRTUAL_QUICK_W = 226;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short GETFIELD_QUICK_W = 227;
- /** JVM internal opcode.
- * @see <a href="http://java.sun.com/docs/books/jvms/first_edition/html/Quick.doc.html#10673">Specification of _quick opcodes in the Java Virtual Machine Specification (version 1)</a>
- * @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/ChangesAppendix.doc.html#448885">Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification.</a> */
- public static final short PUTFIELD_QUICK_W = 228;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/** JVM internal opcode.
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
public static final short IMPDEP1 = 254;
@@ -1010,16 +767,8 @@
* @see <a href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions.doc.html#60105">Reserved opcodes in the Java Virtual Machine Specification</a> */
public static final short IMPDEP2 = 255;
- /**
- * BCEL virtual instruction for pushing an arbitrary data type onto the stack. Will be converted to the appropriate JVM
- * opcode when the class is dumped.
- */
- public static final short PUSH = 4711;
- /**
- * BCEL virtual instruction for either LOOKUPSWITCH or TABLESWITCH. Will be converted to the appropriate JVM
- * opcode when the class is dumped.
- */
- public static final short SWITCH = 4712;
+
+
/** Illegal opcode. */
public static final short UNDEFINED = -1;
@@ -1071,16 +820,7 @@
"void", "array", "object", "unknown", "address"
};
- /** The primitive class names corresponding to the T_XX constants,
- * e.g., CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer"
- */
- public static final String[] CLASS_TYPE_NAMES = {
- ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE,
- "java.lang.Boolean", "java.lang.Character", "java.lang.Float",
- "java.lang.Double", "java.lang.Byte", "java.lang.Short",
- "java.lang.Integer", "java.lang.Long", "java.lang.Void",
- ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE
- };
+
/** The signature characters corresponding to primitive types,
* e.g., SHORT_TYPE_NAMES[T_INT] = "I"
@@ -1430,12 +1170,12 @@
/** Constants used in the StackMap attribute.
*/
public static final byte ITEM_Bogus = 0;
- public static final byte ITEM_Integer = 1;
- public static final byte ITEM_Float = 2;
- public static final byte ITEM_Double = 3;
- public static final byte ITEM_Long = 4;
- public static final byte ITEM_Null = 5;
- public static final byte ITEM_InitObject = 6;
+
+
+
+
+
+
public static final byte ITEM_Object = 7;
public static final byte ITEM_NewObject = 8;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Repository.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Repository.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Repository.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Repository.java Sat Dec 5 23:22:46 2009
@@ -16,9 +16,7 @@
*/
package org.apache.tomcat.util.bcel;
-import java.io.IOException;
import org.apache.tomcat.util.bcel.classfile.JavaClass;
-import org.apache.tomcat.util.bcel.util.ClassPath;
import org.apache.tomcat.util.bcel.util.SyntheticRepository;
/**
@@ -37,18 +35,10 @@
private static org.apache.tomcat.util.bcel.util.Repository _repository = SyntheticRepository.getInstance();
- /** @return currently used repository instance
- */
- public static org.apache.tomcat.util.bcel.util.Repository getRepository() {
- return _repository;
- }
+
- /** Set repository instance to be used for class loading
- */
- public static void setRepository( org.apache.tomcat.util.bcel.util.Repository rep ) {
- _repository = rep;
- }
+
/** Lookup class somewhere found on your CLASSPATH, or whereever the
@@ -63,114 +53,34 @@
}
- /**
- * Try to find class source using the internal repository instance.
- * @see Class
- * @return JavaClass object for given runtime class
- * @throws ClassNotFoundException if the class could not be found or
- * parsed correctly
- */
- public static JavaClass lookupClass( Class clazz ) throws ClassNotFoundException {
- return _repository.loadClass(clazz);
- }
+
- /**
- * @return class file object for given Java class by looking on the
- * system class path; returns null if the class file can't be
- * found
- */
- public static ClassPath.ClassFile lookupClassFile( String class_name ) {
- try {
- ClassPath path = _repository.getClassPath();
- if (path == null) {
- return null;
- }
- return path.getClassFile(class_name);
- } catch (IOException e) {
- return null;
- }
- }
+
- /** Clear the repository.
- */
- public static void clearCache() {
- _repository.clear();
- }
+
- /**
- * Add clazz to repository if there isn't an equally named class already in there.
- *
- * @return old entry in repository
- */
- public static JavaClass addClass( JavaClass clazz ) {
- JavaClass old = _repository.findClass(clazz.getClassName());
- _repository.storeClass(clazz);
- return old;
- }
+
- /**
- * Remove class with given (fully qualified) name from repository.
- */
- public static void removeClass( String clazz ) {
- _repository.removeClass(_repository.findClass(clazz));
- }
+
- /**
- * Remove given class from repository.
- */
- public static void removeClass( JavaClass clazz ) {
- _repository.removeClass(clazz);
- }
+
- /**
- * @return list of super classes of clazz in ascending order, i.e.,
- * Object is always the last element
- * @throws ClassNotFoundException if any of the superclasses can't be found
- */
- public static JavaClass[] getSuperClasses( JavaClass clazz ) throws ClassNotFoundException {
- return clazz.getSuperClasses();
- }
+
- /**
- * @return list of super classes of clazz in ascending order, i.e.,
- * Object is always the last element.
- * @throws ClassNotFoundException if the named class or any of its
- * superclasses can't be found
- */
- public static JavaClass[] getSuperClasses( String class_name ) throws ClassNotFoundException {
- JavaClass jc = lookupClass(class_name);
- return getSuperClasses(jc);
- }
+
- /**
- * @return all interfaces implemented by class and its super
- * classes and the interfaces that those interfaces extend, and so on.
- * (Some people call this a transitive hull).
- * @throws ClassNotFoundException if any of the class's
- * superclasses or superinterfaces can't be found
- */
- public static JavaClass[] getInterfaces( JavaClass clazz ) throws ClassNotFoundException {
- return clazz.getAllInterfaces();
- }
+
- /**
- * @return all interfaces implemented by class and its super
- * classes and the interfaces that extend those interfaces, and so on
- * @throws ClassNotFoundException if the named class can't be found,
- * or if any of its superclasses or superinterfaces can't be found
- */
- public static JavaClass[] getInterfaces( String class_name ) throws ClassNotFoundException {
- return getInterfaces(lookupClass(class_name));
- }
+
/**
@@ -185,35 +95,13 @@
}
- /**
- * @return true, if clazz is an instance of super_class
- * @throws ClassNotFoundException if either clazz or super_class
- * can't be found
- */
- public static boolean instanceOf( String clazz, String super_class )
- throws ClassNotFoundException {
- return instanceOf(lookupClass(clazz), lookupClass(super_class));
- }
+
- /**
- * @return true, if clazz is an instance of super_class
- * @throws ClassNotFoundException if super_class can't be found
- */
- public static boolean instanceOf( JavaClass clazz, String super_class )
- throws ClassNotFoundException {
- return instanceOf(clazz, lookupClass(super_class));
- }
+
- /**
- * @return true, if clazz is an instance of super_class
- * @throws ClassNotFoundException if clazz can't be found
- */
- public static boolean instanceOf( String clazz, JavaClass super_class )
- throws ClassNotFoundException {
- return instanceOf(lookupClass(clazz), super_class);
- }
+
/**
@@ -227,35 +115,11 @@
}
- /**
- * @return true, if clazz is an implementation of interface inter
- * @throws ClassNotFoundException if clazz, inter, or any superclasses
- * or superinterfaces of clazz can't be found
- */
- public static boolean implementationOf( String clazz, String inter )
- throws ClassNotFoundException {
- return implementationOf(lookupClass(clazz), lookupClass(inter));
- }
+
- /**
- * @return true, if clazz is an implementation of interface inter
- * @throws ClassNotFoundException if inter or any superclasses
- * or superinterfaces of clazz can't be found
- */
- public static boolean implementationOf( JavaClass clazz, String inter )
- throws ClassNotFoundException {
- return implementationOf(clazz, lookupClass(inter));
- }
+
- /**
- * @return true, if clazz is an implementation of interface inter
- * @throws ClassNotFoundException if clazz or any superclasses or
- * superinterfaces of clazz can't be found
- */
- public static boolean implementationOf( String clazz, JavaClass inter )
- throws ClassNotFoundException {
- return implementationOf(lookupClass(clazz), inter);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java Sat Dec 5 23:22:46 2009
@@ -34,152 +34,73 @@
}
- /**
- * @param a inital access flags
- */
- public AccessFlags(int a) {
- access_flags = a;
- }
+
- /**
- * @return Access flags of the object aka. "modifiers".
- */
- public final int getAccessFlags() {
- return access_flags;
- }
+
- /**
- * @return Access flags of the object aka. "modifiers".
- */
- public final int getModifiers() {
- return access_flags;
- }
+
- /** Set access flags aka "modifiers".
- * @param access_flags Access flags of the object.
- */
- public final void setAccessFlags( int access_flags ) {
- this.access_flags = access_flags;
- }
+
- /** Set access flags aka "modifiers".
- * @param access_flags Access flags of the object.
- */
- public final void setModifiers( int access_flags ) {
- setAccessFlags(access_flags);
- }
+
- private final void setFlag( int flag, boolean set ) {
- if ((access_flags & flag) != 0) { // Flag is set already
- if (!set) {
- access_flags ^= flag;
- }
- } else { // Flag not set
- if (set) {
- access_flags |= flag;
- }
- }
- }
+
- public final void isPublic( boolean flag ) {
- setFlag(Constants.ACC_PUBLIC, flag);
- }
+
- public final boolean isPublic() {
- return (access_flags & Constants.ACC_PUBLIC) != 0;
- }
+
- public final void isPrivate( boolean flag ) {
- setFlag(Constants.ACC_PRIVATE, flag);
- }
+
- public final boolean isPrivate() {
- return (access_flags & Constants.ACC_PRIVATE) != 0;
- }
+
- public final void isProtected( boolean flag ) {
- setFlag(Constants.ACC_PROTECTED, flag);
- }
+
- public final boolean isProtected() {
- return (access_flags & Constants.ACC_PROTECTED) != 0;
- }
+
- public final void isStatic( boolean flag ) {
- setFlag(Constants.ACC_STATIC, flag);
- }
+
- public final boolean isStatic() {
- return (access_flags & Constants.ACC_STATIC) != 0;
- }
+
- public final void isFinal( boolean flag ) {
- setFlag(Constants.ACC_FINAL, flag);
- }
+
- public final boolean isFinal() {
- return (access_flags & Constants.ACC_FINAL) != 0;
- }
+
- public final void isSynchronized( boolean flag ) {
- setFlag(Constants.ACC_SYNCHRONIZED, flag);
- }
+
- public final boolean isSynchronized() {
- return (access_flags & Constants.ACC_SYNCHRONIZED) != 0;
- }
+
- public final void isVolatile( boolean flag ) {
- setFlag(Constants.ACC_VOLATILE, flag);
- }
+
- public final boolean isVolatile() {
- return (access_flags & Constants.ACC_VOLATILE) != 0;
- }
+
- public final void isTransient( boolean flag ) {
- setFlag(Constants.ACC_TRANSIENT, flag);
- }
-
-
- public final boolean isTransient() {
- return (access_flags & Constants.ACC_TRANSIENT) != 0;
- }
-
+
- public final void isNative( boolean flag ) {
- setFlag(Constants.ACC_NATIVE, flag);
- }
+
- public final boolean isNative() {
- return (access_flags & Constants.ACC_NATIVE) != 0;
- }
-
- public final void isInterface( boolean flag ) {
- setFlag(Constants.ACC_INTERFACE, flag);
- }
+
public final boolean isInterface() {
@@ -187,52 +108,32 @@
}
- public final void isAbstract( boolean flag ) {
- setFlag(Constants.ACC_ABSTRACT, flag);
- }
+
- public final boolean isAbstract() {
- return (access_flags & Constants.ACC_ABSTRACT) != 0;
- }
+
- public final void isStrictfp( boolean flag ) {
- setFlag(Constants.ACC_STRICT, flag);
- }
+
- public final boolean isStrictfp() {
- return (access_flags & Constants.ACC_STRICT) != 0;
- }
+
- public final void isSynthetic( boolean flag ) {
- setFlag(Constants.ACC_SYNTHETIC, flag);
- }
+
- public final boolean isSynthetic() {
- return (access_flags & Constants.ACC_SYNTHETIC) != 0;
- }
+
- public final void isAnnotation( boolean flag ) {
- setFlag(Constants.ACC_ANNOTATION, flag);
- }
+
- public final boolean isAnnotation() {
- return (access_flags & Constants.ACC_ANNOTATION) != 0;
- }
+
- public final void isEnum( boolean flag ) {
- setFlag(Constants.ACC_ENUM, flag);
- }
+
- public final boolean isEnum() {
- return (access_flags & Constants.ACC_ENUM) != 0;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java Sat Dec 5 23:22:46 2009
@@ -94,13 +94,7 @@
default_value = defaultValue;
}
- /**
- * @return the default value
- */
- public final ElementValue getDefaultValue()
- {
- return default_value;
- }
+
public Attribute copy(ConstantPool _constant_pool)
{
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -64,16 +64,7 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- // v.visitAnnotationEntry(this);
- }
+
/**
@@ -94,12 +85,7 @@
}
- /**
- * @return the number of element value pairs in this annotation entry
- */
- public final int getNumElementValuePairs() {
- return num_element_value_pairs;
- }
+
/**
@@ -132,21 +118,5 @@
element_value_pairs.add(elementNameValuePair);
}
- public String toShortString()
- {
- StringBuffer result = new StringBuffer();
- result.append("@");
- result.append(getAnnotationType());
- if (getElementValuePairs().length > 0)
- {
- result.append("(");
- for (int i = 0; i < getElementValuePairs().length; i++)
- {
- ElementValuePair element = getElementValuePairs()[i];
- result.append(element.toShortString());
- }
- result.append(")");
- }
- return result.toString();
- }
+
}
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -106,17 +106,9 @@
}
- /**
- * @return the number of annotation entries in this annotation
- */
- public final int getNumAnnotations() {
- return annotation_table_length;
- }
- public boolean isRuntimeVisible()
- {
- return isRuntimeVisible;
- }
+
+
protected void writeAnnotations(DataOutputStream dos) throws IOException
{
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -60,8 +60,5 @@
return evalues;
}
- public int getElementValuesArraySize()
- {
- return evalues.length;
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Sat Dec 5 23:22:46 2009
@@ -91,31 +91,9 @@
private static Map readers = new HashMap();
- /**
- * Add an Attribute reader capable of parsing (user-defined) attributes
- * named "name". You should not add readers for the standard attributes such
- * as "LineNumberTable", because those are handled internally.
- *
- * @param name
- * the name of the attribute as stored in the class file
- * @param r
- * the reader object
- */
- public static void addAttributeReader(String name, AttributeReader r)
- {
- readers.put(name, r);
- }
+
- /**
- * Remove attribute reader
- *
- * @param name
- * the name of the attribute as stored in the class file
- */
- public static void removeAttributeReader(String name)
- {
- readers.remove(name);
- }
+
/*
* Class method reads one attribute from the input data stream. This method
@@ -226,39 +204,13 @@
return c.getBytes();
}
- /**
- * @return Length of attribute field in bytes.
- */
- public final int getLength()
- {
- return length;
- }
+
- /**
- * @param length
- * length in bytes.
- */
- public final void setLength(int length)
- {
- this.length = length;
- }
+
- /**
- * @param name_index
- * of attribute.
- */
- public final void setNameIndex(int name_index)
- {
- this.name_index = name_index;
- }
+
- /**
- * @return Name index in constant pool of attribute name.
- */
- public final int getNameIndex()
- {
- return name_index;
- }
+
/**
* @return Tag of attribute, i.e., its type. Value may not be altered, thus
@@ -269,24 +221,9 @@
return tag;
}
- /**
- * @return Constant pool used by this object.
- * @see ConstantPool
- */
- public final ConstantPool getConstantPool()
- {
- return constant_pool;
- }
+
- /**
- * @param constant_pool
- * Constant pool to be used for this object.
- * @see ConstantPool
- */
- public final void setConstantPool(ConstantPool constant_pool)
- {
- this.constant_pool = constant_pool;
- }
+
/**
* Use copy() if you want to have a deep copy(), i.e., with all references
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -78,28 +78,10 @@
}
- /** Parse class from given .class file.
- *
- * @param file_name file name
- */
- public ClassParser(String file_name) {
- is_zip = false;
- this.file_name = file_name;
- fileOwned = true;
- }
+
- /** Parse class from given .class file in a ZIP-archive
- *
- * @param zip_file zip file name
- * @param file_name file name
- */
- public ClassParser(String zip_file, String file_name) {
- is_zip = true;
- fileOwned = true;
- this.zip_file = zip_file;
- this.file_name = file_name;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java Sat Dec 5 23:22:46 2009
@@ -52,14 +52,7 @@
private Attribute[] attributes; // or LocalVariable
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use copy() for a physical copy.
- */
- public Code(Code c) {
- this(c.getNameIndex(), c.getLength(), c.getMaxStack(), c.getMaxLocals(), c.getCode(), c
- .getExceptionTable(), c.getAttributes(), c.getConstantPool());
- }
+
/**
@@ -156,26 +149,10 @@
}
- /**
- * @return Collection of code attributes.
- * @see Attribute
- */
- public final Attribute[] getAttributes() {
- return attributes;
- }
+
- /**
- * @return LineNumberTable of Code, if it has one
- */
- public LineNumberTable getLineNumberTable() {
- for (int i = 0; i < attributes_count; i++) {
- if (attributes[i] instanceof LineNumberTable) {
- return (LineNumberTable) attributes[i];
- }
- }
- return null;
- }
+
/**
@@ -191,37 +168,16 @@
}
- /**
- * @return Actual byte code of the method.
- */
- public final byte[] getCode() {
- return code;
- }
+
- /**
- * @return Table of handled exceptions.
- * @see CodeException
- */
- public final CodeException[] getExceptionTable() {
- return exception_table;
- }
+
- /**
- * @return Number of local variables.
- */
- public final int getMaxLocals() {
- return max_locals;
- }
+
- /**
- * @return Maximum size of stack used by this method.
- */
- public final int getMaxStack() {
- return max_stack;
- }
+
/**
@@ -278,20 +234,10 @@
}
- /**
- * @param max_locals maximum number of local variables
- */
- public final void setMaxLocals( int max_locals ) {
- this.max_locals = max_locals;
- }
+
- /**
- * @param max_stack maximum stack size
- */
- public final void setMaxStack( int max_stack ) {
- this.max_stack = max_stack;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/CodeException.java Sat Dec 5 23:22:46 2009
@@ -45,12 +45,7 @@
*/
- /**
- * Initialize from another object.
- */
- public CodeException(CodeException c) {
- this(c.getStartPC(), c.getEndPC(), c.getHandlerPC(), c.getCatchType());
- }
+
/**
@@ -82,16 +77,7 @@
}
- /**
- * Called by objects that are traversing the nodes of the tree implicitely
- * defined by the contents of a Java class. I.e., the hierarchy of methods,
- * fields, attributes, etc. spawns a tree of objects.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitCodeException(this);
- }
+
/**
@@ -108,69 +94,28 @@
}
- /**
- * @return 0, if the handler catches any exception, otherwise it points to
- * the exception class which is to be caught.
- */
- public final int getCatchType() {
- return catch_type;
- }
+
- /**
- * @return Exclusive end index of the region where the handler is active.
- */
- public final int getEndPC() {
- return end_pc;
- }
+
- /**
- * @return Starting address of exception handler, relative to the code.
- */
- public final int getHandlerPC() {
- return handler_pc;
- }
+
- /**
- * @return Inclusive start index of the region where the handler is active.
- */
- public final int getStartPC() {
- return start_pc;
- }
+
- /**
- * @param catch_type the type of exception that is caught
- */
- public final void setCatchType( int catch_type ) {
- this.catch_type = catch_type;
- }
+
- /**
- * @param end_pc end of handled block
- */
- public final void setEndPC( int end_pc ) {
- this.end_pc = end_pc;
- }
+
- /**
- * @param handler_pc where the actual code is
- */
- public final void setHandlerPC( int handler_pc ) {
- this.handler_pc = handler_pc;
- }
+
- /**
- * @param start_pc start of handled block
- */
- public final void setStartPC( int start_pc ) {
- this.start_pc = start_pc;
- }
+
/**
@@ -197,9 +142,7 @@
}
- public final String toString( ConstantPool cp ) {
- return toString(cp, true);
- }
+
/**
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -93,16 +93,7 @@
}
- /**
- * @return deep copy of this constant
- */
- public Constant copy() {
- try {
- return (Constant) super.clone();
- } catch (CloneNotSupportedException e) {
- }
- return null;
- }
+
public Object clone() throws CloneNotSupportedException {
@@ -148,20 +139,10 @@
}
- /**
- * @return Comparison strategy object
- */
- public static BCELComparator getComparator() {
- return _cmp;
- }
+
- /**
- * @param comparator Comparison strategy object
- */
- public static void setComparator( BCELComparator comparator ) {
- _cmp = comparator;
- }
+
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantCP.java Sat Dec 5 23:22:46 2009
@@ -20,8 +20,6 @@
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
-
/**
* Abstract super class for Fieldref and Methodref constants.
*
@@ -38,12 +36,7 @@
protected int class_index, name_and_type_index;
- /**
- * Initialize from another object.
- */
- public ConstantCP(ConstantCP c) {
- this(c.getTag(), c.getClassIndex(), c.getNameAndTypeIndex());
- }
+
/**
@@ -98,28 +91,13 @@
}
- /**
- * @param class_index points to Constant_class
- */
- public final void setClassIndex( int class_index ) {
- this.class_index = class_index;
- }
+
- /**
- * @return Class this field belongs to.
- */
- public String getClass( ConstantPool cp ) {
- return cp.constantToString(class_index, Constants.CONSTANT_Class);
- }
+
- /**
- * @param name_and_type_index points to Constant_NameAndType
- */
- public final void setNameAndTypeIndex( int name_and_type_index ) {
- this.name_and_type_index = name_and_type_index;
- }
+
/**
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -36,12 +36,7 @@
private int name_index; // Identical to ConstantString except for the name
- /**
- * Initialize from another object.
- */
- public ConstantClass(ConstantClass c) {
- this(c.getNameIndex());
- }
+
/**
@@ -97,27 +92,13 @@
}
- /**
- * @param name_index the name index in the constant pool of this Constant Class
- */
- public final void setNameIndex( int name_index ) {
- this.name_index = name_index;
- }
+
- /** @return String object
- */
- public Object getConstantValue( ConstantPool cp ) {
- Constant c = cp.getConstant(name_index, Constants.CONSTANT_Utf8);
- return ((ConstantUtf8) c).getBytes();
- }
+
- /** @return dereferenced string
- */
- public String getBytes( ConstantPool cp ) {
- return (String) getConstantValue(cp);
- }
+
/**
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -45,12 +45,7 @@
}
- /**
- * Initialize from another object.
- */
- public ConstantDouble(ConstantDouble c) {
- this(c.getBytes());
- }
+
/**
@@ -96,12 +91,7 @@
}
- /**
- * @param bytes the raw bytes that represent the double value
- */
- public final void setBytes( double bytes ) {
- this.bytes = bytes;
- }
+
/**
@@ -112,9 +102,5 @@
}
- /** @return Double object
- */
- public Object getConstantValue( ConstantPool cp ) {
- return new Double(bytes);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFieldref.java Sat Dec 5 23:22:46 2009
@@ -28,12 +28,7 @@
*/
public final class ConstantFieldref extends ConstantCP {
- /**
- * Initialize from another object.
- */
- public ConstantFieldref(ConstantFieldref c) {
- super(Constants.CONSTANT_Fieldref, c.getClassIndex(), c.getNameAndTypeIndex());
- }
+
/**
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -45,13 +45,7 @@
}
- /**
- * Initialize from another object. Note that both objects use the same
- * references (shallow copy). Use clone() for a physical copy.
- */
- public ConstantFloat(ConstantFloat c) {
- this(c.getBytes());
- }
+
/**
@@ -97,12 +91,7 @@
}
- /**
- * @param bytes the raw bytes that represent this float
- */
- public final void setBytes( float bytes ) {
- this.bytes = bytes;
- }
+
/**
@@ -113,9 +102,5 @@
}
- /** @return Float object
- */
- public Object getConstantValue( ConstantPool cp ) {
- return new Float(bytes);
- }
+
}
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -45,12 +45,7 @@
}
- /**
- * Initialize from another object.
- */
- public ConstantInteger(ConstantInteger c) {
- this(c.getBytes());
- }
+
/**
@@ -96,12 +91,7 @@
}
- /**
- * @param bytes the raw bytes that represent this integer
- */
- public final void setBytes( int bytes ) {
- this.bytes = bytes;
- }
+
/**
@@ -112,9 +102,5 @@
}
- /** @return Integer object
- */
- public Object getConstantValue( ConstantPool cp ) {
- return new Integer(bytes);
- }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInterfaceMethodref.java Sat Dec 5 23:22:46 2009
@@ -28,12 +28,7 @@
*/
public final class ConstantInterfaceMethodref extends ConstantCP {
- /**
- * Initialize from another object.
- */
- public ConstantInterfaceMethodref(ConstantInterfaceMethodref c) {
- super(Constants.CONSTANT_InterfaceMethodref, c.getClassIndex(), c.getNameAndTypeIndex());
- }
+
/**
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=887610&r1=887609&r2=887610&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 Sat Dec 5 23:22:46 2009
@@ -45,12 +45,7 @@
}
- /**
- * Initialize from another object.
- */
- public ConstantLong(ConstantLong c) {
- this(c.getBytes());
- }
+
/**
@@ -96,12 +91,7 @@
}
- /**
- * @param bytes thr raw bytes that represent this long
- */
- public final void setBytes( long bytes ) {
- this.bytes = bytes;
- }
+
/**
@@ -112,9 +102,5 @@
}
- /** @return Long object
- */
- public Object getConstantValue( ConstantPool cp ) {
- return new Long(bytes);
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java?rev=887610&r1=887609&r2=887610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java Sat Dec 5
23:22:46 2009
@@ -82,12 +82,7 @@
}
- /**
- * Remove class from repository
- */
- public void removeClass( JavaClass clazz ) {
- _loadedClasses.remove(clazz.getClassName());
- }
+
/**
@@ -131,44 +126,7 @@
}
- /**
- * Find the JavaClass object for a runtime Class object.
- * If a class with the same name is already in this Repository,
- * the Repository version is returned. Otherwise, getResourceAsStream()
- * is called on the Class object to find the class's representation.
- * If the representation is found, it is added to the Repository.
- *
- * @see Class
- * @param clazz the runtime Class object
- * @return JavaClass object for given runtime class
- * @throws ClassNotFoundException if the class is not in the
- * Repository, and its representation could not be found
- */
- public JavaClass loadClass( Class clazz ) throws ClassNotFoundException {
- InputStream clsStream = null;
- try{
- String className = clazz.getName();
- JavaClass repositoryClass = findClass(className);
- if (repositoryClass != null) {
- return repositoryClass;
- }
- String name = className;
- int i = name.lastIndexOf('.');
- if (i > 0) {
- name = name.substring(i + 1);
- }
- clsStream = clazz.getResourceAsStream(name + ".class");
- return loadClass(clsStream, className);
- } finally {
- try{
- if (clsStream != null){
- clsStream.close();
- }
- } catch(IOException ioe){
- //don't care
- }
- }
- }
+
private JavaClass loadClass( InputStream is, String className ) throws ClassNotFoundException
{
@@ -187,16 +145,8 @@
}
- /** ClassPath associated with the Repository.
- */
- public ClassPath getClassPath() {
- return _path;
- }
+
- /** Clear all entries from cache.
- */
- public void clear() {
- _loadedClasses.clear();
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Author: markt
Date: Fri Dec 4 20:23:13 2009
New Revision: 887344
URL: http://svn.apache.org/viewvc?rev=887344&view=rev
Log:
Remove some unused classes identified by the unused code detector
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/DescendingVisitor.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWITCH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/AttributeHTML.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Class2HTML.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoader.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassSet.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassStack.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassVector.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/CodeHTML.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ConstantHTML.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/InstructionFinder.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/JavaWrapper.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/MethodHTML.java
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java Fri Dec 4 18:56:38 2009
@@ -123,17 +123,4 @@
public Type getType( ConstantPoolGen cp ) {
return ReturnaddressType.NO_TARGET;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitRET(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java Fri Dec 4 18:56:38
2009
@@ -28,21 +28,4 @@
public RETURN() {
super(org.apache.tomcat.util.bcel.Constants.RETURN);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitReturnInstruction(this);
- v.visitRETURN(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java Fri Dec 4 18:56:38
2009
@@ -28,21 +28,4 @@
public SALOAD() {
super(org.apache.tomcat.util.bcel.Constants.SALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitSALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java Fri Dec 4 18:56:38
2009
@@ -28,21 +28,4 @@
public SASTORE() {
super(org.apache.tomcat.util.bcel.Constants.SASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitSASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java Fri Dec 4 18:56:38
2009
@@ -83,21 +83,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.SHORT;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitPushInstruction(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitConstantPushInstruction(this);
- v.visitSIPUSH(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java Fri Dec 4 18:56:38 2009
@@ -28,20 +28,4 @@
public SWAP() {
super(org.apache.tomcat.util.bcel.Constants.SWAP);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitStackProducer(this);
- v.visitStackInstruction(this);
- v.visitSWAP(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java Fri Dec 4
18:56:38 2009
@@ -43,21 +43,4 @@
protected StoreInstruction(short opcode, short c_tag, int n) {
super(opcode, c_tag, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitPopInstruction(this);
- v.visitTypedInstruction(this);
- v.visitLocalVariableInstruction(this);
- v.visitStoreInstruction(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java Fri Dec 4 18:56:38
2009
@@ -87,21 +87,4 @@
indices[i] = bytes.readInt();
}
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitVariableLengthInstruction(this);
- v.visitStackProducer(this);
- v.visitBranchInstruction(this);
- v.visitSelect(this);
- v.visitTABLESWITCH(this);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public IASTORE() {
super(org.apache.tomcat.util.bcel.Constants.IASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitIASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java Fri Dec 4 18:56:38 2009
@@ -58,21 +58,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.INT;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitPushInstruction(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitConstantPushInstruction(this);
- v.visitICONST(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java Fri Dec 4 18:56:38 2009
@@ -39,22 +39,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIDIV(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFNE(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFEQ(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFLT(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFGE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFLE(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFGT(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFGT(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFLE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFGE(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFLT(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFEQ(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFNE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFNULL(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFNONNULL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IFNONNULL(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIFNULL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ACMPNE(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ACMPEQ(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ACMPEQ(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ACMPNE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ICMPNE(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ICMPEQ(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ICMPLT(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ICMPGE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ICMPLE(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ICMPGT(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ICMPGT(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ICMPLE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ICMPGE(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ICMPLT(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java Fri Dec 4 18:56:38 2009
@@ -45,20 +45,4 @@
public IfInstruction negate() {
return new IF_ICMPEQ(target);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitBranchInstruction(this);
- v.visitIfInstruction(this);
- v.visitIF_ICMPNE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java Fri Dec 4 18:56:38 2009
@@ -141,18 +141,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.INT;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLocalVariableInstruction(this);
- v.visitIINC(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public ILOAD(int n) {
super(org.apache.tomcat.util.bcel.Constants.ILOAD, org.apache.tomcat.util.bcel.Constants.ILOAD_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitILOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java Fri Dec 4 18:56:38 2009
@@ -27,17 +27,4 @@
public IMPDEP1() {
super(org.apache.tomcat.util.bcel.Constants.IMPDEP1, (short) 1);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitIMPDEP1(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java Fri Dec 4 18:56:38 2009
@@ -27,17 +27,4 @@
public IMPDEP2() {
super(org.apache.tomcat.util.bcel.Constants.IMPDEP2, (short) 1);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitIMPDEP2(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public IMUL() {
super(org.apache.tomcat.util.bcel.Constants.IMUL);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIMUL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public INEG() {
super(org.apache.tomcat.util.bcel.Constants.INEG);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitINEG(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java Fri Dec 4 18:56:38 2009
@@ -51,23 +51,4 @@
}
return (t instanceof ObjectType) ? (ObjectType) t : null;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLoadClass(this);
- v.visitExceptionThrower(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitTypedInstruction(this);
- v.visitCPInstruction(this);
- v.visitINSTANCEOF(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java Fri Dec 4 18:56:38 2009
@@ -108,25 +108,4 @@
cs[ExceptionConstants.EXCS_INTERFACE_METHOD_RESOLUTION.length] = ExceptionConstants.UNSATISFIED_LINK_ERROR;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitStackProducer(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitInvokeInstruction(this);
- v.visitINVOKEINTERFACE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java Fri Dec 4 18:56:38 2009
@@ -53,25 +53,4 @@
cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitStackProducer(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitInvokeInstruction(this);
- v.visitINVOKESPECIAL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java Fri Dec 4 18:56:38 2009
@@ -50,25 +50,4 @@
cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length + 1] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitStackProducer(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitInvokeInstruction(this);
- v.visitINVOKESTATIC(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java Fri Dec 4 18:56:38 2009
@@ -52,25 +52,4 @@
cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitStackProducer(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitInvokeInstruction(this);
- v.visitINVOKEVIRTUAL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public IOR() {
super(org.apache.tomcat.util.bcel.Constants.IOR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIOR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java Fri Dec 4 18:56:38 2009
@@ -39,22 +39,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIREM(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public IRETURN() {
super(org.apache.tomcat.util.bcel.Constants.IRETURN);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitReturnInstruction(this);
- v.visitIRETURN(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public ISHL() {
super(org.apache.tomcat.util.bcel.Constants.ISHL);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitISHL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public ISHR() {
super(org.apache.tomcat.util.bcel.Constants.ISHR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitISHR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public ISTORE(int n) {
super(org.apache.tomcat.util.bcel.Constants.ISTORE, org.apache.tomcat.util.bcel.Constants.ISTORE_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitISTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public ISUB() {
super(org.apache.tomcat.util.bcel.Constants.ISUB);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitISUB(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public IUSHR() {
super(org.apache.tomcat.util.bcel.Constants.IUSHR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIUSHR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public IXOR() {
super(org.apache.tomcat.util.bcel.Constants.IXOR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIXOR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java Fri Dec 4 18:56:38 2009
@@ -511,17 +511,6 @@
}
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public abstract void accept( Visitor v );
-
-
/** Get Comparator object used in the equals() method to determine
* equality of instructions.
*
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java Fri Dec 4 18:56:38 2009
@@ -278,13 +278,4 @@
}
return attributes.values();
}
-
-
- /** Convenience method, simply calls accept() on the contained instruction.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- instruction.accept(v);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java Fri Dec 4 18:56:38 2009
@@ -66,21 +66,4 @@
}
return 0;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitVariableLengthInstruction(this);
- v.visitBranchInstruction(this);
- v.visitJsrInstruction(this);
- v.visitJSR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java Fri Dec 4 18:56:38 2009
@@ -60,20 +60,4 @@
index = bytes.readInt();
length = 5;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitBranchInstruction(this);
- v.visitJsrInstruction(this);
- v.visitJSR_W(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public L2D() {
super(org.apache.tomcat.util.bcel.Constants.L2D);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitL2D(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public L2F() {
super(org.apache.tomcat.util.bcel.Constants.L2F);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitL2F(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public L2I() {
super(org.apache.tomcat.util.bcel.Constants.L2I);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitL2I(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java Fri Dec 4 18:56:38 2009
@@ -29,21 +29,4 @@
public LADD() {
super(org.apache.tomcat.util.bcel.Constants.LADD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLADD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public LALOAD() {
super(org.apache.tomcat.util.bcel.Constants.LALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitLALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java Fri Dec 4 18:56:38 2009
@@ -29,21 +29,4 @@
public LAND() {
super(org.apache.tomcat.util.bcel.Constants.LAND);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLAND(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public LASTORE() {
super(org.apache.tomcat.util.bcel.Constants.LASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitLASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java Fri Dec 4 18:56:38 2009
@@ -36,20 +36,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.LONG;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitLCMP(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java Fri Dec 4 18:56:38 2009
@@ -60,21 +60,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.LONG;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitPushInstruction(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitConstantPushInstruction(this);
- v.visitLCONST(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java Fri Dec 4 18:56:38 2009
@@ -127,22 +127,4 @@
public Class[] getExceptions() {
return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_STRING_RESOLUTION;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitPushInstruction(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitCPInstruction(this);
- v.visitLDC(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java Fri Dec 4 18:56:38 2009
@@ -62,21 +62,4 @@
throw new RuntimeException("Unknown or invalid constant type at " + index);
}
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitPushInstruction(this);
- v.visitTypedInstruction(this);
- v.visitCPInstruction(this);
- v.visitLDC2_W(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java Fri Dec 4 18:56:38 2009
@@ -36,22 +36,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLDIV(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java Fri Dec 4 18:56:38 2009
@@ -37,18 +37,4 @@
public LLOAD(int n) {
super(org.apache.tomcat.util.bcel.Constants.LLOAD, org.apache.tomcat.util.bcel.Constants.LLOAD_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitLLOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java Fri Dec 4 18:56:38 2009
@@ -29,21 +29,4 @@
public LMUL() {
super(org.apache.tomcat.util.bcel.Constants.LMUL);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLMUL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public LNEG() {
super(org.apache.tomcat.util.bcel.Constants.LNEG);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLNEG(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java Fri Dec 4 18:56:38 2009
@@ -75,21 +75,4 @@
indices[i] = bytes.readInt();
}
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitVariableLengthInstruction(this);
- v.visitStackProducer(this);
- v.visitBranchInstruction(this);
- v.visitSelect(this);
- v.visitLOOKUPSWITCH(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public LOR() {
super(org.apache.tomcat.util.bcel.Constants.LOR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLOR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java Fri Dec 4 18:56:38 2009
@@ -35,22 +35,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLREM(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public LRETURN() {
super(org.apache.tomcat.util.bcel.Constants.LRETURN);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitReturnInstruction(this);
- v.visitLRETURN(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public LSHL() {
super(org.apache.tomcat.util.bcel.Constants.LSHL);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLSHL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public LSHR() {
super(org.apache.tomcat.util.bcel.Constants.LSHR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLSHR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java Fri Dec 4 18:56:38 2009
@@ -37,18 +37,4 @@
public LSTORE(int n) {
super(org.apache.tomcat.util.bcel.Constants.LSTORE, org.apache.tomcat.util.bcel.Constants.LSTORE_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitLSTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java Fri Dec 4 18:56:38 2009
@@ -29,21 +29,4 @@
public LSUB() {
super(org.apache.tomcat.util.bcel.Constants.LSUB);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLSUB(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public LUSHR() {
super(org.apache.tomcat.util.bcel.Constants.LUSHR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLUSHR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public LXOR() {
super(org.apache.tomcat.util.bcel.Constants.LXOR);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitLXOR(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java Fri Dec 4 18:56:38 2009
@@ -43,21 +43,4 @@
protected LoadInstruction(short opcode, short c_tag, int n) {
super(opcode, c_tag, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitPushInstruction(this);
- v.visitTypedInstruction(this);
- v.visitLocalVariableInstruction(this);
- v.visitLoadInstruction(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java Fri Dec 4 18:56:38 2009
@@ -35,19 +35,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitStackConsumer(this);
- v.visitMONITORENTER(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java Fri Dec 4 18:56:38 2009
@@ -35,19 +35,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitStackConsumer(this);
- v.visitMONITOREXIT(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java Fri Dec 4 18:56:38 2009
@@ -125,22 +125,4 @@
}
return (t instanceof ObjectType) ? (ObjectType) t : null;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLoadClass(this);
- v.visitAllocationInstruction(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitCPInstruction(this);
- v.visitMULTIANEWARRAY(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java Fri Dec 4 18:56:38 2009
@@ -54,23 +54,4 @@
public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
return (ObjectType) getType(cpg);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLoadClass(this);
- v.visitAllocationInstruction(this);
- v.visitExceptionThrower(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitCPInstruction(this);
- v.visitNEW(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java Fri Dec 4 18:56:38 2009
@@ -101,20 +101,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitAllocationInstruction(this);
- v.visitExceptionThrower(this);
- v.visitStackProducer(this);
- v.visitNEWARRAY(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java Fri Dec 4 18:56:38 2009
@@ -27,17 +27,4 @@
public NOP() {
super(org.apache.tomcat.util.bcel.Constants.NOP, (short) 1);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitNOP(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java Fri Dec 4 18:56:38 2009
@@ -29,20 +29,4 @@
public POP() {
super(org.apache.tomcat.util.bcel.Constants.POP);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitPopInstruction(this);
- v.visitStackInstruction(this);
- v.visitPOP(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java Fri Dec 4 18:56:38 2009
@@ -29,20 +29,4 @@
public POP2() {
super(org.apache.tomcat.util.bcel.Constants.POP2);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitPopInstruction(this);
- v.visitStackInstruction(this);
- v.visitPOP2(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java Fri Dec 4 18:56:38 2009
@@ -56,25 +56,4 @@
cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitStackConsumer(this);
- v.visitPopInstruction(this);
- v.visitTypedInstruction(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitFieldInstruction(this);
- v.visitPUTFIELD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java Fri Dec 4 18:56:38 2009
@@ -55,25 +55,4 @@
cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitStackConsumer(this);
- v.visitPopInstruction(this);
- v.visitTypedInstruction(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitFieldInstruction(this);
- v.visitPUTSTATIC(this);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Author: markt
Date: Fri Dec 4 18:56:38 2009
New Revision: 887319
URL: http://svn.apache.org/viewvc?rev=887319&view=rev
Log:
Don't need the Vistor and associated support
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EmptyVisitor.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EmptyVisitor.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Visitor.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELFactory.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELifier.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public AALOAD() {
super(org.apache.tomcat.util.bcel.Constants.AALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitAALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public AASTORE() {
super(org.apache.tomcat.util.bcel.Constants.AASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitAASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java Fri Dec 4 18:56:38 2009
@@ -38,20 +38,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.NULL;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitPushInstruction(this);
- v.visitTypedInstruction(this);
- v.visitACONST_NULL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public ALOAD(int n) {
super(org.apache.tomcat.util.bcel.Constants.ALOAD, org.apache.tomcat.util.bcel.Constants.ALOAD_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java Fri Dec 4 18:56:38 2009
@@ -50,25 +50,6 @@
}
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLoadClass(this);
- v.visitAllocationInstruction(this);
- v.visitExceptionThrower(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitCPInstruction(this);
- v.visitANEWARRAY(this);
- }
-
-
public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
Type t = getType(cpg);
if (t instanceof ArrayType) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public ARETURN() {
super(org.apache.tomcat.util.bcel.Constants.ARETURN);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitReturnInstruction(this);
- v.visitARETURN(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java Fri Dec 4 18:56:38 2009
@@ -39,19 +39,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitStackProducer(this);
- v.visitARRAYLENGTH(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public ASTORE(int n) {
super(org.apache.tomcat.util.bcel.Constants.ASTORE, org.apache.tomcat.util.bcel.Constants.ASTORE_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java Fri Dec 4 18:56:38 2009
@@ -40,19 +40,4 @@
org.apache.tomcat.util.bcel.ExceptionConstants.THROWABLE
};
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitUnconditionalBranch(this);
- v.visitExceptionThrower(this);
- v.visitATHROW(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public BALOAD() {
super(org.apache.tomcat.util.bcel.Constants.BALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitBALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public BASTORE() {
super(org.apache.tomcat.util.bcel.Constants.BASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitBASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java Fri Dec 4 18:56:38 2009
@@ -85,21 +85,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.BYTE;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitPushInstruction(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitConstantPushInstruction(this);
- v.visitBIPUSH(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java Fri Dec 4 18:56:38 2009
@@ -27,17 +27,4 @@
public BREAKPOINT() {
super(org.apache.tomcat.util.bcel.Constants.BREAKPOINT, (short) 1);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitBREAKPOINT(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public CALOAD() {
super(org.apache.tomcat.util.bcel.Constants.CALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitCALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public CASTORE() {
super(org.apache.tomcat.util.bcel.Constants.CASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitCASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java Fri Dec 4 18:56:38 2009
@@ -62,23 +62,4 @@
}
return (t instanceof ObjectType) ? (ObjectType) t : null;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitLoadClass(this);
- v.visitExceptionThrower(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitTypedInstruction(this);
- v.visitCPInstruction(this);
- v.visitCHECKCAST(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public D2F() {
super(org.apache.tomcat.util.bcel.Constants.D2F);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitD2F(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public D2I() {
super(org.apache.tomcat.util.bcel.Constants.D2I);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitD2I(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public D2L() {
super(org.apache.tomcat.util.bcel.Constants.D2L);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitD2L(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public DADD() {
super(org.apache.tomcat.util.bcel.Constants.DADD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitDADD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public DALOAD() {
super(org.apache.tomcat.util.bcel.Constants.DALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitDALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public DASTORE() {
super(org.apache.tomcat.util.bcel.Constants.DASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitDASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java Fri Dec 4 18:56:38 2009
@@ -36,20 +36,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.DOUBLE;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitDCMPG(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java Fri Dec 4 18:56:38 2009
@@ -36,20 +36,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.DOUBLE;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitDCMPL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java Fri Dec 4 18:56:38 2009
@@ -60,21 +60,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.DOUBLE;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitPushInstruction(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitConstantPushInstruction(this);
- v.visitDCONST(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public DDIV() {
super(org.apache.tomcat.util.bcel.Constants.DDIV);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitDDIV(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public DLOAD(int n) {
super(org.apache.tomcat.util.bcel.Constants.DLOAD, org.apache.tomcat.util.bcel.Constants.DLOAD_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitDLOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public DMUL() {
super(org.apache.tomcat.util.bcel.Constants.DMUL);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitDMUL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public DNEG() {
super(org.apache.tomcat.util.bcel.Constants.DNEG);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitDNEG(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public DREM() {
super(org.apache.tomcat.util.bcel.Constants.DREM);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitDREM(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public DRETURN() {
super(org.apache.tomcat.util.bcel.Constants.DRETURN);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitReturnInstruction(this);
- v.visitDRETURN(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public DSTORE(int n) {
super(org.apache.tomcat.util.bcel.Constants.DSTORE, org.apache.tomcat.util.bcel.Constants.DSTORE_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitDSTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public DSUB() {
super(org.apache.tomcat.util.bcel.Constants.DSUB);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitDSUB(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java Fri Dec 4 18:56:38 2009
@@ -28,20 +28,4 @@
public DUP() {
super(org.apache.tomcat.util.bcel.Constants.DUP);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitPushInstruction(this);
- v.visitStackInstruction(this);
- v.visitDUP(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java Fri Dec 4 18:56:38 2009
@@ -28,20 +28,4 @@
public DUP2() {
super(org.apache.tomcat.util.bcel.Constants.DUP2);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitPushInstruction(this);
- v.visitStackInstruction(this);
- v.visitDUP2(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java Fri Dec 4 18:56:38 2009
@@ -28,18 +28,4 @@
public DUP2_X1() {
super(org.apache.tomcat.util.bcel.Constants.DUP2_X1);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackInstruction(this);
- v.visitDUP2_X1(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java Fri Dec 4 18:56:38 2009
@@ -28,18 +28,4 @@
public DUP2_X2() {
super(org.apache.tomcat.util.bcel.Constants.DUP2_X2);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackInstruction(this);
- v.visitDUP2_X2(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java Fri Dec 4 18:56:38 2009
@@ -28,18 +28,4 @@
public DUP_X1() {
super(org.apache.tomcat.util.bcel.Constants.DUP_X1);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackInstruction(this);
- v.visitDUP_X1(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java Fri Dec 4 18:56:38 2009
@@ -28,18 +28,4 @@
public DUP_X2() {
super(org.apache.tomcat.util.bcel.Constants.DUP_X2);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackInstruction(this);
- v.visitDUP_X2(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public F2D() {
super(org.apache.tomcat.util.bcel.Constants.F2D);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitF2D(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public F2I() {
super(org.apache.tomcat.util.bcel.Constants.F2I);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitF2I(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public F2L() {
super(org.apache.tomcat.util.bcel.Constants.F2L);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitF2L(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FADD() {
super(org.apache.tomcat.util.bcel.Constants.FADD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitFADD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FALOAD() {
super(org.apache.tomcat.util.bcel.Constants.FALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitFALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FASTORE() {
super(org.apache.tomcat.util.bcel.Constants.FASTORE);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackConsumer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitFASTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java Fri Dec 4 18:56:38 2009
@@ -35,20 +35,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.FLOAT;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitFCMPG(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java Fri Dec 4 18:56:38 2009
@@ -35,20 +35,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.FLOAT;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitFCMPL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java Fri Dec 4 18:56:38 2009
@@ -62,21 +62,4 @@
public Type getType( ConstantPoolGen cp ) {
return Type.FLOAT;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitPushInstruction(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitConstantPushInstruction(this);
- v.visitFCONST(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FDIV() {
super(org.apache.tomcat.util.bcel.Constants.FDIV);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitFDIV(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public FLOAD(int n) {
super(org.apache.tomcat.util.bcel.Constants.FLOAD, org.apache.tomcat.util.bcel.Constants.FLOAD_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitFLOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FMUL() {
super(org.apache.tomcat.util.bcel.Constants.FMUL);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitFMUL(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public FNEG() {
super(org.apache.tomcat.util.bcel.Constants.FNEG);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitFNEG(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FREM() {
super(org.apache.tomcat.util.bcel.Constants.FREM);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitFREM(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FRETURN() {
super(org.apache.tomcat.util.bcel.Constants.FRETURN);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitStackConsumer(this);
- v.visitReturnInstruction(this);
- v.visitFRETURN(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java Fri Dec 4 18:56:38 2009
@@ -40,18 +40,4 @@
public FSTORE(int n) {
super(org.apache.tomcat.util.bcel.Constants.FSTORE, org.apache.tomcat.util.bcel.Constants.FSTORE_0, n);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- super.accept(v);
- v.visitFSTORE(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public FSUB() {
super(org.apache.tomcat.util.bcel.Constants.FSUB);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitFSUB(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java Fri Dec 4 18:56:38 2009
@@ -57,25 +57,4 @@
cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.NULL_POINTER_EXCEPTION;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitExceptionThrower(this);
- v.visitStackConsumer(this);
- v.visitStackProducer(this);
- v.visitTypedInstruction(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitFieldInstruction(this);
- v.visitGETFIELD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java Fri Dec 4 18:56:38 2009
@@ -55,25 +55,4 @@
cs[ExceptionConstants.EXCS_FIELD_AND_METHOD_RESOLUTION.length] = ExceptionConstants.INCOMPATIBLE_CLASS_CHANGE_ERROR;
return cs;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitPushInstruction(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitLoadClass(this);
- v.visitCPInstruction(this);
- v.visitFieldOrMethod(this);
- v.visitFieldInstruction(this);
- v.visitGETSTATIC(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java Fri Dec 4 18:56:38 2009
@@ -69,21 +69,4 @@
}
return 0;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitVariableLengthInstruction(this);
- v.visitUnconditionalBranch(this);
- v.visitBranchInstruction(this);
- v.visitGotoInstruction(this);
- v.visitGOTO(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java Fri Dec 4 18:56:38 2009
@@ -60,20 +60,4 @@
index = bytes.readInt();
length = 5;
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitUnconditionalBranch(this);
- v.visitBranchInstruction(this);
- v.visitGotoInstruction(this);
- v.visitGOTO_W(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public I2B() {
super(org.apache.tomcat.util.bcel.Constants.I2B);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitI2B(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public I2C() {
super(org.apache.tomcat.util.bcel.Constants.I2C);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitI2C(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public I2D() {
super(org.apache.tomcat.util.bcel.Constants.I2D);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitI2D(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public I2F() {
super(org.apache.tomcat.util.bcel.Constants.I2F);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitI2F(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public I2L() {
super(org.apache.tomcat.util.bcel.Constants.I2L);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitI2L(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public I2S() {
super(org.apache.tomcat.util.bcel.Constants.I2S);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitConversionInstruction(this);
- v.visitI2S(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java Fri Dec 4 18:56:38 2009
@@ -30,21 +30,4 @@
public IADD() {
super(org.apache.tomcat.util.bcel.Constants.IADD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIADD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java Fri Dec 4 18:56:38 2009
@@ -31,21 +31,4 @@
public IALOAD() {
super(org.apache.tomcat.util.bcel.Constants.IALOAD);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitStackProducer(this);
- v.visitExceptionThrower(this);
- v.visitTypedInstruction(this);
- v.visitArrayInstruction(this);
- v.visitIALOAD(this);
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java?rev=887319&r1=887318&r2=887319&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java Fri Dec 4 18:56:38 2009
@@ -28,21 +28,4 @@
public IAND() {
super(org.apache.tomcat.util.bcel.Constants.IAND);
}
-
-
- /**
- * Call corresponding visitor method(s). The order is:
- * Call visitor methods of implemented interfaces first, then
- * call methods according to the class hierarchy in descending order,
- * i.e., the most specific visitXXX() call comes last.
- *
- * @param v Visitor object
- */
- public void accept( Visitor v ) {
- v.visitTypedInstruction(this);
- v.visitStackProducer(this);
- v.visitStackConsumer(this);
- v.visitArithmeticInstruction(this);
- v.visitIAND(this);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Author: markt
Date: Fri Dec 4 18:12:33 2009
New Revision: 887307
URL: http://svn.apache.org/viewvc?rev=887307&view=rev
Log:
Remove the verifier
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSTORE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* FSTORE - Store float into local variable
@@ -30,7 +30,7 @@
* Instruction.readInstruction(). Not to be used otherwise.
*/
FSTORE() {
- super(org.apache.bcel.Constants.FSTORE, org.apache.bcel.Constants.FSTORE_0);
+ super(org.apache.tomcat.util.bcel.Constants.FSTORE, org.apache.tomcat.util.bcel.Constants.FSTORE_0);
}
@@ -38,7 +38,7 @@
* @param n index of local variable
*/
public FSTORE(int n) {
- super(org.apache.bcel.Constants.FSTORE, org.apache.bcel.Constants.FSTORE_0, n);
+ super(org.apache.tomcat.util.bcel.Constants.FSTORE, org.apache.tomcat.util.bcel.Constants.FSTORE_0, n);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FSUB.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* FSUB - Substract floats
@@ -28,7 +28,7 @@
/** Substract floats
*/
public FSUB() {
- super(org.apache.bcel.Constants.FSUB);
+ super(org.apache.tomcat.util.bcel.Constants.FSUB);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGen.java Fri Dec 4 17:59:52 2009
@@ -14,22 +14,22 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.Annotations;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantObject;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.Utility;
-import org.apache.bcel.util.BCELComparator;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.Annotations;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantObject;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
* Template class for building up a field. The only extraordinary thing
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java Fri Dec 4 17:59:52 2009
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.util.ArrayList;
import java.util.List;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.AccessFlags;
-import org.apache.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.AccessFlags;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
/**
* Super class for FieldGen and MethodGen objects, since they have
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
/**
* Super class for the GET/PUTxxx family of instructions.
@@ -46,8 +46,8 @@
* @return mnemonic for instruction with symbolic references resolved
*/
public String toString( ConstantPool cp ) {
- return org.apache.bcel.Constants.OPCODE_NAMES[opcode] + " "
- + cp.constantToString(index, org.apache.bcel.Constants.CONSTANT_Fieldref);
+ return org.apache.tomcat.util.bcel.Constants.OPCODE_NAMES[opcode] + " "
+ + cp.constantToString(index, org.apache.tomcat.util.bcel.Constants.CONSTANT_Fieldref);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Imnplement this interface if you're interested in changes to a FieldGen object
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java Fri Dec 4 17:59:52 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.classfile.ConstantCP;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ConstantCP;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
/**
* Super class for InvokeInstruction and FieldInstruction, since they have
@@ -79,7 +79,7 @@
ConstantPool cp = cpg.getConstantPool();
ConstantCP cmr = (ConstantCP) cp.getConstant(index);
String className = cp.getConstantString(cmr.getClassIndex(),
- org.apache.bcel.Constants.CONSTANT_Class);
+ org.apache.tomcat.util.bcel.Constants.CONSTANT_Class);
if (className.startsWith("[")) {
// Turn array classes into java.lang.Object.
return "java.lang.Object";
@@ -110,7 +110,7 @@
ConstantPool cp = cpg.getConstantPool();
ConstantCP cmr = (ConstantCP) cp.getConstant(index);
String className = cp.getConstantString(cmr.getClassIndex(),
- org.apache.bcel.Constants.CONSTANT_Class);
+ org.apache.tomcat.util.bcel.Constants.CONSTANT_Class);
if (className.startsWith("[")) {
return (ArrayType) Type.getType(className);
} else {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
/**
* GETFIELD - Fetch field from object
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
/**
* GETSTATIC - Fetch static field from class
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -36,7 +36,7 @@
public GOTO(InstructionHandle target) {
- super(org.apache.bcel.Constants.GOTO, target);
+ super(org.apache.tomcat.util.bcel.Constants.GOTO, target);
}
@@ -46,7 +46,7 @@
*/
public void dump( DataOutputStream out ) throws IOException {
index = getTargetOffset();
- if (opcode == org.apache.bcel.Constants.GOTO) {
+ if (opcode == org.apache.tomcat.util.bcel.Constants.GOTO) {
super.dump(out);
} else { // GOTO_W
index = getTargetOffset();
@@ -63,7 +63,7 @@
int i = getTargetOffset(); // Depending on old position value
position += offset; // Position may be shifted by preceding expansions
if (Math.abs(i) >= (32767 - max_offset)) { // to large for short (estimate)
- opcode = org.apache.bcel.Constants.GOTO_W;
+ opcode = org.apache.tomcat.util.bcel.Constants.GOTO_W;
length = 5;
return 2; // 5 - 3
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* GOTO_W - Branch always (to relative offset, not absolute address)
@@ -37,7 +37,7 @@
public GOTO_W(InstructionHandle target) {
- super(org.apache.bcel.Constants.GOTO_W, target);
+ super(org.apache.tomcat.util.bcel.Constants.GOTO_W, target);
length = 5;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Super class for GOTO
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* I2B - Convert int to byte
@@ -28,7 +28,7 @@
/** Convert int to byte
*/
public I2B() {
- super(org.apache.bcel.Constants.I2B);
+ super(org.apache.tomcat.util.bcel.Constants.I2B);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* I2C - Convert int to char
@@ -28,7 +28,7 @@
/** Convert int to char
*/
public I2C() {
- super(org.apache.bcel.Constants.I2C);
+ super(org.apache.tomcat.util.bcel.Constants.I2C);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* I2D - Convert int to double
@@ -28,7 +28,7 @@
/** Convert int to double
*/
public I2D() {
- super(org.apache.bcel.Constants.I2D);
+ super(org.apache.tomcat.util.bcel.Constants.I2D);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* I2F - Convert int to float
@@ -28,7 +28,7 @@
/** Convert int to float
*/
public I2F() {
- super(org.apache.bcel.Constants.I2F);
+ super(org.apache.tomcat.util.bcel.Constants.I2F);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* I2L - Convert int to long
@@ -28,7 +28,7 @@
/** Convert int to long
*/
public I2L() {
- super(org.apache.bcel.Constants.I2L);
+ super(org.apache.tomcat.util.bcel.Constants.I2L);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* I2S - Convert int to short
@@ -26,7 +26,7 @@
public class I2S extends ConversionInstruction {
public I2S() {
- super(org.apache.bcel.Constants.I2S);
+ super(org.apache.tomcat.util.bcel.Constants.I2S);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IADD - Add ints
@@ -28,7 +28,7 @@
/** Add ints
*/
public IADD() {
- super(org.apache.bcel.Constants.IADD);
+ super(org.apache.tomcat.util.bcel.Constants.IADD);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IALOAD - Load int from array
@@ -29,7 +29,7 @@
* Load int from array
*/
public IALOAD() {
- super(org.apache.bcel.Constants.IALOAD);
+ super(org.apache.tomcat.util.bcel.Constants.IALOAD);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IAND - Bitwise AND int
@@ -26,7 +26,7 @@
public class IAND extends ArithmeticInstruction {
public IAND() {
- super(org.apache.bcel.Constants.IAND);
+ super(org.apache.tomcat.util.bcel.Constants.IAND);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IASTORE - Store into int array
@@ -29,7 +29,7 @@
* Store into int array
*/
public IASTORE() {
- super(org.apache.bcel.Constants.IASTORE);
+ super(org.apache.tomcat.util.bcel.Constants.IASTORE);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* ICONST - Push value between -1, ..., 5, other values cause an exception
@@ -38,9 +38,9 @@
public ICONST(int i) {
- super(org.apache.bcel.Constants.ICONST_0, (short) 1);
+ super(org.apache.tomcat.util.bcel.Constants.ICONST_0, (short) 1);
if ((i >= -1) && (i <= 5)) {
- opcode = (short) (org.apache.bcel.Constants.ICONST_0 + i); // Even works for i == -1
+ opcode = (short) (org.apache.tomcat.util.bcel.Constants.ICONST_0 + i); // Even works for i == -1
} else {
throw new ClassGenException("ICONST can be used only for value between -1 and 5: " + i);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IDIV - Divide ints
@@ -28,7 +28,7 @@
/** Divide ints
*/
public IDIV() {
- super(org.apache.bcel.Constants.IDIV);
+ super(org.apache.tomcat.util.bcel.Constants.IDIV);
}
@@ -36,7 +36,7 @@
*/
public Class[] getExceptions() {
return new Class[] {
- org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
+ org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFEQ - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@
public IFEQ(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFEQ, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFEQ, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFGE - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@
public IFGE(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFGE, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFGE, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFGT - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@
public IFGT(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFGT, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFGT, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFLE - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@
public IFLE(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFLE, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFLE, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFLT - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@
public IFLT(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFLT, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFLT, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFNE - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@
public IFNE(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFNE, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFNE, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFNONNULL - Branch if reference is not null
@@ -35,7 +35,7 @@
public IFNONNULL(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFNONNULL, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFNONNULL, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IFNULL - Branch if reference is not null
@@ -35,7 +35,7 @@
public IFNULL(InstructionHandle target) {
- super(org.apache.bcel.Constants.IFNULL, target);
+ super(org.apache.tomcat.util.bcel.Constants.IFNULL, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ACMPEQ - Branch if reference comparison succeeds
@@ -35,7 +35,7 @@
public IF_ACMPEQ(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ACMPEQ, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ACMPEQ, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ACMPNE - Branch if reference comparison doesn't succeed
@@ -35,7 +35,7 @@
public IF_ACMPNE(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ACMPNE, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ACMPNE, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ICMPEQ - Branch if int comparison succeeds
@@ -35,7 +35,7 @@
public IF_ICMPEQ(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ICMPEQ, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ICMPEQ, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ICMPGE - Branch if int comparison succeeds
@@ -35,7 +35,7 @@
public IF_ICMPGE(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ICMPGE, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ICMPGE, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ICMPGT - Branch if int comparison succeeds
@@ -35,7 +35,7 @@
public IF_ICMPGT(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ICMPGT, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ICMPGT, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ICMPLE - Branch if int comparison succeeds
@@ -35,7 +35,7 @@
public IF_ICMPLE(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ICMPLE, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ICMPLE, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ICMPLT - Branch if int comparison succeeds
@@ -35,7 +35,7 @@
public IF_ICMPLT(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ICMPLT, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ICMPLT, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IF_ICMPNE - Branch if int comparison doesn't succeed
@@ -35,7 +35,7 @@
public IF_ICMPNE(InstructionHandle target) {
- super(org.apache.bcel.Constants.IF_ICMPNE, target);
+ super(org.apache.tomcat.util.bcel.Constants.IF_ICMPNE, target);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* IINC - Increment local variable by constant
@@ -46,7 +46,7 @@
*/
public IINC(int n, int c) {
super(); // Default behaviour of LocalVariableInstruction causes error
- this.opcode = org.apache.bcel.Constants.IINC;
+ this.opcode = org.apache.tomcat.util.bcel.Constants.IINC;
this.length = (short) 3;
setIndex(n); // May set wide as side effect
setIncrement(c);
@@ -59,7 +59,7 @@
*/
public void dump( DataOutputStream out ) throws IOException {
if (wide) {
- out.writeByte(org.apache.bcel.Constants.WIDE);
+ out.writeByte(org.apache.tomcat.util.bcel.Constants.WIDE);
}
out.writeByte(opcode);
if (wide) {
@@ -73,7 +73,7 @@
private final void setWide() {
- wide = (n > org.apache.bcel.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE);
+ wide = (n > org.apache.tomcat.util.bcel.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE);
if (wide) {
length = 6; // wide byte included
} else {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* ILOAD - Load int from local variable onto stack
@@ -30,7 +30,7 @@
* Instruction.readInstruction(). Not to be used otherwise.
*/
ILOAD() {
- super(org.apache.bcel.Constants.ILOAD, org.apache.bcel.Constants.ILOAD_0);
+ super(org.apache.tomcat.util.bcel.Constants.ILOAD, org.apache.tomcat.util.bcel.Constants.ILOAD_0);
}
@@ -38,7 +38,7 @@
* @param n index of local variable
*/
public ILOAD(int n) {
- super(org.apache.bcel.Constants.ILOAD, org.apache.bcel.Constants.ILOAD_0, n);
+ super(org.apache.tomcat.util.bcel.Constants.ILOAD, org.apache.tomcat.util.bcel.Constants.ILOAD_0, n);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IMPDEP1 - Implementation dependent
@@ -25,7 +25,7 @@
public class IMPDEP1 extends Instruction {
public IMPDEP1() {
- super(org.apache.bcel.Constants.IMPDEP1, (short) 1);
+ super(org.apache.tomcat.util.bcel.Constants.IMPDEP1, (short) 1);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IMPDEP2 - Implementation dependent
@@ -25,7 +25,7 @@
public class IMPDEP2 extends Instruction {
public IMPDEP2() {
- super(org.apache.bcel.Constants.IMPDEP2, (short) 1);
+ super(org.apache.tomcat.util.bcel.Constants.IMPDEP2, (short) 1);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IMUL - Multiply ints
@@ -28,7 +28,7 @@
/** Multiply ints
*/
public IMUL() {
- super(org.apache.bcel.Constants.IMUL);
+ super(org.apache.tomcat.util.bcel.Constants.IMUL);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* INEG - Negate int
@@ -26,7 +26,7 @@
public class INEG extends ArithmeticInstruction {
public INEG() {
- super(org.apache.bcel.Constants.INEG);
+ super(org.apache.tomcat.util.bcel.Constants.INEG);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* INSTANCEOF - Determine if object is of given type
@@ -35,12 +35,12 @@
public INSTANCEOF(int index) {
- super(org.apache.bcel.Constants.INSTANCEOF, index);
+ super(org.apache.tomcat.util.bcel.Constants.INSTANCEOF, index);
}
public Class[] getExceptions() {
- return org.apache.bcel.ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION;
+ return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java Fri Dec 4 17:59:52 2009
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* INVOKEINTERFACE - Invoke interface method
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
/**
* INVOKESPECIAL - Invoke instance method; special handling for superclass, private
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
/**
* INVOKESTATIC - Invoke a class (static) method
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
/**
* INVOKEVIRTUAL - Invoke instance method; dispatch based on class
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IOR - Bitwise OR int
@@ -26,7 +26,7 @@
public class IOR extends ArithmeticInstruction {
public IOR() {
- super(org.apache.bcel.Constants.IOR);
+ super(org.apache.tomcat.util.bcel.Constants.IOR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IREM - Remainder of int
@@ -28,7 +28,7 @@
/** Remainder of ints
*/
public IREM() {
- super(org.apache.bcel.Constants.IREM);
+ super(org.apache.tomcat.util.bcel.Constants.IREM);
}
@@ -36,7 +36,7 @@
*/
public Class[] getExceptions() {
return new Class[] {
- org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
+ org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IRETURN - Return int from method
@@ -28,7 +28,7 @@
/** Return int from method
*/
public IRETURN() {
- super(org.apache.bcel.Constants.IRETURN);
+ super(org.apache.tomcat.util.bcel.Constants.IRETURN);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* ISHL - Arithmetic shift left int
@@ -26,7 +26,7 @@
public class ISHL extends ArithmeticInstruction {
public ISHL() {
- super(org.apache.bcel.Constants.ISHL);
+ super(org.apache.tomcat.util.bcel.Constants.ISHL);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* ISHR - Arithmetic shift right int
@@ -26,7 +26,7 @@
public class ISHR extends ArithmeticInstruction {
public ISHR() {
- super(org.apache.bcel.Constants.ISHR);
+ super(org.apache.tomcat.util.bcel.Constants.ISHR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* ISTORE - Store int from stack into local variable
@@ -30,7 +30,7 @@
* Instruction.readInstruction(). Not to be used otherwise.
*/
ISTORE() {
- super(org.apache.bcel.Constants.ISTORE, org.apache.bcel.Constants.ISTORE_0);
+ super(org.apache.tomcat.util.bcel.Constants.ISTORE, org.apache.tomcat.util.bcel.Constants.ISTORE_0);
}
@@ -38,7 +38,7 @@
* @param n index of local variable
*/
public ISTORE(int n) {
- super(org.apache.bcel.Constants.ISTORE, org.apache.bcel.Constants.ISTORE_0, n);
+ super(org.apache.tomcat.util.bcel.Constants.ISTORE, org.apache.tomcat.util.bcel.Constants.ISTORE_0, n);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* ISUB - Substract ints
@@ -28,7 +28,7 @@
/** Substract ints
*/
public ISUB() {
- super(org.apache.bcel.Constants.ISUB);
+ super(org.apache.tomcat.util.bcel.Constants.ISUB);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IUSHR - Logical shift right int
@@ -26,7 +26,7 @@
public class IUSHR extends ArithmeticInstruction {
public IUSHR() {
- super(org.apache.bcel.Constants.IUSHR);
+ super(org.apache.tomcat.util.bcel.Constants.IUSHR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* IXOR - Bitwise XOR int
@@ -26,7 +26,7 @@
public class IXOR extends ArithmeticInstruction {
public IXOR() {
- super(org.apache.bcel.Constants.IXOR);
+ super(org.apache.tomcat.util.bcel.Constants.IXOR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Super class for the IFxxx family of instructions.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Denote entity that refers to an index, e.g. local variable instructions,
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java Fri Dec 4 17:59:52 2009
@@ -14,15 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.util.Locale;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* Abstract super class for all Java byte codes.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Equality of instructions isn't clearly to be defined. You might
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java Fri Dec 4 17:59:52 2009
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
/**
* This interface contains shareable instruction objects.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java Fri Dec 4 17:59:52 2009
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
/**
* Instances of this class may be used, e.g., to generate typed
@@ -556,7 +556,7 @@
&& (src == Constants.T_CHAR || src == Constants.T_BYTE || src == Constants.T_SHORT)) {
src = Constants.T_INT;
}
- String name = "org.apache.bcel.generic." + short_names[src - Constants.T_CHAR] + "2"
+ String name = "org.apache.tomcat.util.bcel.generic." + short_names[src - Constants.T_CHAR] + "2"
+ short_names[dest - Constants.T_CHAR];
Instruction i = null;
try {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java Fri Dec 4 17:59:52 2009
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.classfile.Utility;
/**
* Instances of this class give users a handle to the instructions contained in
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
@@ -27,9 +27,9 @@
import java.util.Map;
import java.util.NoSuchElementException;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* This class is a container for a list of <a
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionListObserver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionListObserver.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionListObserver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionListObserver.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Implement this interface if you're interested in changes to an InstructionList object
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionTargeter.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Denote that a class targets InstructionHandles within an InstructionList. Namely
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InvokeInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.util.StringTokenizer;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
/**
* Super class for the INVOKExxx family of instructions.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -36,7 +36,7 @@
public JSR(InstructionHandle target) {
- super(org.apache.bcel.Constants.JSR, target);
+ super(org.apache.tomcat.util.bcel.Constants.JSR, target);
}
@@ -46,7 +46,7 @@
*/
public void dump( DataOutputStream out ) throws IOException {
index = getTargetOffset();
- if (opcode == org.apache.bcel.Constants.JSR) {
+ if (opcode == org.apache.tomcat.util.bcel.Constants.JSR) {
super.dump(out);
} else { // JSR_W
index = getTargetOffset();
@@ -60,7 +60,7 @@
int i = getTargetOffset(); // Depending on old position value
position += offset; // Position may be shifted by preceding expansions
if (Math.abs(i) >= (32767 - max_offset)) { // to large for short (estimate)
- opcode = org.apache.bcel.Constants.JSR_W;
+ opcode = org.apache.tomcat.util.bcel.Constants.JSR_W;
length = 5;
return 2; // 5 - 3
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* JSR_W - Jump to subroutine
@@ -37,7 +37,7 @@
public JSR_W(InstructionHandle target) {
- super(org.apache.bcel.Constants.JSR_W, target);
+ super(org.apache.tomcat.util.bcel.Constants.JSR_W, target);
length = 5;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Super class for JSR - Jump to subroutine
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* L2D - Convert long to double
@@ -26,7 +26,7 @@
public class L2D extends ConversionInstruction {
public L2D() {
- super(org.apache.bcel.Constants.L2D);
+ super(org.apache.tomcat.util.bcel.Constants.L2D);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* L2F - Convert long to float
@@ -26,7 +26,7 @@
public class L2F extends ConversionInstruction {
public L2F() {
- super(org.apache.bcel.Constants.L2F);
+ super(org.apache.tomcat.util.bcel.Constants.L2F);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* L2I - Convert long to int
@@ -26,7 +26,7 @@
public class L2I extends ConversionInstruction {
public L2I() {
- super(org.apache.bcel.Constants.L2I);
+ super(org.apache.tomcat.util.bcel.Constants.L2I);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LADD - Add longs
@@ -27,7 +27,7 @@
public class LADD extends ArithmeticInstruction {
public LADD() {
- super(org.apache.bcel.Constants.LADD);
+ super(org.apache.tomcat.util.bcel.Constants.LADD);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LALOAD - Load long from array
@@ -28,7 +28,7 @@
/** Load long from array
*/
public LALOAD() {
- super(org.apache.bcel.Constants.LALOAD);
+ super(org.apache.tomcat.util.bcel.Constants.LALOAD);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LAND - Bitwise AND longs
@@ -27,7 +27,7 @@
public class LAND extends ArithmeticInstruction {
public LAND() {
- super(org.apache.bcel.Constants.LAND);
+ super(org.apache.tomcat.util.bcel.Constants.LAND);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LASTORE - Store into long array
@@ -28,7 +28,7 @@
/** Store long into array
*/
public LASTORE() {
- super(org.apache.bcel.Constants.LASTORE);
+ super(org.apache.tomcat.util.bcel.Constants.LASTORE);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LCMP - Compare longs:
@@ -27,7 +27,7 @@
public class LCMP extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
public LCMP() {
- super(org.apache.bcel.Constants.LCMP, (short) 1);
+ super(org.apache.tomcat.util.bcel.Constants.LCMP, (short) 1);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LCONST - Push 0 or 1, other values cause an exception
@@ -38,11 +38,11 @@
public LCONST(long l) {
- super(org.apache.bcel.Constants.LCONST_0, (short) 1);
+ super(org.apache.tomcat.util.bcel.Constants.LCONST_0, (short) 1);
if (l == 0) {
- opcode = org.apache.bcel.Constants.LCONST_0;
+ opcode = org.apache.tomcat.util.bcel.Constants.LCONST_0;
} else if (l == 1) {
- opcode = org.apache.bcel.Constants.LCONST_1;
+ opcode = org.apache.tomcat.util.bcel.Constants.LCONST_1;
} else {
throw new ClassGenException("LCONST can be used only for 0 and 1: " + l);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* LDC - Push item from constant pool.
@@ -40,18 +40,18 @@
public LDC(int index) {
- super(org.apache.bcel.Constants.LDC_W, index);
+ super(org.apache.tomcat.util.bcel.Constants.LDC_W, index);
setSize();
}
// Adjust to proper size
protected final void setSize() {
- if (index <= org.apache.bcel.Constants.MAX_BYTE) { // Fits in one byte?
- opcode = org.apache.bcel.Constants.LDC;
+ if (index <= org.apache.tomcat.util.bcel.Constants.MAX_BYTE) { // Fits in one byte?
+ opcode = org.apache.tomcat.util.bcel.Constants.LDC;
length = 2;
} else {
- opcode = org.apache.bcel.Constants.LDC_W;
+ opcode = org.apache.tomcat.util.bcel.Constants.LDC_W;
length = 3;
}
}
@@ -90,17 +90,17 @@
public Object getValue( ConstantPoolGen cpg ) {
- org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index);
+ org.apache.tomcat.util.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index);
switch (c.getTag()) {
- case org.apache.bcel.Constants.CONSTANT_String:
- int i = ((org.apache.bcel.classfile.ConstantString) c).getStringIndex();
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_String:
+ int i = ((org.apache.tomcat.util.bcel.classfile.ConstantString) c).getStringIndex();
c = cpg.getConstantPool().getConstant(i);
- return ((org.apache.bcel.classfile.ConstantUtf8) c).getBytes();
- case org.apache.bcel.Constants.CONSTANT_Float:
- return new Float(((org.apache.bcel.classfile.ConstantFloat) c).getBytes());
- case org.apache.bcel.Constants.CONSTANT_Integer:
- return new Integer(((org.apache.bcel.classfile.ConstantInteger) c).getBytes());
- case org.apache.bcel.Constants.CONSTANT_Class:
+ return ((org.apache.tomcat.util.bcel.classfile.ConstantUtf8) c).getBytes();
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Float:
+ return new Float(((org.apache.tomcat.util.bcel.classfile.ConstantFloat) c).getBytes());
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Integer:
+ return new Integer(((org.apache.tomcat.util.bcel.classfile.ConstantInteger) c).getBytes());
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Class:
return c;
default: // Never reached
throw new RuntimeException("Unknown or invalid constant type at " + index);
@@ -110,13 +110,13 @@
public Type getType( ConstantPoolGen cpg ) {
switch (cpg.getConstantPool().getConstant(index).getTag()) {
- case org.apache.bcel.Constants.CONSTANT_String:
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_String:
return Type.STRING;
- case org.apache.bcel.Constants.CONSTANT_Float:
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Float:
return Type.FLOAT;
- case org.apache.bcel.Constants.CONSTANT_Integer:
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Integer:
return Type.INT;
- case org.apache.bcel.Constants.CONSTANT_Class:
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Class:
return Type.CLASS;
default: // Never reached
throw new RuntimeException("Unknown or invalid constant type at " + index);
@@ -125,7 +125,7 @@
public Class[] getExceptions() {
- return org.apache.bcel.ExceptionConstants.EXCS_STRING_RESOLUTION;
+ return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_STRING_RESOLUTION;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LDC2_W - Push long or double from constant pool
@@ -35,15 +35,15 @@
public LDC2_W(int index) {
- super(org.apache.bcel.Constants.LDC2_W, index);
+ super(org.apache.tomcat.util.bcel.Constants.LDC2_W, index);
}
public Type getType( ConstantPoolGen cpg ) {
switch (cpg.getConstantPool().getConstant(index).getTag()) {
- case org.apache.bcel.Constants.CONSTANT_Long:
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Long:
return Type.LONG;
- case org.apache.bcel.Constants.CONSTANT_Double:
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Double:
return Type.DOUBLE;
default: // Never reached
throw new RuntimeException("Unknown constant type " + opcode);
@@ -52,12 +52,12 @@
public Number getValue( ConstantPoolGen cpg ) {
- org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index);
+ org.apache.tomcat.util.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index);
switch (c.getTag()) {
- case org.apache.bcel.Constants.CONSTANT_Long:
- return new Long(((org.apache.bcel.classfile.ConstantLong) c).getBytes());
- case org.apache.bcel.Constants.CONSTANT_Double:
- return new Double(((org.apache.bcel.classfile.ConstantDouble) c).getBytes());
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Long:
+ return new Long(((org.apache.tomcat.util.bcel.classfile.ConstantLong) c).getBytes());
+ case org.apache.tomcat.util.bcel.Constants.CONSTANT_Double:
+ return new Double(((org.apache.tomcat.util.bcel.classfile.ConstantDouble) c).getBytes());
default: // Never reached
throw new RuntimeException("Unknown or invalid constant type at " + index);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* LDC_W - Push item from constant pool (wide index)
@@ -48,7 +48,7 @@
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
setIndex(bytes.readUnsignedShort());
// Override just in case it has been changed
- opcode = org.apache.bcel.Constants.LDC_W;
+ opcode = org.apache.tomcat.util.bcel.Constants.LDC_W;
length = 3;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/GraphicalVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/GraphicalVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/GraphicalVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/GraphicalVerifier.java Fri Dec 4 17:59:52 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
import java.awt.Dimension;
import java.awt.Toolkit;
import javax.swing.UIManager;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.generic.Type;
/**
* A graphical user interface application demonstrating JustIce.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
/**
* The NativeVerifier class implements a main(String[] args) method that's
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
import java.util.ArrayList;
import java.util.List;
@@ -42,7 +42,7 @@
*
* @version $Id$
* @author Enver Haase
- * @see org.apache.bcel.verifier.Verifier
+ * @see org.apache.tomcat.util.bcel.verifier.Verifier
* @see #verify()
*/
public abstract class PassVerifier {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
/**
* This class has a main method implementing a demonstration program
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
/**
* A VerificationResult is what a PassVerifier returns
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java Fri Dec 4 17:59:52 2009
@@ -14,17 +14,17 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.verifier.statics.Pass1Verifier;
-import org.apache.bcel.verifier.statics.Pass2Verifier;
-import org.apache.bcel.verifier.statics.Pass3aVerifier;
-import org.apache.bcel.verifier.structurals.Pass3bVerifier;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.verifier.statics.Pass1Verifier;
+import org.apache.tomcat.util.bcel.verifier.statics.Pass2Verifier;
+import org.apache.tomcat.util.bcel.verifier.statics.Pass3aVerifier;
+import org.apache.tomcat.util.bcel.verifier.structurals.Pass3bVerifier;
/**
* A Verifier instance is there to verify a class file according to The Java Virtual
@@ -39,8 +39,8 @@
*
* @version $Id$
* @author Enver Haase
- * @see org.apache.bcel.verifier.VerifierFactory
- * @see org.apache.bcel.verifier.PassVerifier
+ * @see org.apache.tomcat.util.bcel.verifier.VerifierFactory
+ * @see org.apache.tomcat.util.bcel.verifier.PassVerifier
*/
public class Verifier {
@@ -164,7 +164,7 @@
int meth = pv.getMethodNo();
for (int i = 0; i < p3am.length; i++) {
messages.add("Pass 3a, method " + meth + " ('"
- + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth]
+ + org.apache.tomcat.util.bcel.Repository.lookupClass(classname).getMethods()[meth]
+ "'): " + p3am[i]);
}
}
@@ -175,7 +175,7 @@
int meth = pv.getMethodNo();
for (int i = 0; i < p3bm.length; i++) {
messages.add("Pass 3b, method " + meth + " ('"
- + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth]
+ + org.apache.tomcat.util.bcel.Repository.lookupClass(classname).getMethods()[meth]
+ "'): " + p3bm[i]);
}
}
@@ -217,7 +217,7 @@
vr = v.doPass2();
System.out.println("Pass 2:\n" + vr);
if (vr == VerificationResult.VR_OK) {
- JavaClass jc = org.apache.bcel.Repository.lookupClass(args[k]);
+ JavaClass jc = org.apache.tomcat.util.bcel.Repository.lookupClass(args[k]);
for (int i = 0; i < jc.getMethods().length; i++) {
vr = v.doPass3a(i);
System.out.println("Pass 3a, method number " + i + " ['"
@@ -238,7 +238,7 @@
System.out.println("\n");
// avoid swapping.
v.flush();
- org.apache.bcel.Repository.clearCache();
+ org.apache.tomcat.util.bcel.Repository.clearCache();
System.gc();
} catch (ClassNotFoundException e) {
e.printStackTrace();
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
import java.awt.AWTEvent;
import java.awt.CardLayout;
@@ -36,8 +36,8 @@
import javax.swing.JTextPane;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
/**
* This class implements a machine-generated frame for use with
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
import java.util.HashMap;
import java.util.Iterator;
@@ -30,7 +30,7 @@
*
* @version $Id$
* @author Enver Haase
- * @see org.apache.bcel.verifier.Verifier
+ * @see org.apache.tomcat.util.bcel.verifier.Verifier
*/
public class VerifierFactory {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
import javax.swing.event.ListDataEvent;
@@ -25,7 +25,7 @@
* @version $Id$
* @author Enver Haase
*/
-public class VerifierFactoryListModel implements org.apache.bcel.verifier.VerifierFactoryObserver,
+public class VerifierFactoryListModel implements org.apache.tomcat.util.bcel.verifier.VerifierFactoryObserver,
javax.swing.ListModel {
private java.util.ArrayList listeners = new java.util.ArrayList();
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
/**
* VerifierFactoryObserver instances are notified when new Verifier
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
import java.awt.Color;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
/**
* A class for simple graphical class file verification.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/AssertionViolatedException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/AssertionViolatedException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/AssertionViolatedException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/AssertionViolatedException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/ClassConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/ClassConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/ClassConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/ClassConstraintException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
* Instances of this class are thrown by BCEL's class file verifier "JustIce" when
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
* Instances of this class are thrown by BCEL's class file verifier "JustIce"
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
* Instances of this class are thrown by BCEL's class file verifier "JustIce" when
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LoadingException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LoadingException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LoadingException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LoadingException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LocalVariableInfoInconsistentException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LocalVariableInfoInconsistentException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LocalVariableInfoInconsistentException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LocalVariableInfoInconsistentException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeConstraintException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionConstraintException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
* Instances of this class are thrown by BCEL's class file verifier "JustIce" when
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/Utility.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/Utility.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/Utility.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/Utility.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
import java.io.PrintWriter;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerificationException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerificationException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerificationException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerificationException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerifierConstraintViolatedException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerifierConstraintViolatedException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerifierConstraintViolatedException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/VerifierConstraintViolatedException.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.Type;
/**
* This class represents the upper half of a DOUBLE variable.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/IntList.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/IntList.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/IntList.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/IntList.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
import java.util.ArrayList;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.Type;
/**
* This class represents the upper half of a LONG variable.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java Fri Dec 4 17:59:52 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
import java.util.Hashtable;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.LocalVariableInfoInconsistentException;
/**
* A utility class holding the information about
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java Fri Dec 4 17:59:52 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.LocalVariableInfoInconsistentException;
/**
* A utility class holding the information about
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java Fri Dec 4 17:59:52 2009
@@ -14,17 +14,17 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.ClassFormatException;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.exc.LoadingException;
-import org.apache.bcel.verifier.exc.Utility;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.exc.LoadingException;
+import org.apache.tomcat.util.bcel.verifier.exc.Utility;
/**
* This PassVerifier verifies a class file according to pass 1 as
@@ -66,7 +66,7 @@
/**
* Should only be instantiated by a Verifier.
*
- * @see org.apache.bcel.verifier.Verifier
+ * @see org.apache.tomcat.util.bcel.verifier.Verifier
*/
public Pass1Verifier(Verifier owner){
myOwner = owner;
@@ -128,7 +128,7 @@
* (like the check for extra bytes at the end of the class file) are handy when actually using BCEL to repair a class file (otherwise you would not be
* able to load it into BCEL).
*
- * @see org.apache.bcel.Repository
+ * @see org.apache.tomcat.util.bcel.Repository
*/
public VerificationResult do_verify(){
JavaClass jc;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
import java.util.HashMap;
@@ -22,54 +22,54 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.ClassFormatException;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.Deprecated;
-import org.apache.bcel.classfile.DescendingVisitor;
-import org.apache.bcel.classfile.EmptyVisitor;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.InnerClass;
-import org.apache.bcel.classfile.InnerClasses;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.LineNumber;
-import org.apache.bcel.classfile.LineNumberTable;
-import org.apache.bcel.classfile.LocalVariable;
-import org.apache.bcel.classfile.LocalVariableTable;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.Node;
-import org.apache.bcel.classfile.SourceFile;
-import org.apache.bcel.classfile.Synthetic;
-import org.apache.bcel.classfile.Unknown;
-import org.apache.bcel.classfile.Visitor;
-import org.apache.bcel.generic.ArrayType;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.VerifierFactory;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.ClassConstraintException;
-import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+import org.apache.tomcat.util.bcel.classfile.Deprecated;
+import org.apache.tomcat.util.bcel.classfile.DescendingVisitor;
+import org.apache.tomcat.util.bcel.classfile.EmptyVisitor;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.InnerClass;
+import org.apache.tomcat.util.bcel.classfile.InnerClasses;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumberTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.Node;
+import org.apache.tomcat.util.bcel.classfile.SourceFile;
+import org.apache.tomcat.util.bcel.classfile.Synthetic;
+import org.apache.tomcat.util.bcel.classfile.Unknown;
+import org.apache.tomcat.util.bcel.classfile.Visitor;
+import org.apache.tomcat.util.bcel.generic.ArrayType;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.VerifierFactory;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.ClassConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.LocalVariableInfoInconsistentException;
/**
* This PassVerifier verifies a class file according to
@@ -143,7 +143,7 @@
* the "Code" array of methods in a few cases. Please
* see the pass 3a documentation, too.
*
- * @see org.apache.bcel.verifier.statics.Pass3aVerifier
+ * @see org.apache.tomcat.util.bcel.verifier.statics.Pass3aVerifier
*/
public VerificationResult do_verify(){
try {
@@ -310,7 +310,7 @@
*
* @see #constant_pool_entries_satisfy_static_constraints()
*/
- private class CPESSC_Visitor extends org.apache.bcel.classfile.EmptyVisitor implements Visitor{
+ private class CPESSC_Visitor extends org.apache.tomcat.util.bcel.classfile.EmptyVisitor implements Visitor{
private Class CONST_Class;
/*
private Class CONST_Fieldref;
@@ -339,19 +339,19 @@
cp = _jc.getConstantPool();
cplen = cp.getLength();
- CONST_Class = org.apache.bcel.classfile.ConstantClass.class;
+ CONST_Class = org.apache.tomcat.util.bcel.classfile.ConstantClass.class;
/*
- CONST_Fieldref = org.apache.bcel.classfile.ConstantFieldref.class;
- CONST_Methodref = org.apache.bcel.classfile.ConstantMethodref.class;
- CONST_InterfaceMethodref = org.apache.bcel.classfile.ConstantInterfaceMethodref.class;
+ CONST_Fieldref = org.apache.tomcat.util.bcel.classfile.ConstantFieldref.class;
+ CONST_Methodref = org.apache.tomcat.util.bcel.classfile.ConstantMethodref.class;
+ CONST_InterfaceMethodref = org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref.class;
*/
- CONST_String = org.apache.bcel.classfile.ConstantString.class;
- CONST_Integer = org.apache.bcel.classfile.ConstantInteger.class;
- CONST_Float = org.apache.bcel.classfile.ConstantFloat.class;
- CONST_Long = org.apache.bcel.classfile.ConstantLong.class;
- CONST_Double = org.apache.bcel.classfile.ConstantDouble.class;
- CONST_NameAndType = org.apache.bcel.classfile.ConstantNameAndType.class;
- CONST_Utf8 = org.apache.bcel.classfile.ConstantUtf8.class;
+ CONST_String = org.apache.tomcat.util.bcel.classfile.ConstantString.class;
+ CONST_Integer = org.apache.tomcat.util.bcel.classfile.ConstantInteger.class;
+ CONST_Float = org.apache.tomcat.util.bcel.classfile.ConstantFloat.class;
+ CONST_Long = org.apache.tomcat.util.bcel.classfile.ConstantLong.class;
+ CONST_Double = org.apache.tomcat.util.bcel.classfile.ConstantDouble.class;
+ CONST_NameAndType = org.apache.tomcat.util.bcel.classfile.ConstantNameAndType.class;
+ CONST_Utf8 = org.apache.tomcat.util.bcel.classfile.ConstantUtf8.class;
carrier = new DescendingVisitor(_jc, this);
carrier.visit();
@@ -1181,7 +1181,7 @@
* pool must be valid.</B>
*
* @see #constant_pool_entries_satisfy_static_constraints()
- * @see org.apache.bcel.classfile.ConstantCP
+ * @see org.apache.tomcat.util.bcel.classfile.ConstantCP
*/
private class FAMRAV_Visitor extends EmptyVisitor implements Visitor{
private final ConstantPool cp; // ==jc.getConstantPool() -- only here to save typing work.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java Fri Dec 4 17:59:52 2009
@@ -14,88 +14,88 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.LineNumber;
-import org.apache.bcel.classfile.LineNumberTable;
-import org.apache.bcel.classfile.LocalVariable;
-import org.apache.bcel.classfile.LocalVariableTable;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.generic.ALOAD;
-import org.apache.bcel.generic.ANEWARRAY;
-import org.apache.bcel.generic.ASTORE;
-import org.apache.bcel.generic.ATHROW;
-import org.apache.bcel.generic.ArrayType;
-import org.apache.bcel.generic.BREAKPOINT;
-import org.apache.bcel.generic.CHECKCAST;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.DLOAD;
-import org.apache.bcel.generic.DSTORE;
-import org.apache.bcel.generic.FLOAD;
-import org.apache.bcel.generic.FSTORE;
-import org.apache.bcel.generic.FieldInstruction;
-import org.apache.bcel.generic.GETSTATIC;
-import org.apache.bcel.generic.GotoInstruction;
-import org.apache.bcel.generic.IINC;
-import org.apache.bcel.generic.ILOAD;
-import org.apache.bcel.generic.IMPDEP1;
-import org.apache.bcel.generic.IMPDEP2;
-import org.apache.bcel.generic.INSTANCEOF;
-import org.apache.bcel.generic.INVOKEINTERFACE;
-import org.apache.bcel.generic.INVOKESPECIAL;
-import org.apache.bcel.generic.INVOKESTATIC;
-import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.ISTORE;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.InvokeInstruction;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.LDC;
-import org.apache.bcel.generic.LDC2_W;
-import org.apache.bcel.generic.LLOAD;
-import org.apache.bcel.generic.LOOKUPSWITCH;
-import org.apache.bcel.generic.LSTORE;
-import org.apache.bcel.generic.LoadClass;
-import org.apache.bcel.generic.MULTIANEWARRAY;
-import org.apache.bcel.generic.NEW;
-import org.apache.bcel.generic.NEWARRAY;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.PUTSTATIC;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.TABLESWITCH;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.VerifierFactory;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.ClassConstraintException;
-import org.apache.bcel.verifier.exc.InvalidMethodException;
-import org.apache.bcel.verifier.exc.StaticCodeConstraintException;
-import org.apache.bcel.verifier.exc.StaticCodeInstructionConstraintException;
-import org.apache.bcel.verifier.exc.StaticCodeInstructionOperandConstraintException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumberTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.generic.ALOAD;
+import org.apache.tomcat.util.bcel.generic.ANEWARRAY;
+import org.apache.tomcat.util.bcel.generic.ASTORE;
+import org.apache.tomcat.util.bcel.generic.ATHROW;
+import org.apache.tomcat.util.bcel.generic.ArrayType;
+import org.apache.tomcat.util.bcel.generic.BREAKPOINT;
+import org.apache.tomcat.util.bcel.generic.CHECKCAST;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.generic.DLOAD;
+import org.apache.tomcat.util.bcel.generic.DSTORE;
+import org.apache.tomcat.util.bcel.generic.FLOAD;
+import org.apache.tomcat.util.bcel.generic.FSTORE;
+import org.apache.tomcat.util.bcel.generic.FieldInstruction;
+import org.apache.tomcat.util.bcel.generic.GETSTATIC;
+import org.apache.tomcat.util.bcel.generic.GotoInstruction;
+import org.apache.tomcat.util.bcel.generic.IINC;
+import org.apache.tomcat.util.bcel.generic.ILOAD;
+import org.apache.tomcat.util.bcel.generic.IMPDEP1;
+import org.apache.tomcat.util.bcel.generic.IMPDEP2;
+import org.apache.tomcat.util.bcel.generic.INSTANCEOF;
+import org.apache.tomcat.util.bcel.generic.INVOKEINTERFACE;
+import org.apache.tomcat.util.bcel.generic.INVOKESPECIAL;
+import org.apache.tomcat.util.bcel.generic.INVOKESTATIC;
+import org.apache.tomcat.util.bcel.generic.INVOKEVIRTUAL;
+import org.apache.tomcat.util.bcel.generic.ISTORE;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InstructionList;
+import org.apache.tomcat.util.bcel.generic.InvokeInstruction;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.LDC;
+import org.apache.tomcat.util.bcel.generic.LDC2_W;
+import org.apache.tomcat.util.bcel.generic.LLOAD;
+import org.apache.tomcat.util.bcel.generic.LOOKUPSWITCH;
+import org.apache.tomcat.util.bcel.generic.LSTORE;
+import org.apache.tomcat.util.bcel.generic.LoadClass;
+import org.apache.tomcat.util.bcel.generic.MULTIANEWARRAY;
+import org.apache.tomcat.util.bcel.generic.NEW;
+import org.apache.tomcat.util.bcel.generic.NEWARRAY;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.PUTSTATIC;
+import org.apache.tomcat.util.bcel.generic.RET;
+import org.apache.tomcat.util.bcel.generic.ReturnInstruction;
+import org.apache.tomcat.util.bcel.generic.TABLESWITCH;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.VerifierFactory;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.ClassConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.InvalidMethodException;
+import org.apache.tomcat.util.bcel.verifier.exc.StaticCodeConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.StaticCodeInstructionConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.StaticCodeInstructionOperandConstraintException;
/**
* This PassVerifier verifies a class file according to
@@ -438,7 +438,7 @@
* This visitor class does the actual checking for the instruction
* operand's constraints.
*/
- private class InstOperandConstraintVisitor extends org.apache.bcel.generic.EmptyVisitor{
+ private class InstOperandConstraintVisitor extends org.apache.tomcat.util.bcel.generic.EmptyVisitor{
/** The ConstantPoolGen instance this Visitor operates on. */
private ConstantPoolGen cpg;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java Fri Dec 4 17:59:52 2009
@@ -14,45 +14,45 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
-import org.apache.bcel.classfile.Annotations;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.Deprecated;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.InnerClass;
-import org.apache.bcel.classfile.InnerClasses;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.LineNumber;
-import org.apache.bcel.classfile.LineNumberTable;
-import org.apache.bcel.classfile.LocalVariable;
-import org.apache.bcel.classfile.LocalVariableTable;
-import org.apache.bcel.classfile.LocalVariableTypeTable;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.Node;
-import org.apache.bcel.classfile.Signature;
-import org.apache.bcel.classfile.SourceFile;
-import org.apache.bcel.classfile.StackMap;
-import org.apache.bcel.classfile.Synthetic;
-import org.apache.bcel.classfile.Unknown;
-import org.apache.bcel.classfile.Visitor;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.classfile.Annotations;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+import org.apache.tomcat.util.bcel.classfile.Deprecated;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.InnerClass;
+import org.apache.tomcat.util.bcel.classfile.InnerClasses;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumberTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTypeTable;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.Node;
+import org.apache.tomcat.util.bcel.classfile.Signature;
+import org.apache.tomcat.util.bcel.classfile.SourceFile;
+import org.apache.tomcat.util.bcel.classfile.StackMap;
+import org.apache.tomcat.util.bcel.classfile.Synthetic;
+import org.apache.tomcat.util.bcel.classfile.Unknown;
+import org.apache.tomcat.util.bcel.classfile.Visitor;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
/**
* BCEL's Node classes (those from the classfile API that <B>accept()</B> Visitor
@@ -69,7 +69,7 @@
* @version $Id$
* @author Enver Haase
*/
-public class StringRepresentation extends org.apache.bcel.classfile.EmptyVisitor implements Visitor {
+public class StringRepresentation extends org.apache.tomcat.util.bcel.classfile.EmptyVisitor implements Visitor {
/** The string representation, created by a visitXXX() method, output by toString(). */
private String tostring;
/** The node we ask for its string representation. Not really needed; only for debug output. */
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java Fri Dec 4 17:59:52 2009
@@ -14,25 +14,25 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import org.apache.bcel.generic.ATHROW;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.GotoInstruction;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.Select;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ATHROW;
+import org.apache.tomcat.util.bcel.generic.BranchInstruction;
+import org.apache.tomcat.util.bcel.generic.GotoInstruction;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+import org.apache.tomcat.util.bcel.generic.RET;
+import org.apache.tomcat.util.bcel.generic.ReturnInstruction;
+import org.apache.tomcat.util.bcel.generic.Select;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
/**
* This class represents a control flow graph of a method.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
/**
* This class represents an exception handler; that is, an ObjectType
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
import java.util.HashMap;
@@ -22,9 +22,9 @@
import java.util.Map;
import java.util.Set;
-import org.apache.bcel.generic.CodeExceptionGen;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.MethodGen;
+import org.apache.tomcat.util.bcel.generic.CodeExceptionGen;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
/**
* This class allows easy access to ExceptionHandler objects.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java Fri Dec 4 17:59:52 2009
@@ -14,17 +14,17 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.generic.*;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.generic.*;
/**
* This Visitor class may be used for a type-based Java Virtual Machine
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Frame.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Frame.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Frame.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Frame.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/GenericArray.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/GenericArray.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/GenericArray.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/GenericArray.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java Fri Dec 4 17:59:52 2009
@@ -14,27 +14,27 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.VerifierFactory;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.generic.*;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.VerifierFactory;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
/**
@@ -47,12 +47,12 @@
*
* @version $Id$
* @author Enver Haase
- * @see org.apache.bcel.verifier.exc.StructuralCodeConstraintException
- * @see org.apache.bcel.verifier.exc.LinkingConstraintException
+ * @see org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException
+ * @see org.apache.tomcat.util.bcel.verifier.exc.LinkingConstraintException
*/
-public class InstConstraintVisitor extends EmptyVisitor implements org.apache.bcel.generic.Visitor{
+public class InstConstraintVisitor extends EmptyVisitor implements org.apache.tomcat.util.bcel.generic.Visitor{
- private static ObjectType GENERIC_ARRAY = new ObjectType("org.apache.bcel.verifier.structurals.GenericArray");
+ private static ObjectType GENERIC_ARRAY = new ObjectType("org.apache.tomcat.util.bcel.verifier.structurals.GenericArray");
/**
* The constructor. Constructs a new instance of this class.
@@ -104,7 +104,7 @@
* This method is called by the visitXXX() to notify the acceptor of this InstConstraintVisitor
* that a constraint violation has occured. This is done by throwing an instance of a
* StructuralCodeConstraintException.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException always.
+ * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException always.
*/
private void constraintViolated(Instruction violator, String description){
String fq_classname = violator.getClass().getName();
@@ -143,7 +143,7 @@
/**
* Assures index is of type INT.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
+ * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
*/
private void indexOfInt(Instruction o, Type index){
if (! index.equals(Type.INT)) {
@@ -155,7 +155,7 @@
* Assures the ReferenceType r is initialized (or Type.NULL).
* Formally, this means (!(r instanceof UninitializedObjectType)), because
* there are no uninitialized array types.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
+ * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
*/
private void referenceTypeIsInitialized(Instruction o, ReferenceType r){
if (r instanceof UninitializedObjectType){
@@ -173,7 +173,7 @@
/**
* Assures arrayref is of ArrayType or NULL;
* returns true if and only if arrayref is non-NULL.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is violated.
+ * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is violated.
*/
private boolean arrayrefOfArrayType(Instruction o, Type arrayref){
if (! ((arrayref instanceof ArrayType) || arrayref.equals(Type.NULL)) ) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
import java.util.ArrayList;
-import org.apache.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
/**
* An InstructionContext offers convenient access
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java Fri Dec 4 17:59:52 2009
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
-import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ReferenceType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
/**
* This class implements an array of local variables used for symbolic JVM
@@ -167,7 +167,7 @@
else{
if (! (locals[i].equals(lv.locals[i])) ){
/*TODO
- if ((locals[i] instanceof org.apache.bcel.generic.ReturnaddressType) && (lv.locals[i] instanceof org.apache.bcel.generic.ReturnaddressType)){
+ if ((locals[i] instanceof org.apache.tomcat.util.bcel.generic.ReturnaddressType) && (lv.locals[i] instanceof org.apache.tomcat.util.bcel.generic.ReturnaddressType)){
//System.err.println("merging "+locals[i]+" and "+lv.locals[i]);
throw new AssertionViolatedException("Merging different ReturnAddresses: '"+locals[i]+"' and '"+lv.locals[i]+"'.");
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java Fri Dec 4 17:59:52 2009
@@ -14,20 +14,20 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
import java.util.ArrayList;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.ReferenceType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
/**
* This class implements a stack used for symbolic JVM stack simulation.
* [It's used an an operand stack substitute.]
- * Elements of this stack are org.apache.bcel.generic.Type objects.
+ * Elements of this stack are org.apache.tomcat.util.bcel.generic.Type objects.
*
* @version $Id$
* @author Enver Haase
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
import java.io.PrintWriter;
@@ -24,28 +24,28 @@
import java.util.Random;
import java.util.Vector;
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.GETFIELD;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InvokeInstruction;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.LoadInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.ReturnaddressType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
-import org.apache.bcel.verifier.exc.VerifierConstraintViolatedException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.generic.GETFIELD;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InvokeInstruction;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.LoadInstruction;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.RET;
+import org.apache.tomcat.util.bcel.generic.ReturnInstruction;
+import org.apache.tomcat.util.bcel.generic.ReturnaddressType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.VerifierConstraintViolatedException;
/**
* This PassVerifier verifies a method of class file according to pass 3,
@@ -117,7 +117,7 @@
/**
* This class should only be instantiated by a Verifier.
*
- * @see org.apache.bcel.verifier.Verifier
+ * @see org.apache.tomcat.util.bcel.verifier.Verifier
*/
public Pass3bVerifier(Verifier owner, int method_no){
myOwner = owner;
@@ -301,8 +301,8 @@
* verifier-inferred types and the class file's debug information (LocalVariables
* attributes) match [TODO].
*
- * @see org.apache.bcel.verifier.statics.LocalVariablesInfo
- * @see org.apache.bcel.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
+ * @see org.apache.tomcat.util.bcel.verifier.statics.LocalVariablesInfo
+ * @see org.apache.tomcat.util.bcel.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
*/
public VerificationResult do_verify(){
if (! myOwner.doPass3a(method_no).equals(VerificationResult.VR_OK)){
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
-import org.apache.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
/**
* This interface defines properties of JVM bytecode subroutines.
@@ -40,7 +40,7 @@
* Note that JustIce has a pretty rigid notion of a subroutine.
* <B>Must not be invoked on the 'top-level subroutine'.</B>
*
- * @see org.apache.bcel.verifier.structurals.Subroutines
+ * @see org.apache.tomcat.util.bcel.verifier.structurals.Subroutines
*/
public InstructionHandle getLeavingRET();
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
import java.util.ArrayList;
import java.util.HashMap;
@@ -23,22 +23,22 @@
import java.util.Map;
import java.util.Set;
-import org.apache.bcel.generic.ASTORE;
-import org.apache.bcel.generic.ATHROW;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.CodeExceptionGen;
-import org.apache.bcel.generic.GotoInstruction;
-import org.apache.bcel.generic.IndexedInstruction;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.LocalVariableInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.Select;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ASTORE;
+import org.apache.tomcat.util.bcel.generic.ATHROW;
+import org.apache.tomcat.util.bcel.generic.BranchInstruction;
+import org.apache.tomcat.util.bcel.generic.CodeExceptionGen;
+import org.apache.tomcat.util.bcel.generic.GotoInstruction;
+import org.apache.tomcat.util.bcel.generic.IndexedInstruction;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.LocalVariableInstruction;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+import org.apache.tomcat.util.bcel.generic.RET;
+import org.apache.tomcat.util.bcel.generic.ReturnInstruction;
+import org.apache.tomcat.util.bcel.generic.Select;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
/**
* Instances of this class contain information about the subroutines
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java Fri Dec 4 17:59:52 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.ReferenceType;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.ReferenceType;
/**
* This class represents an uninitialized object type; see The Java
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LDIV - Divide longs
@@ -27,13 +27,13 @@
public class LDIV extends ArithmeticInstruction implements ExceptionThrower {
public LDIV() {
- super(org.apache.bcel.Constants.LDIV);
+ super(org.apache.tomcat.util.bcel.Constants.LDIV);
}
public Class[] getExceptions() {
return new Class[] {
- org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
+ org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LLOAD - Load long from local variable
@@ -30,12 +30,12 @@
* Instruction.readInstruction(). Not to be used otherwise.
*/
LLOAD() {
- super(org.apache.bcel.Constants.LLOAD, org.apache.bcel.Constants.LLOAD_0);
+ super(org.apache.tomcat.util.bcel.Constants.LLOAD, org.apache.tomcat.util.bcel.Constants.LLOAD_0);
}
public LLOAD(int n) {
- super(org.apache.bcel.Constants.LLOAD, org.apache.bcel.Constants.LLOAD_0, n);
+ super(org.apache.tomcat.util.bcel.Constants.LLOAD, org.apache.tomcat.util.bcel.Constants.LLOAD_0, n);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LMUL - Multiply longs
@@ -27,7 +27,7 @@
public class LMUL extends ArithmeticInstruction {
public LMUL() {
- super(org.apache.bcel.Constants.LMUL);
+ super(org.apache.tomcat.util.bcel.Constants.LMUL);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LNEG - Negate long
@@ -26,7 +26,7 @@
public class LNEG extends ArithmeticInstruction {
public LNEG() {
- super(org.apache.bcel.Constants.LNEG);
+ super(org.apache.tomcat.util.bcel.Constants.LNEG);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java Fri Dec 4 17:59:52 2009
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* LOOKUPSWITCH - Switch with unordered set of values
@@ -38,7 +38,7 @@
public LOOKUPSWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
- super(org.apache.bcel.Constants.LOOKUPSWITCH, match, targets, defaultTarget);
+ super(org.apache.tomcat.util.bcel.Constants.LOOKUPSWITCH, match, targets, defaultTarget);
length = (short) (9 + match_length * 8); /* alignment remainder assumed
* 0 here, until dump time. */
fixed_length = length;
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LOR - Bitwise OR long
@@ -26,7 +26,7 @@
public class LOR extends ArithmeticInstruction {
public LOR() {
- super(org.apache.bcel.Constants.LOR);
+ super(org.apache.tomcat.util.bcel.Constants.LOR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LREM - Remainder of long
@@ -26,13 +26,13 @@
public class LREM extends ArithmeticInstruction implements ExceptionThrower {
public LREM() {
- super(org.apache.bcel.Constants.LREM);
+ super(org.apache.tomcat.util.bcel.Constants.LREM);
}
public Class[] getExceptions() {
return new Class[] {
- org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
+ org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
};
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LRETURN - Return long from method
@@ -26,7 +26,7 @@
public class LRETURN extends ReturnInstruction {
public LRETURN() {
- super(org.apache.bcel.Constants.LRETURN);
+ super(org.apache.tomcat.util.bcel.Constants.LRETURN);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LSHL - Arithmetic shift left long
@@ -26,7 +26,7 @@
public class LSHL extends ArithmeticInstruction {
public LSHL() {
- super(org.apache.bcel.Constants.LSHL);
+ super(org.apache.tomcat.util.bcel.Constants.LSHL);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LSHR - Arithmetic shift right long
@@ -26,7 +26,7 @@
public class LSHR extends ArithmeticInstruction {
public LSHR() {
- super(org.apache.bcel.Constants.LSHR);
+ super(org.apache.tomcat.util.bcel.Constants.LSHR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LSTORE - Store long into local variable
@@ -30,12 +30,12 @@
* Instruction.readInstruction(). Not to be used otherwise.
*/
LSTORE() {
- super(org.apache.bcel.Constants.LSTORE, org.apache.bcel.Constants.LSTORE_0);
+ super(org.apache.tomcat.util.bcel.Constants.LSTORE, org.apache.tomcat.util.bcel.Constants.LSTORE_0);
}
public LSTORE(int n) {
- super(org.apache.bcel.Constants.LSTORE, org.apache.bcel.Constants.LSTORE_0, n);
+ super(org.apache.tomcat.util.bcel.Constants.LSTORE, org.apache.tomcat.util.bcel.Constants.LSTORE_0, n);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LSUB - Substract longs
@@ -27,7 +27,7 @@
public class LSUB extends ArithmeticInstruction {
public LSUB() {
- super(org.apache.bcel.Constants.LSUB);
+ super(org.apache.tomcat.util.bcel.Constants.LSUB);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LUSHR - Logical shift right long
@@ -26,7 +26,7 @@
public class LUSHR extends ArithmeticInstruction {
public LUSHR() {
- super(org.apache.bcel.Constants.LUSHR);
+ super(org.apache.tomcat.util.bcel.Constants.LUSHR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* LXOR - Bitwise XOR long
@@ -26,7 +26,7 @@
public class LXOR extends ArithmeticInstruction {
public LXOR() {
- super(org.apache.bcel.Constants.LXOR);
+ super(org.apache.tomcat.util.bcel.Constants.LXOR);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java Fri Dec 4 17:59:52 2009
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.classfile.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
/**
* This class represents a line number within a method, i.e., give an instruction
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Denotes that an instruction may start the process of loading and resolving
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Denotes an unparameterized instruction to load a value from a local
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java Fri Dec 4 17:59:52 2009
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
/**
* This class represents a local variable within a method. It contains its
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java Fri Dec 4 17:59:52 2009
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.Constants;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* Abstract super class for instructions dealing with local variables.
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* MONITORENTER - Enter monitor for object
@@ -26,13 +26,13 @@
public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer {
public MONITORENTER() {
- super(org.apache.bcel.Constants.MONITORENTER, (short) 1);
+ super(org.apache.tomcat.util.bcel.Constants.MONITORENTER, (short) 1);
}
public Class[] getExceptions() {
return new Class[] {
- org.apache.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
+ org.apache.tomcat.util.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
};
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* MONITOREXIT - Exit monitor for object
@@ -26,13 +26,13 @@
public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer {
public MONITOREXIT() {
- super(org.apache.bcel.Constants.MONITOREXIT, (short) 1);
+ super(org.apache.tomcat.util.bcel.Constants.MONITOREXIT, (short) 1);
}
public Class[] getExceptions() {
return new Class[] {
- org.apache.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
+ org.apache.tomcat.util.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
};
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java Fri Dec 4 17:59:52 2009
@@ -14,13 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.ExceptionConstants;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
/**
* MULTIANEWARRAY - Create new mutidimensional array of references
@@ -44,7 +44,7 @@
public MULTIANEWARRAY(int index, short dimensions) {
- super(org.apache.bcel.Constants.MULTIANEWARRAY, index);
+ super(org.apache.tomcat.util.bcel.Constants.MULTIANEWARRAY, index);
if (dimensions < 1) {
throw new ClassGenException("Invalid dimensions value: " + dimensions);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java Fri Dec 4 17:59:52 2009
@@ -14,31 +14,31 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Stack;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.Annotations;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.LineNumber;
-import org.apache.bcel.classfile.LineNumberTable;
-import org.apache.bcel.classfile.LocalVariable;
-import org.apache.bcel.classfile.LocalVariableTable;
-import org.apache.bcel.classfile.LocalVariableTypeTable;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.ParameterAnnotationEntry;
-import org.apache.bcel.classfile.ParameterAnnotations;
-import org.apache.bcel.classfile.RuntimeVisibleParameterAnnotations;
-import org.apache.bcel.classfile.Utility;
-import org.apache.bcel.util.BCELComparator;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.Annotations;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumberTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTypeTable;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.ParameterAnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.ParameterAnnotations;
+import org.apache.tomcat.util.bcel.classfile.RuntimeVisibleParameterAnnotations;
+import org.apache.tomcat.util.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
* Template class for building up a method. This is done by defining exception
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java Fri Dec 4 17:59:52 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
/**
* Implement this interface if you're interested in changes to a MethodGen object
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java Fri Dec 4 17:59:52 2009
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
/**
* NEW - Create new object
@@ -37,7 +37,7 @@
public NEW(int index) {
- super(org.apache.bcel.Constants.NEW, index);
+ super(org.apache.tomcat.util.bcel.Constants.NEW, index);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java