Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java Fri Sep 11 00:30:19 2015 @@ -20,7 +20,7 @@ package org.apache.commons.bcel6.generic import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; import org.apache.commons.bcel6.classfile.ConstantPool; import org.apache.commons.bcel6.util.ByteSequence; @@ -72,7 +72,7 @@ public abstract class Instruction implem /** @return name of instruction, i.e., opcode name */ public String getName() { - return Constants.getOpcodeName(opcode); + return Const.getOpcodeName(opcode); } @@ -160,7 +160,7 @@ public abstract class Instruction implem boolean wide = false; short opcode = (short) bytes.readUnsignedByte(); Instruction obj = null; - if (opcode == Constants.WIDE) { // Read next opcode after wide byte + if (opcode == Const.WIDE) { // Read next opcode after wide byte wide = true; opcode = (short) bytes.readUnsignedByte(); } @@ -170,295 +170,295 @@ public abstract class Instruction implem } switch (opcode) { - case Constants.BIPUSH: + case Const.BIPUSH: obj = new BIPUSH(); break; - case Constants.SIPUSH: + case Const.SIPUSH: obj = new SIPUSH(); break; - case Constants.LDC: + case Const.LDC: obj = new LDC(); break; - case Constants.LDC_W: + case Const.LDC_W: obj = new LDC_W(); break; - case Constants.LDC2_W: + case Const.LDC2_W: obj = new LDC2_W(); break; - case Constants.ILOAD: + case Const.ILOAD: obj = new ILOAD(); break; - case Constants.LLOAD: + case Const.LLOAD: obj = new LLOAD(); break; - case Constants.FLOAD: + case Const.FLOAD: obj = new FLOAD(); break; - case Constants.DLOAD: + case Const.DLOAD: obj = new DLOAD(); break; - case Constants.ALOAD: + case Const.ALOAD: obj = new ALOAD(); break; - case Constants.ILOAD_0: + case Const.ILOAD_0: obj = new ILOAD(0); break; - case Constants.ILOAD_1: + case Const.ILOAD_1: obj = new ILOAD(1); break; - case Constants.ILOAD_2: + case Const.ILOAD_2: obj = new ILOAD(2); break; - case Constants.ILOAD_3: + case Const.ILOAD_3: obj = new ILOAD(3); break; - case Constants.LLOAD_0: + case Const.LLOAD_0: obj = new LLOAD(0); break; - case Constants.LLOAD_1: + case Const.LLOAD_1: obj = new LLOAD(1); break; - case Constants.LLOAD_2: + case Const.LLOAD_2: obj = new LLOAD(2); break; - case Constants.LLOAD_3: + case Const.LLOAD_3: obj = new LLOAD(3); break; - case Constants.FLOAD_0: + case Const.FLOAD_0: obj = new FLOAD(0); break; - case Constants.FLOAD_1: + case Const.FLOAD_1: obj = new FLOAD(1); break; - case Constants.FLOAD_2: + case Const.FLOAD_2: obj = new FLOAD(2); break; - case Constants.FLOAD_3: + case Const.FLOAD_3: obj = new FLOAD(3); break; - case Constants.DLOAD_0: + case Const.DLOAD_0: obj = new DLOAD(0); break; - case Constants.DLOAD_1: + case Const.DLOAD_1: obj = new DLOAD(1); break; - case Constants.DLOAD_2: + case Const.DLOAD_2: obj = new DLOAD(2); break; - case Constants.DLOAD_3: + case Const.DLOAD_3: obj = new DLOAD(3); break; - case Constants.ALOAD_0: + case Const.ALOAD_0: obj = new ALOAD(0); break; - case Constants.ALOAD_1: + case Const.ALOAD_1: obj = new ALOAD(1); break; - case Constants.ALOAD_2: + case Const.ALOAD_2: obj = new ALOAD(2); break; - case Constants.ALOAD_3: + case Const.ALOAD_3: obj = new ALOAD(3); break; - case Constants.ISTORE: + case Const.ISTORE: obj = new ISTORE(); break; - case Constants.LSTORE: + case Const.LSTORE: obj = new LSTORE(); break; - case Constants.FSTORE: + case Const.FSTORE: obj = new FSTORE(); break; - case Constants.DSTORE: + case Const.DSTORE: obj = new DSTORE(); break; - case Constants.ASTORE: + case Const.ASTORE: obj = new ASTORE(); break; - case Constants.ISTORE_0: + case Const.ISTORE_0: obj = new ISTORE(0); break; - case Constants.ISTORE_1: + case Const.ISTORE_1: obj = new ISTORE(1); break; - case Constants.ISTORE_2: + case Const.ISTORE_2: obj = new ISTORE(2); break; - case Constants.ISTORE_3: + case Const.ISTORE_3: obj = new ISTORE(3); break; - case Constants.LSTORE_0: + case Const.LSTORE_0: obj = new LSTORE(0); break; - case Constants.LSTORE_1: + case Const.LSTORE_1: obj = new LSTORE(1); break; - case Constants.LSTORE_2: + case Const.LSTORE_2: obj = new LSTORE(2); break; - case Constants.LSTORE_3: + case Const.LSTORE_3: obj = new LSTORE(3); break; - case Constants.FSTORE_0: + case Const.FSTORE_0: obj = new FSTORE(0); break; - case Constants.FSTORE_1: + case Const.FSTORE_1: obj = new FSTORE(1); break; - case Constants.FSTORE_2: + case Const.FSTORE_2: obj = new FSTORE(2); break; - case Constants.FSTORE_3: + case Const.FSTORE_3: obj = new FSTORE(3); break; - case Constants.DSTORE_0: + case Const.DSTORE_0: obj = new DSTORE(0); break; - case Constants.DSTORE_1: + case Const.DSTORE_1: obj = new DSTORE(1); break; - case Constants.DSTORE_2: + case Const.DSTORE_2: obj = new DSTORE(2); break; - case Constants.DSTORE_3: + case Const.DSTORE_3: obj = new DSTORE(3); break; - case Constants.ASTORE_0: + case Const.ASTORE_0: obj = new ASTORE(0); break; - case Constants.ASTORE_1: + case Const.ASTORE_1: obj = new ASTORE(1); break; - case Constants.ASTORE_2: + case Const.ASTORE_2: obj = new ASTORE(2); break; - case Constants.ASTORE_3: + case Const.ASTORE_3: obj = new ASTORE(3); break; - case Constants.IINC: + case Const.IINC: obj = new IINC(); break; - case Constants.IFEQ: + case Const.IFEQ: obj = new IFEQ(); break; - case Constants.IFNE: + case Const.IFNE: obj = new IFNE(); break; - case Constants.IFLT: + case Const.IFLT: obj = new IFLT(); break; - case Constants.IFGE: + case Const.IFGE: obj = new IFGE(); break; - case Constants.IFGT: + case Const.IFGT: obj = new IFGT(); break; - case Constants.IFLE: + case Const.IFLE: obj = new IFLE(); break; - case Constants.IF_ICMPEQ: + case Const.IF_ICMPEQ: obj = new IF_ICMPEQ(); break; - case Constants.IF_ICMPNE: + case Const.IF_ICMPNE: obj = new IF_ICMPNE(); break; - case Constants.IF_ICMPLT: + case Const.IF_ICMPLT: obj = new IF_ICMPLT(); break; - case Constants.IF_ICMPGE: + case Const.IF_ICMPGE: obj = new IF_ICMPGE(); break; - case Constants.IF_ICMPGT: + case Const.IF_ICMPGT: obj = new IF_ICMPGT(); break; - case Constants.IF_ICMPLE: + case Const.IF_ICMPLE: obj = new IF_ICMPLE(); break; - case Constants.IF_ACMPEQ: + case Const.IF_ACMPEQ: obj = new IF_ACMPEQ(); break; - case Constants.IF_ACMPNE: + case Const.IF_ACMPNE: obj = new IF_ACMPNE(); break; - case Constants.GOTO: + case Const.GOTO: obj = new GOTO(); break; - case Constants.JSR: + case Const.JSR: obj = new JSR(); break; - case Constants.RET: + case Const.RET: obj = new RET(); break; - case Constants.TABLESWITCH: + case Const.TABLESWITCH: obj = new TABLESWITCH(); break; - case Constants.LOOKUPSWITCH: + case Const.LOOKUPSWITCH: obj = new LOOKUPSWITCH(); break; - case Constants.GETSTATIC: + case Const.GETSTATIC: obj = new GETSTATIC(); break; - case Constants.PUTSTATIC: + case Const.PUTSTATIC: obj = new PUTSTATIC(); break; - case Constants.GETFIELD: + case Const.GETFIELD: obj = new GETFIELD(); break; - case Constants.PUTFIELD: + case Const.PUTFIELD: obj = new PUTFIELD(); break; - case Constants.INVOKEVIRTUAL: + case Const.INVOKEVIRTUAL: obj = new INVOKEVIRTUAL(); break; - case Constants.INVOKESPECIAL: + case Const.INVOKESPECIAL: obj = new INVOKESPECIAL(); break; - case Constants.INVOKESTATIC: + case Const.INVOKESTATIC: obj = new INVOKESTATIC(); break; - case Constants.INVOKEINTERFACE: + case Const.INVOKEINTERFACE: obj = new INVOKEINTERFACE(); break; - case Constants.INVOKEDYNAMIC: + case Const.INVOKEDYNAMIC: obj = new INVOKEDYNAMIC(); break; - case Constants.NEW: + case Const.NEW: obj = new NEW(); break; - case Constants.NEWARRAY: + case Const.NEWARRAY: obj = new NEWARRAY(); break; - case Constants.ANEWARRAY: + case Const.ANEWARRAY: obj = new ANEWARRAY(); break; - case Constants.CHECKCAST: + case Const.CHECKCAST: obj = new CHECKCAST(); break; - case Constants.INSTANCEOF: + case Const.INSTANCEOF: obj = new INSTANCEOF(); break; - case Constants.MULTIANEWARRAY: + case Const.MULTIANEWARRAY: obj = new MULTIANEWARRAY(); break; - case Constants.IFNULL: + case Const.IFNULL: obj = new IFNULL(); break; - case Constants.IFNONNULL: + case Const.IFNONNULL: obj = new IFNONNULL(); break; - case Constants.GOTO_W: + case Const.GOTO_W: obj = new GOTO_W(); break; - case Constants.JSR_W: + case Const.JSR_W: obj = new JSR_W(); break; - case Constants.BREAKPOINT: + case Const.BREAKPOINT: obj = new BREAKPOINT(); break; - case Constants.IMPDEP1: + case Const.IMPDEP1: obj = new IMPDEP1(); break; - case Constants.IMPDEP2: + case Const.IMPDEP2: obj = new IMPDEP2(); break; default: @@ -483,7 +483,7 @@ public abstract class Instruction implem * or Constants.UNPREDICTABLE, if this can not be computed statically */ public int consumeStack( ConstantPoolGen cpg ) { - return Constants.getConsumeStack(opcode); + return Const.getConsumeStack(opcode); } @@ -495,7 +495,7 @@ public abstract class Instruction implem * or Constants.UNPREDICTABLE, if this can not be computed statically */ public int produceStack( ConstantPoolGen cpg ) { - return Constants.getProduceStack(opcode); + return Const.getProduceStack(opcode); }
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConst.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConst.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConst.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConst.java Fri Sep 11 00:30:19 2015 @@ -17,7 +17,7 @@ */ package org.apache.commons.bcel6.generic; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This interface contains shareable instruction objects. @@ -175,120 +175,120 @@ public final class InstructionConst { private static final Instruction[] INSTRUCTIONS = new Instruction[256]; static { - 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; + INSTRUCTIONS[Const.NOP] = NOP; + INSTRUCTIONS[Const.ACONST_NULL] = ACONST_NULL; + INSTRUCTIONS[Const.ICONST_M1] = ICONST_M1; + INSTRUCTIONS[Const.ICONST_0] = ICONST_0; + INSTRUCTIONS[Const.ICONST_1] = ICONST_1; + INSTRUCTIONS[Const.ICONST_2] = ICONST_2; + INSTRUCTIONS[Const.ICONST_3] = ICONST_3; + INSTRUCTIONS[Const.ICONST_4] = ICONST_4; + INSTRUCTIONS[Const.ICONST_5] = ICONST_5; + INSTRUCTIONS[Const.LCONST_0] = LCONST_0; + INSTRUCTIONS[Const.LCONST_1] = LCONST_1; + INSTRUCTIONS[Const.FCONST_0] = FCONST_0; + INSTRUCTIONS[Const.FCONST_1] = FCONST_1; + INSTRUCTIONS[Const.FCONST_2] = FCONST_2; + INSTRUCTIONS[Const.DCONST_0] = DCONST_0; + INSTRUCTIONS[Const.DCONST_1] = DCONST_1; + INSTRUCTIONS[Const.IALOAD] = IALOAD; + INSTRUCTIONS[Const.LALOAD] = LALOAD; + INSTRUCTIONS[Const.FALOAD] = FALOAD; + INSTRUCTIONS[Const.DALOAD] = DALOAD; + INSTRUCTIONS[Const.AALOAD] = AALOAD; + INSTRUCTIONS[Const.BALOAD] = BALOAD; + INSTRUCTIONS[Const.CALOAD] = CALOAD; + INSTRUCTIONS[Const.SALOAD] = SALOAD; + INSTRUCTIONS[Const.IASTORE] = IASTORE; + INSTRUCTIONS[Const.LASTORE] = LASTORE; + INSTRUCTIONS[Const.FASTORE] = FASTORE; + INSTRUCTIONS[Const.DASTORE] = DASTORE; + INSTRUCTIONS[Const.AASTORE] = AASTORE; + INSTRUCTIONS[Const.BASTORE] = BASTORE; + INSTRUCTIONS[Const.CASTORE] = CASTORE; + INSTRUCTIONS[Const.SASTORE] = SASTORE; + INSTRUCTIONS[Const.POP] = POP; + INSTRUCTIONS[Const.POP2] = POP2; + INSTRUCTIONS[Const.DUP] = DUP; + INSTRUCTIONS[Const.DUP_X1] = DUP_X1; + INSTRUCTIONS[Const.DUP_X2] = DUP_X2; + INSTRUCTIONS[Const.DUP2] = DUP2; + INSTRUCTIONS[Const.DUP2_X1] = DUP2_X1; + INSTRUCTIONS[Const.DUP2_X2] = DUP2_X2; + INSTRUCTIONS[Const.SWAP] = SWAP; + INSTRUCTIONS[Const.IADD] = IADD; + INSTRUCTIONS[Const.LADD] = LADD; + INSTRUCTIONS[Const.FADD] = FADD; + INSTRUCTIONS[Const.DADD] = DADD; + INSTRUCTIONS[Const.ISUB] = ISUB; + INSTRUCTIONS[Const.LSUB] = LSUB; + INSTRUCTIONS[Const.FSUB] = FSUB; + INSTRUCTIONS[Const.DSUB] = DSUB; + INSTRUCTIONS[Const.IMUL] = IMUL; + INSTRUCTIONS[Const.LMUL] = LMUL; + INSTRUCTIONS[Const.FMUL] = FMUL; + INSTRUCTIONS[Const.DMUL] = DMUL; + INSTRUCTIONS[Const.IDIV] = IDIV; + INSTRUCTIONS[Const.LDIV] = LDIV; + INSTRUCTIONS[Const.FDIV] = FDIV; + INSTRUCTIONS[Const.DDIV] = DDIV; + INSTRUCTIONS[Const.IREM] = IREM; + INSTRUCTIONS[Const.LREM] = LREM; + INSTRUCTIONS[Const.FREM] = FREM; + INSTRUCTIONS[Const.DREM] = DREM; + INSTRUCTIONS[Const.INEG] = INEG; + INSTRUCTIONS[Const.LNEG] = LNEG; + INSTRUCTIONS[Const.FNEG] = FNEG; + INSTRUCTIONS[Const.DNEG] = DNEG; + INSTRUCTIONS[Const.ISHL] = ISHL; + INSTRUCTIONS[Const.LSHL] = LSHL; + INSTRUCTIONS[Const.ISHR] = ISHR; + INSTRUCTIONS[Const.LSHR] = LSHR; + INSTRUCTIONS[Const.IUSHR] = IUSHR; + INSTRUCTIONS[Const.LUSHR] = LUSHR; + INSTRUCTIONS[Const.IAND] = IAND; + INSTRUCTIONS[Const.LAND] = LAND; + INSTRUCTIONS[Const.IOR] = IOR; + INSTRUCTIONS[Const.LOR] = LOR; + INSTRUCTIONS[Const.IXOR] = IXOR; + INSTRUCTIONS[Const.LXOR] = LXOR; + INSTRUCTIONS[Const.I2L] = I2L; + INSTRUCTIONS[Const.I2F] = I2F; + INSTRUCTIONS[Const.I2D] = I2D; + INSTRUCTIONS[Const.L2I] = L2I; + INSTRUCTIONS[Const.L2F] = L2F; + INSTRUCTIONS[Const.L2D] = L2D; + INSTRUCTIONS[Const.F2I] = F2I; + INSTRUCTIONS[Const.F2L] = F2L; + INSTRUCTIONS[Const.F2D] = F2D; + INSTRUCTIONS[Const.D2I] = D2I; + INSTRUCTIONS[Const.D2L] = D2L; + INSTRUCTIONS[Const.D2F] = D2F; + INSTRUCTIONS[Const.I2B] = I2B; + INSTRUCTIONS[Const.I2C] = I2C; + INSTRUCTIONS[Const.I2S] = I2S; + INSTRUCTIONS[Const.LCMP] = LCMP; + INSTRUCTIONS[Const.FCMPL] = FCMPL; + INSTRUCTIONS[Const.FCMPG] = FCMPG; + INSTRUCTIONS[Const.DCMPL] = DCMPL; + INSTRUCTIONS[Const.DCMPG] = DCMPG; + INSTRUCTIONS[Const.IRETURN] = IRETURN; + INSTRUCTIONS[Const.LRETURN] = LRETURN; + INSTRUCTIONS[Const.FRETURN] = FRETURN; + INSTRUCTIONS[Const.DRETURN] = DRETURN; + INSTRUCTIONS[Const.ARETURN] = ARETURN; + INSTRUCTIONS[Const.RETURN] = RETURN; + INSTRUCTIONS[Const.ARRAYLENGTH] = ARRAYLENGTH; + INSTRUCTIONS[Const.ATHROW] = ATHROW; + INSTRUCTIONS[Const.MONITORENTER] = MONITORENTER; + INSTRUCTIONS[Const.MONITOREXIT] = MONITOREXIT; } private InstructionConst() { } // non-instantiable /** * Gets the Instruction. - * @param index the index, e.g. {@link Constants#RETURN} + * @param index the index, e.g. {@link Const#RETURN} * @return the entry from the private INSTRUCTIONS table */ public static Instruction getInstruction(int index) { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java Fri Sep 11 00:30:19 2015 @@ -17,7 +17,7 @@ */ package org.apache.commons.bcel6.generic; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This interface contains shareable instruction objects. @@ -180,113 +180,113 @@ public interface InstructionConstants { 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; + INSTRUCTIONS[Const.NOP] = NOP; + INSTRUCTIONS[Const.ACONST_NULL] = ACONST_NULL; + INSTRUCTIONS[Const.ICONST_M1] = ICONST_M1; + INSTRUCTIONS[Const.ICONST_0] = ICONST_0; + INSTRUCTIONS[Const.ICONST_1] = ICONST_1; + INSTRUCTIONS[Const.ICONST_2] = ICONST_2; + INSTRUCTIONS[Const.ICONST_3] = ICONST_3; + INSTRUCTIONS[Const.ICONST_4] = ICONST_4; + INSTRUCTIONS[Const.ICONST_5] = ICONST_5; + INSTRUCTIONS[Const.LCONST_0] = LCONST_0; + INSTRUCTIONS[Const.LCONST_1] = LCONST_1; + INSTRUCTIONS[Const.FCONST_0] = FCONST_0; + INSTRUCTIONS[Const.FCONST_1] = FCONST_1; + INSTRUCTIONS[Const.FCONST_2] = FCONST_2; + INSTRUCTIONS[Const.DCONST_0] = DCONST_0; + INSTRUCTIONS[Const.DCONST_1] = DCONST_1; + INSTRUCTIONS[Const.IALOAD] = IALOAD; + INSTRUCTIONS[Const.LALOAD] = LALOAD; + INSTRUCTIONS[Const.FALOAD] = FALOAD; + INSTRUCTIONS[Const.DALOAD] = DALOAD; + INSTRUCTIONS[Const.AALOAD] = AALOAD; + INSTRUCTIONS[Const.BALOAD] = BALOAD; + INSTRUCTIONS[Const.CALOAD] = CALOAD; + INSTRUCTIONS[Const.SALOAD] = SALOAD; + INSTRUCTIONS[Const.IASTORE] = IASTORE; + INSTRUCTIONS[Const.LASTORE] = LASTORE; + INSTRUCTIONS[Const.FASTORE] = FASTORE; + INSTRUCTIONS[Const.DASTORE] = DASTORE; + INSTRUCTIONS[Const.AASTORE] = AASTORE; + INSTRUCTIONS[Const.BASTORE] = BASTORE; + INSTRUCTIONS[Const.CASTORE] = CASTORE; + INSTRUCTIONS[Const.SASTORE] = SASTORE; + INSTRUCTIONS[Const.POP] = POP; + INSTRUCTIONS[Const.POP2] = POP2; + INSTRUCTIONS[Const.DUP] = DUP; + INSTRUCTIONS[Const.DUP_X1] = DUP_X1; + INSTRUCTIONS[Const.DUP_X2] = DUP_X2; + INSTRUCTIONS[Const.DUP2] = DUP2; + INSTRUCTIONS[Const.DUP2_X1] = DUP2_X1; + INSTRUCTIONS[Const.DUP2_X2] = DUP2_X2; + INSTRUCTIONS[Const.SWAP] = SWAP; + INSTRUCTIONS[Const.IADD] = IADD; + INSTRUCTIONS[Const.LADD] = LADD; + INSTRUCTIONS[Const.FADD] = FADD; + INSTRUCTIONS[Const.DADD] = DADD; + INSTRUCTIONS[Const.ISUB] = ISUB; + INSTRUCTIONS[Const.LSUB] = LSUB; + INSTRUCTIONS[Const.FSUB] = FSUB; + INSTRUCTIONS[Const.DSUB] = DSUB; + INSTRUCTIONS[Const.IMUL] = IMUL; + INSTRUCTIONS[Const.LMUL] = LMUL; + INSTRUCTIONS[Const.FMUL] = FMUL; + INSTRUCTIONS[Const.DMUL] = DMUL; + INSTRUCTIONS[Const.IDIV] = IDIV; + INSTRUCTIONS[Const.LDIV] = LDIV; + INSTRUCTIONS[Const.FDIV] = FDIV; + INSTRUCTIONS[Const.DDIV] = DDIV; + INSTRUCTIONS[Const.IREM] = IREM; + INSTRUCTIONS[Const.LREM] = LREM; + INSTRUCTIONS[Const.FREM] = FREM; + INSTRUCTIONS[Const.DREM] = DREM; + INSTRUCTIONS[Const.INEG] = INEG; + INSTRUCTIONS[Const.LNEG] = LNEG; + INSTRUCTIONS[Const.FNEG] = FNEG; + INSTRUCTIONS[Const.DNEG] = DNEG; + INSTRUCTIONS[Const.ISHL] = ISHL; + INSTRUCTIONS[Const.LSHL] = LSHL; + INSTRUCTIONS[Const.ISHR] = ISHR; + INSTRUCTIONS[Const.LSHR] = LSHR; + INSTRUCTIONS[Const.IUSHR] = IUSHR; + INSTRUCTIONS[Const.LUSHR] = LUSHR; + INSTRUCTIONS[Const.IAND] = IAND; + INSTRUCTIONS[Const.LAND] = LAND; + INSTRUCTIONS[Const.IOR] = IOR; + INSTRUCTIONS[Const.LOR] = LOR; + INSTRUCTIONS[Const.IXOR] = IXOR; + INSTRUCTIONS[Const.LXOR] = LXOR; + INSTRUCTIONS[Const.I2L] = I2L; + INSTRUCTIONS[Const.I2F] = I2F; + INSTRUCTIONS[Const.I2D] = I2D; + INSTRUCTIONS[Const.L2I] = L2I; + INSTRUCTIONS[Const.L2F] = L2F; + INSTRUCTIONS[Const.L2D] = L2D; + INSTRUCTIONS[Const.F2I] = F2I; + INSTRUCTIONS[Const.F2L] = F2L; + INSTRUCTIONS[Const.F2D] = F2D; + INSTRUCTIONS[Const.D2I] = D2I; + INSTRUCTIONS[Const.D2L] = D2L; + INSTRUCTIONS[Const.D2F] = D2F; + INSTRUCTIONS[Const.I2B] = I2B; + INSTRUCTIONS[Const.I2C] = I2C; + INSTRUCTIONS[Const.I2S] = I2S; + INSTRUCTIONS[Const.LCMP] = LCMP; + INSTRUCTIONS[Const.FCMPL] = FCMPL; + INSTRUCTIONS[Const.FCMPG] = FCMPG; + INSTRUCTIONS[Const.DCMPL] = DCMPL; + INSTRUCTIONS[Const.DCMPG] = DCMPG; + INSTRUCTIONS[Const.IRETURN] = IRETURN; + INSTRUCTIONS[Const.LRETURN] = LRETURN; + INSTRUCTIONS[Const.FRETURN] = FRETURN; + INSTRUCTIONS[Const.DRETURN] = DRETURN; + INSTRUCTIONS[Const.ARETURN] = ARETURN; + INSTRUCTIONS[Const.RETURN] = RETURN; + INSTRUCTIONS[Const.ARRAYLENGTH] = ARRAYLENGTH; + INSTRUCTIONS[Const.ATHROW] = ATHROW; + INSTRUCTIONS[Const.MONITORENTER] = MONITORENTER; + INSTRUCTIONS[Const.MONITOREXIT] = MONITOREXIT; } } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java Fri Sep 11 00:30:19 2015 @@ -17,7 +17,7 @@ */ package org.apache.commons.bcel6.generic; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * Instances of this class may be used, e.g., to generate typed @@ -29,7 +29,7 @@ import org.apache.commons.bcel6.Constant * from the {@link InstructionConst} class. * * @version $Id$ - * @see Constants + * @see Const * @see InstructionConst */ public class InstructionFactory { @@ -80,7 +80,7 @@ public class InstructionFactory { * @param arg_types argument types of method * @param kind how to invoke, i.e., INVOKEINTERFACE, INVOKESTATIC, INVOKEVIRTUAL, * or INVOKESPECIAL - * @see Constants + * @see Const */ public InvokeInstruction createInvoke( String class_name, String name, Type ret_type, Type[] arg_types, short kind ) { @@ -90,19 +90,19 @@ public class InstructionFactory { for (Type arg_type : arg_types) { nargs += arg_type.getSize(); } - if (kind == Constants.INVOKEINTERFACE) { + if (kind == Const.INVOKEINTERFACE) { index = cp.addInterfaceMethodref(class_name, name, signature); } else { index = cp.addMethodref(class_name, name, signature); } switch (kind) { - case Constants.INVOKESPECIAL: + case Const.INVOKESPECIAL: return new INVOKESPECIAL(index); - case Constants.INVOKEVIRTUAL: + case Const.INVOKEVIRTUAL: return new INVOKEVIRTUAL(index); - case Constants.INVOKESTATIC: + case Const.INVOKESTATIC: return new INVOKESTATIC(index); - case Constants.INVOKEINTERFACE: + case Const.INVOKEINTERFACE: return new INVOKEINTERFACE(index, nargs + 1); default: throw new RuntimeException("Oops: Unknown invoke kind:" + kind); @@ -238,21 +238,21 @@ public class InstructionFactory { public Instruction createAppend( Type type ) { byte t = type.getType(); if (isString(type)) { - return createInvoke(append_mos[0], Constants.INVOKEVIRTUAL); + return createInvoke(append_mos[0], Const.INVOKEVIRTUAL); } switch (t) { - case Constants.T_BOOLEAN: - case Constants.T_CHAR: - case Constants.T_FLOAT: - case Constants.T_DOUBLE: - case Constants.T_BYTE: - case Constants.T_SHORT: - case Constants.T_INT: - case Constants.T_LONG: - return createInvoke(append_mos[t], Constants.INVOKEVIRTUAL); - case Constants.T_ARRAY: - case Constants.T_OBJECT: - return createInvoke(append_mos[1], Constants.INVOKEVIRTUAL); + case Const.T_BOOLEAN: + case Const.T_CHAR: + case Const.T_FLOAT: + case Const.T_DOUBLE: + case Const.T_BYTE: + case Const.T_SHORT: + case Const.T_INT: + case Const.T_LONG: + return createInvoke(append_mos[t], Const.INVOKEVIRTUAL); + case Const.T_ARRAY: + case Const.T_OBJECT: + return createInvoke(append_mos[1], Const.INVOKEVIRTUAL); default: throw new RuntimeException("Oops: No append for this type? " + type); } @@ -265,20 +265,20 @@ public class InstructionFactory { * @param name name of the referenced field * @param type type of field * @param kind how to access, i.e., GETFIELD, PUTFIELD, GETSTATIC, PUTSTATIC - * @see Constants + * @see Const */ public FieldInstruction createFieldAccess( String class_name, String name, Type type, short kind ) { int index; String signature = type.getSignature(); index = cp.addFieldref(class_name, name, signature); switch (kind) { - case Constants.GETFIELD: + case Const.GETFIELD: return new GETFIELD(index); - case Constants.PUTFIELD: + case Const.PUTFIELD: return new PUTFIELD(index); - case Constants.GETSTATIC: + case Const.GETSTATIC: return new GETSTATIC(index); - case Constants.PUTSTATIC: + case Const.PUTSTATIC: return new PUTSTATIC(index); default: throw new RuntimeException("Oops: Unknown getfield kind:" + kind); @@ -297,22 +297,22 @@ public class InstructionFactory { */ public static ReturnInstruction createReturn( Type type ) { switch (type.getType()) { - case Constants.T_ARRAY: - case Constants.T_OBJECT: + case Const.T_ARRAY: + case Const.T_OBJECT: return InstructionConst.ARETURN; - case Constants.T_INT: - case Constants.T_SHORT: - case Constants.T_BOOLEAN: - case Constants.T_CHAR: - case Constants.T_BYTE: + case Const.T_INT: + case Const.T_SHORT: + case Const.T_BOOLEAN: + case Const.T_CHAR: + case Const.T_BYTE: return InstructionConst.IRETURN; - case Constants.T_FLOAT: + case Const.T_FLOAT: return InstructionConst.FRETURN; - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return InstructionConst.DRETURN; - case Constants.T_LONG: + case Const.T_LONG: return InstructionConst.LRETURN; - case Constants.T_VOID: + case Const.T_VOID: return InstructionConst.RETURN; default: throw new RuntimeException("Invalid type: " + type); @@ -420,16 +420,16 @@ public class InstructionFactory { public static ArithmeticInstruction createBinaryOperation( String op, Type type ) { char first = op.charAt(0); switch (type.getType()) { - case Constants.T_BYTE: - case Constants.T_SHORT: - case Constants.T_INT: - case Constants.T_CHAR: + case Const.T_BYTE: + case Const.T_SHORT: + case Const.T_INT: + case Const.T_CHAR: return createBinaryIntOp(first, op); - case Constants.T_LONG: + case Const.T_LONG: return createBinaryLongOp(first, op); - case Constants.T_FLOAT: + case Const.T_FLOAT: return createBinaryFloatOp(first); - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return createBinaryDoubleOp(first); default: throw new RuntimeException("Invalid type " + type); @@ -474,20 +474,20 @@ public class InstructionFactory { */ public static LocalVariableInstruction createStore( Type type, int index ) { switch (type.getType()) { - case Constants.T_BOOLEAN: - case Constants.T_CHAR: - case Constants.T_BYTE: - case Constants.T_SHORT: - case Constants.T_INT: + case Const.T_BOOLEAN: + case Const.T_CHAR: + case Const.T_BYTE: + case Const.T_SHORT: + case Const.T_INT: return new ISTORE(index); - case Constants.T_FLOAT: + case Const.T_FLOAT: return new FSTORE(index); - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return new DSTORE(index); - case Constants.T_LONG: + case Const.T_LONG: return new LSTORE(index); - case Constants.T_ARRAY: - case Constants.T_OBJECT: + case Const.T_ARRAY: + case Const.T_OBJECT: return new ASTORE(index); default: throw new RuntimeException("Invalid type " + type); @@ -500,20 +500,20 @@ public class InstructionFactory { */ public static LocalVariableInstruction createLoad( Type type, int index ) { switch (type.getType()) { - case Constants.T_BOOLEAN: - case Constants.T_CHAR: - case Constants.T_BYTE: - case Constants.T_SHORT: - case Constants.T_INT: + case Const.T_BOOLEAN: + case Const.T_CHAR: + case Const.T_BYTE: + case Const.T_SHORT: + case Const.T_INT: return new ILOAD(index); - case Constants.T_FLOAT: + case Const.T_FLOAT: return new FLOAD(index); - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return new DLOAD(index); - case Constants.T_LONG: + case Const.T_LONG: return new LLOAD(index); - case Constants.T_ARRAY: - case Constants.T_OBJECT: + case Const.T_ARRAY: + case Const.T_OBJECT: return new ALOAD(index); default: throw new RuntimeException("Invalid type " + type); @@ -526,23 +526,23 @@ public class InstructionFactory { */ public static ArrayInstruction createArrayLoad( Type type ) { switch (type.getType()) { - case Constants.T_BOOLEAN: - case Constants.T_BYTE: + case Const.T_BOOLEAN: + case Const.T_BYTE: return InstructionConst.BALOAD; - case Constants.T_CHAR: + case Const.T_CHAR: return InstructionConst.CALOAD; - case Constants.T_SHORT: + case Const.T_SHORT: return InstructionConst.SALOAD; - case Constants.T_INT: + case Const.T_INT: return InstructionConst.IALOAD; - case Constants.T_FLOAT: + case Const.T_FLOAT: return InstructionConst.FALOAD; - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return InstructionConst.DALOAD; - case Constants.T_LONG: + case Const.T_LONG: return InstructionConst.LALOAD; - case Constants.T_ARRAY: - case Constants.T_OBJECT: + case Const.T_ARRAY: + case Const.T_OBJECT: return InstructionConst.AALOAD; default: throw new RuntimeException("Invalid type " + type); @@ -555,23 +555,23 @@ public class InstructionFactory { */ public static ArrayInstruction createArrayStore( Type type ) { switch (type.getType()) { - case Constants.T_BOOLEAN: - case Constants.T_BYTE: + case Const.T_BOOLEAN: + case Const.T_BYTE: return InstructionConst.BASTORE; - case Constants.T_CHAR: + case Const.T_CHAR: return InstructionConst.CASTORE; - case Constants.T_SHORT: + case Const.T_SHORT: return InstructionConst.SASTORE; - case Constants.T_INT: + case Const.T_INT: return InstructionConst.IASTORE; - case Constants.T_FLOAT: + case Const.T_FLOAT: return InstructionConst.FASTORE; - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return InstructionConst.DASTORE; - case Constants.T_LONG: + case Const.T_LONG: return InstructionConst.LASTORE; - case Constants.T_ARRAY: - case Constants.T_OBJECT: + case Const.T_ARRAY: + case Const.T_OBJECT: return InstructionConst.AASTORE; default: throw new RuntimeException("Invalid type " + type); @@ -586,12 +586,12 @@ public class InstructionFactory { if ((src_type instanceof BasicType) && (dest_type instanceof BasicType)) { byte dest = dest_type.getType(); byte src = src_type.getType(); - if (dest == Constants.T_LONG - && (src == Constants.T_CHAR || src == Constants.T_BYTE || src == Constants.T_SHORT)) { - src = Constants.T_INT; + if (dest == Const.T_LONG + && (src == Const.T_CHAR || src == Const.T_BYTE || src == Const.T_SHORT)) { + src = Const.T_INT; } - String name = "org.apache.commons.bcel6.generic." + short_names[src - Constants.T_CHAR] + "2" - + short_names[dest - Constants.T_CHAR]; + String name = "org.apache.commons.bcel6.generic." + short_names[src - Const.T_CHAR] + "2" + + short_names[dest - Const.T_CHAR]; Instruction i = null; try { i = (Instruction) java.lang.Class.forName(name).newInstance(); @@ -683,22 +683,22 @@ public class InstructionFactory { */ public static Instruction createNull( Type type ) { switch (type.getType()) { - case Constants.T_ARRAY: - case Constants.T_OBJECT: + case Const.T_ARRAY: + case Const.T_OBJECT: return InstructionConst.ACONST_NULL; - case Constants.T_INT: - case Constants.T_SHORT: - case Constants.T_BOOLEAN: - case Constants.T_CHAR: - case Constants.T_BYTE: + case Const.T_INT: + case Const.T_SHORT: + case Const.T_BOOLEAN: + case Const.T_CHAR: + case Const.T_BYTE: return InstructionConst.ICONST_0; - case Constants.T_FLOAT: + case Const.T_FLOAT: return InstructionConst.FCONST_0; - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return InstructionConst.DCONST_0; - case Constants.T_LONG: + case Const.T_LONG: return InstructionConst.LCONST_0; - case Constants.T_VOID: + case Const.T_VOID: return InstructionConst.NOP; default: throw new RuntimeException("Invalid type: " + type); @@ -711,45 +711,45 @@ public class InstructionFactory { */ public static BranchInstruction createBranchInstruction( short opcode, InstructionHandle target ) { switch (opcode) { - case Constants.IFEQ: + case Const.IFEQ: return new IFEQ(target); - case Constants.IFNE: + case Const.IFNE: return new IFNE(target); - case Constants.IFLT: + case Const.IFLT: return new IFLT(target); - case Constants.IFGE: + case Const.IFGE: return new IFGE(target); - case Constants.IFGT: + case Const.IFGT: return new IFGT(target); - case Constants.IFLE: + case Const.IFLE: return new IFLE(target); - case Constants.IF_ICMPEQ: + case Const.IF_ICMPEQ: return new IF_ICMPEQ(target); - case Constants.IF_ICMPNE: + case Const.IF_ICMPNE: return new IF_ICMPNE(target); - case Constants.IF_ICMPLT: + case Const.IF_ICMPLT: return new IF_ICMPLT(target); - case Constants.IF_ICMPGE: + case Const.IF_ICMPGE: return new IF_ICMPGE(target); - case Constants.IF_ICMPGT: + case Const.IF_ICMPGT: return new IF_ICMPGT(target); - case Constants.IF_ICMPLE: + case Const.IF_ICMPLE: return new IF_ICMPLE(target); - case Constants.IF_ACMPEQ: + case Const.IF_ACMPEQ: return new IF_ACMPEQ(target); - case Constants.IF_ACMPNE: + case Const.IF_ACMPNE: return new IF_ACMPNE(target); - case Constants.GOTO: + case Const.GOTO: return new GOTO(target); - case Constants.JSR: + case Const.JSR: return new JSR(target); - case Constants.IFNULL: + case Const.IFNULL: return new IFNULL(target); - case Constants.IFNONNULL: + case Const.IFNONNULL: return new IFNONNULL(target); - case Constants.GOTO_W: + case Const.GOTO_W: return new GOTO_W(target); - case Constants.JSR_W: + case Const.JSR_W: return new JSR_W(target); default: throw new RuntimeException("Invalid opcode: " + opcode); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java Fri Sep 11 00:30:19 2015 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; import org.apache.commons.bcel6.classfile.Constant; import org.apache.commons.bcel6.util.ByteSequence; @@ -871,7 +871,7 @@ public class InstructionList implements Instruction inst = ((BranchInstruction) i).getTarget().getInstruction(); if (!contains(inst)) { throw new ClassGenException("Branch target of " - + Constants.getOpcodeName(i.getOpcode()) + ":" + inst + + Const.getOpcodeName(i.getOpcode()) + ":" + inst + " not in instruction list"); } if (i instanceof Select) { @@ -880,14 +880,14 @@ public class InstructionList implements inst = target.getInstruction(); if (!contains(inst)) { throw new ClassGenException("Branch target of " - + Constants.getOpcodeName(i.getOpcode()) + ":" + inst + + Const.getOpcodeName(i.getOpcode()) + ":" + inst + " not in instruction list"); } } } if (!(ih instanceof BranchHandle)) { throw new ClassGenException("Branch instruction " - + Constants.getOpcodeName(i.getOpcode()) + ":" + inst + + Const.getOpcodeName(i.getOpcode()) + ":" + inst + " not contained in BranchHandle."); } } @@ -906,12 +906,12 @@ public class InstructionList implements * LOOKUPSWITCH). */ switch (i.getOpcode()) { - case Constants.JSR: - case Constants.GOTO: + case Const.JSR: + case Const.GOTO: max_additional_bytes += 2; break; - case Constants.TABLESWITCH: - case Constants.LOOKUPSWITCH: + case Const.TABLESWITCH: + case Const.LOOKUPSWITCH: max_additional_bytes += 3; break; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java Fri Sep 11 00:30:19 2015 @@ -19,7 +19,7 @@ package org.apache.commons.bcel6.generic import java.util.StringTokenizer; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; import org.apache.commons.bcel6.classfile.Constant; import org.apache.commons.bcel6.classfile.ConstantCP; import org.apache.commons.bcel6.classfile.ConstantPool; @@ -55,7 +55,7 @@ public abstract class InvokeInstruction public String toString( ConstantPool cp ) { Constant c = cp.getConstant(super.getIndex()); StringTokenizer tok = new StringTokenizer(cp.constantToString(c)); - return Constants.getOpcodeName(super.getOpcode()) + " " + tok.nextToken().replace('.', '/') + return Const.getOpcodeName(super.getOpcode()) + " " + tok.nextToken().replace('.', '/') + tok.nextToken(); } @@ -68,7 +68,7 @@ public abstract class InvokeInstruction @Override public int consumeStack( ConstantPoolGen cpg ) { int sum; - if ((super.getOpcode() == Constants.INVOKESTATIC) || (super.getOpcode() == Constants.INVOKEDYNAMIC)) { + if ((super.getOpcode() == Const.INVOKESTATIC) || (super.getOpcode() == Const.INVOKEDYNAMIC)) { sum = 0; } else { sum = 1; // this reference @@ -130,7 +130,7 @@ public abstract class InvokeInstruction public String getClassName( ConstantPoolGen cpg ) { ConstantPool cp = cpg.getConstantPool(); ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); - String className = cp.getConstantString(cmr.getClassIndex(), Constants.CONSTANT_Class); + String className = cp.getConstantString(cmr.getClassIndex(), Const.CONSTANT_Class); if (className.startsWith("[")) { throw new IllegalArgumentException("Cannot be used on an array type"); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java Fri Sep 11 00:30:19 2015 @@ -36,7 +36,7 @@ public class JSR extends JsrInstruction public JSR(InstructionHandle target) { - super(org.apache.commons.bcel6.Constants.JSR, target); + super(org.apache.commons.bcel6.Const.JSR, target); } @@ -47,7 +47,7 @@ public class JSR extends JsrInstruction @Override public void dump( DataOutputStream out ) throws IOException { super.setIndex(getTargetOffset()); - if (super.getOpcode() == org.apache.commons.bcel6.Constants.JSR) { + if (super.getOpcode() == org.apache.commons.bcel6.Const.JSR) { super.dump(out); } else { // JSR_W super.setIndex(getTargetOffset()); @@ -62,7 +62,7 @@ public class JSR extends JsrInstruction int i = getTargetOffset(); // Depending on old position value setPosition(getPosition() + offset); // Position may be shifted by preceding expansions if (Math.abs(i) >= (Short.MAX_VALUE - max_offset)) { // to large for short (estimate) - super.setOpcode(org.apache.commons.bcel6.Constants.JSR_W); + super.setOpcode(org.apache.commons.bcel6.Const.JSR_W); short old_length = (short) super.getLength(); super.setLength(5); return super.getLength() - old_length; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java Fri Sep 11 00:30:19 2015 @@ -38,7 +38,7 @@ public class JSR_W extends JsrInstructio public JSR_W(InstructionHandle target) { - super(org.apache.commons.bcel6.Constants.JSR_W, target); + super(org.apache.commons.bcel6.Const.JSR_W, target); super.setLength(5); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class L2D extends ConversionInstruction { public L2D() { - super(org.apache.commons.bcel6.Constants.L2D); + super(org.apache.commons.bcel6.Const.L2D); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class L2F extends ConversionInstruction { public L2F() { - super(org.apache.commons.bcel6.Constants.L2F); + super(org.apache.commons.bcel6.Const.L2F); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class L2I extends ConversionInstruction { public L2I() { - super(org.apache.commons.bcel6.Constants.L2I); + super(org.apache.commons.bcel6.Const.L2I); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java Fri Sep 11 00:30:19 2015 @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LADD extends ArithmeticInstruction { public LADD() { - super(org.apache.commons.bcel6.Constants.LADD); + super(org.apache.commons.bcel6.Const.LADD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class LALOAD extends ArrayInstruc /** Load long from array */ public LALOAD() { - super(org.apache.commons.bcel6.Constants.LALOAD); + super(org.apache.commons.bcel6.Const.LALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java Fri Sep 11 00:30:19 2015 @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LAND extends ArithmeticInstruction { public LAND() { - super(org.apache.commons.bcel6.Constants.LAND); + super(org.apache.commons.bcel6.Const.LAND); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class LASTORE extends ArrayInstru /** Store long into array */ public LASTORE() { - super(org.apache.commons.bcel6.Constants.LASTORE); + super(org.apache.commons.bcel6.Const.LASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCMP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCMP.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCMP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCMP.java Fri Sep 11 00:30:19 2015 @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LCMP extends Instruction implements TypedInstruction, StackProducer, StackConsumer { public LCMP() { - super(org.apache.commons.bcel6.Constants.LCMP, (short) 1); + super(org.apache.commons.bcel6.Const.LCMP, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LCONST.java Fri Sep 11 00:30:19 2015 @@ -38,11 +38,11 @@ public class LCONST extends Instruction public LCONST(long l) { - super(org.apache.commons.bcel6.Constants.LCONST_0, (short) 1); + super(org.apache.commons.bcel6.Const.LCONST_0, (short) 1); if (l == 0) { - super.setOpcode(org.apache.commons.bcel6.Constants.LCONST_0); + super.setOpcode(org.apache.commons.bcel6.Const.LCONST_0); } else if (l == 1) { - super.setOpcode(org.apache.commons.bcel6.Constants.LCONST_1); + super.setOpcode(org.apache.commons.bcel6.Const.LCONST_1); } else { throw new ClassGenException("LCONST can be used only for 0 and 1: " + l); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java Fri Sep 11 00:30:19 2015 @@ -41,18 +41,18 @@ public class LDC extends CPInstruction i public LDC(int index) { - super(org.apache.commons.bcel6.Constants.LDC_W, index); + super(org.apache.commons.bcel6.Const.LDC_W, index); setSize(); } // Adjust to proper size protected final void setSize() { - if (super.getIndex() <= org.apache.commons.bcel6.Constants.MAX_BYTE) { // Fits in one byte? - super.setOpcode(org.apache.commons.bcel6.Constants.LDC); + if (super.getIndex() <= org.apache.commons.bcel6.Const.MAX_BYTE) { // Fits in one byte? + super.setOpcode(org.apache.commons.bcel6.Const.LDC); super.setLength(2); } else { - super.setOpcode(org.apache.commons.bcel6.Constants.LDC_W); + super.setOpcode(org.apache.commons.bcel6.Const.LDC_W); super.setLength(3); } } @@ -96,15 +96,15 @@ public class LDC extends CPInstruction i public Object getValue( ConstantPoolGen cpg ) { org.apache.commons.bcel6.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); switch (c.getTag()) { - case org.apache.commons.bcel6.Constants.CONSTANT_String: + case org.apache.commons.bcel6.Const.CONSTANT_String: int i = ((org.apache.commons.bcel6.classfile.ConstantString) c).getStringIndex(); c = cpg.getConstantPool().getConstant(i); return ((org.apache.commons.bcel6.classfile.ConstantUtf8) c).getBytes(); - case org.apache.commons.bcel6.Constants.CONSTANT_Float: + case org.apache.commons.bcel6.Const.CONSTANT_Float: return new Float(((org.apache.commons.bcel6.classfile.ConstantFloat) c).getBytes()); - case org.apache.commons.bcel6.Constants.CONSTANT_Integer: + case org.apache.commons.bcel6.Const.CONSTANT_Integer: return Integer.valueOf(((org.apache.commons.bcel6.classfile.ConstantInteger) c).getBytes()); - case org.apache.commons.bcel6.Constants.CONSTANT_Class: + case org.apache.commons.bcel6.Const.CONSTANT_Class: int nameIndex = ((org.apache.commons.bcel6.classfile.ConstantClass) c).getNameIndex(); c = cpg.getConstantPool().getConstant(nameIndex); return new ObjectType(((org.apache.commons.bcel6.classfile.ConstantUtf8) c).getBytes()); @@ -117,13 +117,13 @@ public class LDC extends CPInstruction i @Override public Type getType( ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) { - case org.apache.commons.bcel6.Constants.CONSTANT_String: + case org.apache.commons.bcel6.Const.CONSTANT_String: return Type.STRING; - case org.apache.commons.bcel6.Constants.CONSTANT_Float: + case org.apache.commons.bcel6.Const.CONSTANT_Float: return Type.FLOAT; - case org.apache.commons.bcel6.Constants.CONSTANT_Integer: + case org.apache.commons.bcel6.Const.CONSTANT_Integer: return Type.INT; - case org.apache.commons.bcel6.Constants.CONSTANT_Class: + case org.apache.commons.bcel6.Const.CONSTANT_Class: return Type.CLASS; default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + super.getIndex()); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java Fri Sep 11 00:30:19 2015 @@ -35,16 +35,16 @@ public class LDC2_W extends CPInstructio public LDC2_W(int index) { - super(org.apache.commons.bcel6.Constants.LDC2_W, index); + super(org.apache.commons.bcel6.Const.LDC2_W, index); } @Override public Type getType( ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) { - case org.apache.commons.bcel6.Constants.CONSTANT_Long: + case org.apache.commons.bcel6.Const.CONSTANT_Long: return Type.LONG; - case org.apache.commons.bcel6.Constants.CONSTANT_Double: + case org.apache.commons.bcel6.Const.CONSTANT_Double: return Type.DOUBLE; default: // Never reached throw new RuntimeException("Unknown constant type " + super.getOpcode()); @@ -55,9 +55,9 @@ public class LDC2_W extends CPInstructio public Number getValue( ConstantPoolGen cpg ) { org.apache.commons.bcel6.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); switch (c.getTag()) { - case org.apache.commons.bcel6.Constants.CONSTANT_Long: + case org.apache.commons.bcel6.Const.CONSTANT_Long: return Long.valueOf(((org.apache.commons.bcel6.classfile.ConstantLong) c).getBytes()); - case org.apache.commons.bcel6.Constants.CONSTANT_Double: + case org.apache.commons.bcel6.Const.CONSTANT_Double: return new Double(((org.apache.commons.bcel6.classfile.ConstantDouble) c).getBytes()); default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + super.getIndex()); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC_W.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC_W.java Fri Sep 11 00:30:19 2015 @@ -50,7 +50,7 @@ public class LDC_W extends LDC { protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException { setIndex(bytes.readUnsignedShort()); // Override just in case it has been changed - super.setOpcode(org.apache.commons.bcel6.Constants.LDC_W); + super.setOpcode(org.apache.commons.bcel6.Const.LDC_W); super.setLength(3); } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDIV.java Fri Sep 11 00:30:19 2015 @@ -29,7 +29,7 @@ import org.apache.commons.bcel6.Exceptio public class LDIV extends ArithmeticInstruction implements ExceptionThrower { public LDIV() { - super(org.apache.commons.bcel6.Constants.LDIV); + super(org.apache.commons.bcel6.Const.LDIV); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LLOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LLOAD.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LLOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LLOAD.java Fri Sep 11 00:30:19 2015 @@ -30,12 +30,12 @@ public class LLOAD extends LoadInstructi * Instruction.readInstruction(). Not to be used otherwise. */ LLOAD() { - super(org.apache.commons.bcel6.Constants.LLOAD, org.apache.commons.bcel6.Constants.LLOAD_0); + super(org.apache.commons.bcel6.Const.LLOAD, org.apache.commons.bcel6.Const.LLOAD_0); } public LLOAD(int n) { - super(org.apache.commons.bcel6.Constants.LLOAD, org.apache.commons.bcel6.Constants.LLOAD_0, n); + super(org.apache.commons.bcel6.Const.LLOAD, org.apache.commons.bcel6.Const.LLOAD_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LMUL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LMUL.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LMUL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LMUL.java Fri Sep 11 00:30:19 2015 @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LMUL extends ArithmeticInstruction { public LMUL() { - super(org.apache.commons.bcel6.Constants.LMUL); + super(org.apache.commons.bcel6.Const.LMUL); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LNEG.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LNEG.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LNEG.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LNEG.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LNEG extends ArithmeticInstruction { public LNEG() { - super(org.apache.commons.bcel6.Constants.LNEG); + super(org.apache.commons.bcel6.Const.LNEG); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOOKUPSWITCH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOOKUPSWITCH.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOOKUPSWITCH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOOKUPSWITCH.java Fri Sep 11 00:30:19 2015 @@ -39,7 +39,7 @@ public class LOOKUPSWITCH extends Select public LOOKUPSWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) { - super(org.apache.commons.bcel6.Constants.LOOKUPSWITCH, match, targets, defaultTarget); + super(org.apache.commons.bcel6.Const.LOOKUPSWITCH, match, targets, defaultTarget); /* alignment remainder assumed 0 here, until dump time. */ final short _length = (short) (9 + getMatch_length() * 8); super.setLength(_length); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOR.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LOR.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LOR extends ArithmeticInstruction { public LOR() { - super(org.apache.commons.bcel6.Constants.LOR); + super(org.apache.commons.bcel6.Const.LOR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LREM.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ import org.apache.commons.bcel6.Exceptio public class LREM extends ArithmeticInstruction implements ExceptionThrower { public LREM() { - super(org.apache.commons.bcel6.Constants.LREM); + super(org.apache.commons.bcel6.Const.LREM); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LRETURN.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LRETURN.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LRETURN.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LRETURN.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LRETURN extends ReturnInstruction { public LRETURN() { - super(org.apache.commons.bcel6.Constants.LRETURN); + super(org.apache.commons.bcel6.Const.LRETURN); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHL.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHL.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LSHL extends ArithmeticInstruction { public LSHL() { - super(org.apache.commons.bcel6.Constants.LSHL); + super(org.apache.commons.bcel6.Const.LSHL); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHR.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSHR.java Fri Sep 11 00:30:19 2015 @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LSHR extends ArithmeticInstruction { public LSHR() { - super(org.apache.commons.bcel6.Constants.LSHR); + super(org.apache.commons.bcel6.Const.LSHR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSTORE.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSTORE.java Fri Sep 11 00:30:19 2015 @@ -30,12 +30,12 @@ public class LSTORE extends StoreInstruc * Instruction.readInstruction(). Not to be used otherwise. */ LSTORE() { - super(org.apache.commons.bcel6.Constants.LSTORE, org.apache.commons.bcel6.Constants.LSTORE_0); + super(org.apache.commons.bcel6.Const.LSTORE, org.apache.commons.bcel6.Const.LSTORE_0); } public LSTORE(int n) { - super(org.apache.commons.bcel6.Constants.LSTORE, org.apache.commons.bcel6.Constants.LSTORE_0, n); + super(org.apache.commons.bcel6.Const.LSTORE, org.apache.commons.bcel6.Const.LSTORE_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSUB.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSUB.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSUB.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LSUB.java Fri Sep 11 00:30:19 2015 @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LSUB extends ArithmeticInstruction { public LSUB() { - super(org.apache.commons.bcel6.Constants.LSUB); + super(org.apache.commons.bcel6.Const.LSUB); }
