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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LCMP - Compare longs: @@ -31,7 +31,7 @@ public class LCMP extends Instruction im public LCMP() { - super(org.apache.bcel.Constants.LCMP, (short) 1); + super(org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LCONST - Push 0 or 1, other values cause an exception @@ -40,11 +40,11 @@ public class LCONST extends Instruction public LCONST(long l) { - super(org.apache.bcel.Constants.LCONST_0, (short) 1); + super(org.apache.commons.bcel6.Constants.LCONST_0, (short) 1); if (l == 0) { - opcode = org.apache.bcel.Constants.LCONST_0; + opcode = org.apache.commons.bcel6.Constants.LCONST_0; } else if (l == 1) { - opcode = org.apache.bcel.Constants.LCONST_1; + opcode = org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; +import org.apache.commons.bcel6.util.ByteSequence; /** * LDC - Push item from constant pool. @@ -44,18 +44,18 @@ public class LDC extends CPInstruction i public LDC(int index) { - super(org.apache.bcel.Constants.LDC_W, index); + super(org.apache.commons.bcel6.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.commons.bcel6.Constants.MAX_BYTE) { // Fits in one byte? + opcode = org.apache.commons.bcel6.Constants.LDC; length = 2; } else { - opcode = org.apache.bcel.Constants.LDC_W; + opcode = org.apache.commons.bcel6.Constants.LDC_W; length = 3; } } @@ -97,20 +97,20 @@ public class LDC extends CPInstruction i public Object getValue( ConstantPoolGen cpg ) { - org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index); + org.apache.commons.bcel6.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.commons.bcel6.Constants.CONSTANT_String: + int i = ((org.apache.commons.bcel6.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 Integer.valueOf(((org.apache.bcel.classfile.ConstantInteger) c).getBytes()); - case org.apache.bcel.Constants.CONSTANT_Class: - int nameIndex = ((org.apache.bcel.classfile.ConstantClass) c).getNameIndex(); + return ((org.apache.commons.bcel6.classfile.ConstantUtf8) c).getBytes(); + case org.apache.commons.bcel6.Constants.CONSTANT_Float: + return new Float(((org.apache.commons.bcel6.classfile.ConstantFloat) c).getBytes()); + case org.apache.commons.bcel6.Constants.CONSTANT_Integer: + return Integer.valueOf(((org.apache.commons.bcel6.classfile.ConstantInteger) c).getBytes()); + case org.apache.commons.bcel6.Constants.CONSTANT_Class: + int nameIndex = ((org.apache.commons.bcel6.classfile.ConstantClass) c).getNameIndex(); c = cpg.getConstantPool().getConstant(nameIndex); - return new ObjectType(((org.apache.bcel.classfile.ConstantUtf8) c).getBytes()); + return new ObjectType(((org.apache.commons.bcel6.classfile.ConstantUtf8) c).getBytes()); default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + index); } @@ -120,13 +120,13 @@ public class LDC extends CPInstruction i @Override public Type getType( ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(index).getTag()) { - case org.apache.bcel.Constants.CONSTANT_String: + case org.apache.commons.bcel6.Constants.CONSTANT_String: return Type.STRING; - case org.apache.bcel.Constants.CONSTANT_Float: + case org.apache.commons.bcel6.Constants.CONSTANT_Float: return Type.FLOAT; - case org.apache.bcel.Constants.CONSTANT_Integer: + case org.apache.commons.bcel6.Constants.CONSTANT_Integer: return Type.INT; - case org.apache.bcel.Constants.CONSTANT_Class: + case org.apache.commons.bcel6.Constants.CONSTANT_Class: return Type.CLASS; default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + index); @@ -135,7 +135,7 @@ public class LDC extends CPInstruction i public Class<?>[] getExceptions() { - return org.apache.bcel.ExceptionConstants.EXCS_STRING_RESOLUTION; + return org.apache.commons.bcel6.ExceptionConstants.EXCS_STRING_RESOLUTION; } 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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LDC2_W - Push long or double from constant pool @@ -39,16 +39,16 @@ public class LDC2_W extends CPInstructio public LDC2_W(int index) { - super(org.apache.bcel.Constants.LDC2_W, index); + super(org.apache.commons.bcel6.Constants.LDC2_W, index); } @Override public Type getType( ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(index).getTag()) { - case org.apache.bcel.Constants.CONSTANT_Long: + case org.apache.commons.bcel6.Constants.CONSTANT_Long: return Type.LONG; - case org.apache.bcel.Constants.CONSTANT_Double: + case org.apache.commons.bcel6.Constants.CONSTANT_Double: return Type.DOUBLE; default: // Never reached throw new RuntimeException("Unknown constant type " + opcode); @@ -57,12 +57,12 @@ public class LDC2_W extends CPInstructio public Number getValue( ConstantPoolGen cpg ) { - org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index); + org.apache.commons.bcel6.classfile.Constant c = cpg.getConstantPool().getConstant(index); switch (c.getTag()) { - case org.apache.bcel.Constants.CONSTANT_Long: - return Long.valueOf(((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.commons.bcel6.Constants.CONSTANT_Long: + return Long.valueOf(((org.apache.commons.bcel6.classfile.ConstantLong) c).getBytes()); + case org.apache.commons.bcel6.Constants.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 " + index); } 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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,10 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.util.ByteSequence; /** * LDC_W - Push item from constant pool (wide index) @@ -53,7 +54,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 - opcode = org.apache.bcel.Constants.LDC_W; + opcode = org.apache.commons.bcel6.Constants.LDC_W; length = 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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LDIV - Divide longs @@ -31,13 +31,13 @@ public class LDIV extends ArithmeticInst public LDIV() { - super(org.apache.bcel.Constants.LDIV); + super(org.apache.commons.bcel6.Constants.LDIV); } public Class<?>[] getExceptions() { return new Class[] { - org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION + org.apache.commons.bcel6.ExceptionConstants.ARITHMETIC_EXCEPTION }; } 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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LLOAD - Load long from local variable @@ -34,12 +34,12 @@ public class LLOAD extends LoadInstructi * Instruction.readInstruction(). Not to be used otherwise. */ LLOAD() { - super(org.apache.bcel.Constants.LLOAD, org.apache.bcel.Constants.LLOAD_0); + super(org.apache.commons.bcel6.Constants.LLOAD, org.apache.commons.bcel6.Constants.LLOAD_0); } public LLOAD(int n) { - super(org.apache.bcel.Constants.LLOAD, org.apache.bcel.Constants.LLOAD_0, n); + super(org.apache.commons.bcel6.Constants.LLOAD, org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LMUL - Multiply longs @@ -31,7 +31,7 @@ public class LMUL extends ArithmeticInst public LMUL() { - super(org.apache.bcel.Constants.LMUL); + super(org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LNEG - Negate long @@ -30,7 +30,7 @@ public class LNEG extends ArithmeticInst public LNEG() { - super(org.apache.bcel.Constants.LNEG); + super(org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,11 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.util.ByteSequence; /** * LOOKUPSWITCH - Switch with unordered set of values @@ -42,7 +43,7 @@ public class LOOKUPSWITCH extends Select public LOOKUPSWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) { - super(org.apache.bcel.Constants.LOOKUPSWITCH, match, targets, defaultTarget); + super(org.apache.commons.bcel6.Constants.LOOKUPSWITCH, match, targets, defaultTarget); length = (short) (9 + match_length * 8); /* alignment remainder assumed * 0 here, until dump time. */ fixed_length = 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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LOR - Bitwise OR long @@ -30,7 +30,7 @@ public class LOR extends ArithmeticInstr public LOR() { - super(org.apache.bcel.Constants.LOR); + super(org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LREM - Remainder of long @@ -30,13 +30,13 @@ public class LREM extends ArithmeticInst public LREM() { - super(org.apache.bcel.Constants.LREM); + super(org.apache.commons.bcel6.Constants.LREM); } public Class<?>[] getExceptions() { return new Class[] { - org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION + org.apache.commons.bcel6.ExceptionConstants.ARITHMETIC_EXCEPTION }; } 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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LRETURN - Return long from method @@ -30,7 +30,7 @@ public class LRETURN extends ReturnInstr public LRETURN() { - super(org.apache.bcel.Constants.LRETURN); + super(org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LSHL - Arithmetic shift left long @@ -30,7 +30,7 @@ public class LSHL extends ArithmeticInst public LSHL() { - super(org.apache.bcel.Constants.LSHL); + super(org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LSHR - Arithmetic shift right long @@ -30,7 +30,7 @@ public class LSHR extends ArithmeticInst public LSHR() { - super(org.apache.bcel.Constants.LSHR); + super(org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LSTORE - Store long into local variable @@ -34,12 +34,12 @@ public class LSTORE extends StoreInstruc * Instruction.readInstruction(). Not to be used otherwise. */ LSTORE() { - super(org.apache.bcel.Constants.LSTORE, org.apache.bcel.Constants.LSTORE_0); + super(org.apache.commons.bcel6.Constants.LSTORE, org.apache.commons.bcel6.Constants.LSTORE_0); } public LSTORE(int n) { - super(org.apache.bcel.Constants.LSTORE, org.apache.bcel.Constants.LSTORE_0, n); + super(org.apache.commons.bcel6.Constants.LSTORE, org.apache.commons.bcel6.Constants.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=1694911&r1=1694824&r2=1694911&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 Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LSUB - Substract longs @@ -31,7 +31,7 @@ public class LSUB extends ArithmeticInst public LSUB() { - super(org.apache.bcel.Constants.LSUB); + super(org.apache.commons.bcel6.Constants.LSUB); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LUSHR - Logical shift right long @@ -30,7 +30,7 @@ public class LUSHR extends ArithmeticIns public LUSHR() { - super(org.apache.bcel.Constants.LUSHR); + super(org.apache.commons.bcel6.Constants.LUSHR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * LXOR - Bitwise XOR long @@ -30,7 +30,7 @@ public class LXOR extends ArithmeticInst public LXOR() { - super(org.apache.bcel.Constants.LXOR); + super(org.apache.commons.bcel6.Constants.LXOR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java Sun Aug 9 21:21:10 2015 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.classfile.LineNumber; +import org.apache.commons.bcel6.classfile.LineNumber; /** * This class represents a line number within a method, i.e., give an instruction Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadClass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadClass.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadClass.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadClass.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denotes that an instruction may start the process of loading and resolving Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LoadInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denotes an unparameterized instruction to load a value from a local Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java Sun Aug 9 21:21:10 2015 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.LocalVariable; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.LocalVariable; /** * This class represents a local variable within a method. It contains its Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,12 +15,13 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.Constants; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.util.ByteSequence; /** * Abstract super class for instructions dealing with local variables. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * MONITORENTER - Enter monitor for object @@ -30,13 +30,13 @@ public class MONITORENTER extends Instru public MONITORENTER() { - super(org.apache.bcel.Constants.MONITORENTER, (short) 1); + super(org.apache.commons.bcel6.Constants.MONITORENTER, (short) 1); } public Class<?>[] getExceptions() { return new Class[] { - org.apache.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION + org.apache.commons.bcel6.ExceptionConstants.NULL_POINTER_EXCEPTION }; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * MONITOREXIT - Exit monitor for object @@ -30,13 +30,13 @@ public class MONITOREXIT extends Instruc public MONITOREXIT() { - super(org.apache.bcel.Constants.MONITOREXIT, (short) 1); + super(org.apache.commons.bcel6.Constants.MONITOREXIT, (short) 1); } public Class<?>[] getExceptions() { return new Class[] { - org.apache.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION + org.apache.commons.bcel6.ExceptionConstants.NULL_POINTER_EXCEPTION }; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java Sun Aug 9 21:21:10 2015 @@ -15,13 +15,14 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.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.commons.bcel6.ExceptionConstants; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.util.ByteSequence; /** * MULTIANEWARRAY - Create new mutidimensional array of references @@ -46,7 +47,7 @@ public class MULTIANEWARRAY extends CPIn public MULTIANEWARRAY(int index, short dimensions) { - super(org.apache.bcel.Constants.MULTIANEWARRAY, index); + super(org.apache.commons.bcel6.Constants.MULTIANEWARRAY, index); if (dimensions < 1) { throw new ClassGenException("Invalid dimensions value: " + dimensions); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.util.ArrayList; import java.util.Arrays; @@ -24,24 +24,24 @@ import java.util.Hashtable; 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.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.AnnotationEntry; +import org.apache.commons.bcel6.classfile.Annotations; +import org.apache.commons.bcel6.classfile.Attribute; +import org.apache.commons.bcel6.classfile.Code; +import org.apache.commons.bcel6.classfile.CodeException; +import org.apache.commons.bcel6.classfile.ExceptionTable; +import org.apache.commons.bcel6.classfile.LineNumber; +import org.apache.commons.bcel6.classfile.LineNumberTable; +import org.apache.commons.bcel6.classfile.LocalVariable; +import org.apache.commons.bcel6.classfile.LocalVariableTable; +import org.apache.commons.bcel6.classfile.LocalVariableTypeTable; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.ParameterAnnotationEntry; +import org.apache.commons.bcel6.classfile.ParameterAnnotations; +import org.apache.commons.bcel6.classfile.RuntimeVisibleParameterAnnotations; +import org.apache.commons.bcel6.classfile.Utility; +import org.apache.commons.bcel6.util.BCELComparator; /** * Template class for building up a method. This is done by defining exception Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodObserver.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodObserver.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodObserver.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodObserver.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Implement this interface if you're interested in changes to a MethodGen object Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java Sun Aug 9 21:21:10 2015 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.ExceptionConstants; +import org.apache.commons.bcel6.ExceptionConstants; /** * NEW - Create new object @@ -41,7 +41,7 @@ public class NEW extends CPInstruction i public NEW(int index) { - super(org.apache.bcel.Constants.NEW, index); + super(org.apache.commons.bcel6.Constants.NEW, index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.util.ByteSequence; /** * NEWARRAY - Create new array of basic type (int, short, ...) @@ -45,7 +46,7 @@ public class NEWARRAY extends Instructio public NEWARRAY(byte type) { - super(org.apache.bcel.Constants.NEWARRAY, (short) 2); + super(org.apache.commons.bcel6.Constants.NEWARRAY, (short) 2); this.type = type; } @@ -87,7 +88,7 @@ public class NEWARRAY extends Instructio */ @Override public String toString( boolean verbose ) { - return super.toString(verbose) + " " + org.apache.bcel.Constants.TYPE_NAMES[type]; + return super.toString(verbose) + " " + org.apache.commons.bcel6.Constants.TYPE_NAMES[type]; } @@ -103,7 +104,7 @@ public class NEWARRAY extends Instructio public Class<?>[] getExceptions() { return new Class[] { - org.apache.bcel.ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION + org.apache.commons.bcel6.ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION }; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * NOP - Do nothing @@ -29,7 +29,7 @@ public class NOP extends Instruction { public NOP() { - super(org.apache.bcel.Constants.NOP, (short) 1); + super(org.apache.commons.bcel6.Constants.NOP, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.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.commons.bcel6.classfile.ConstantCP; +import org.apache.commons.bcel6.classfile.ConstantNameAndType; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantUtf8; /** * Super class for FieldOrMethod and INVOKEDYNAMIC, since they both have Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NamedAndTyped.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NamedAndTyped.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NamedAndTyped.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NamedAndTyped.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denote entity that has both name and type. This is true for local variables, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.JavaClass; /** * Denotes reference such as java.lang.String. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * POP - Pop top operand stack word @@ -31,7 +31,7 @@ public class POP extends StackInstructio public POP() { - super(org.apache.bcel.Constants.POP); + super(org.apache.commons.bcel6.Constants.POP); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * POP2 - Pop two top operand stack words @@ -31,7 +31,7 @@ public class POP2 extends StackInstructi public POP2() { - super(org.apache.bcel.Constants.POP2); + super(org.apache.commons.bcel6.Constants.POP2); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java Sun Aug 9 21:21:10 2015 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; +import org.apache.commons.bcel6.Constants; /** * Wrapper class for push operations, which are implemented either as BIPUSH, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java Sun Aug 9 21:21:10 2015 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; -import org.apache.bcel.ExceptionConstants; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.ExceptionConstants; /** * PUTFIELD - Put field in object Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java Sun Aug 9 21:21:10 2015 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; -import org.apache.bcel.ExceptionConstants; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.ExceptionConstants; /** * PUTSTATIC - Put static field in class Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PopInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PopInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PopInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PopInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denotes an unparameterized instruction to pop a value on top from the stack, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PushInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PushInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PushInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PushInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denotes an unparameterized instruction to produce a value on top of the stack, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.util.ByteSequence; /** * RET - Return from subroutine @@ -45,7 +46,7 @@ public class RET extends Instruction imp public RET(int index) { - super(org.apache.bcel.Constants.RET, (short) 2); + super(org.apache.commons.bcel6.Constants.RET, (short) 2); setIndex(index); // May set wide as side effect } @@ -57,7 +58,7 @@ public class RET extends Instruction imp @Override public void dump( DataOutputStream out ) throws IOException { if (wide) { - out.writeByte(org.apache.bcel.Constants.WIDE); + out.writeByte(org.apache.commons.bcel6.Constants.WIDE); } out.writeByte(opcode); if (wide) { @@ -69,7 +70,7 @@ public class RET extends Instruction imp private void setWide() { - wide = index > org.apache.bcel.Constants.MAX_BYTE; + wide = index > org.apache.commons.bcel6.Constants.MAX_BYTE; if (wide) { length = 4; // Including the wide byte } else { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * RETURN - Return from void method @@ -30,7 +30,7 @@ public class RETURN extends ReturnInstru public RETURN() { - super(org.apache.bcel.Constants.RETURN); + super(org.apache.commons.bcel6.Constants.RETURN); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.JavaClass; /** * Super class for object and array types. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; -import org.apache.bcel.ExceptionConstants; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.ExceptionConstants; /** * Super class for the xRETURN family of instructions. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java Sun Aug 9 21:21:10 2015 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; -import org.apache.bcel.Constants; +import org.apache.commons.bcel6.Constants; /** * Returnaddress, the type JSR or JSR_W instructions push upon the stack. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * SALOAD - Load short from array @@ -30,7 +30,7 @@ public class SALOAD extends ArrayInstruc public SALOAD() { - super(org.apache.bcel.Constants.SALOAD); + super(org.apache.commons.bcel6.Constants.SALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * SASTORE - Store into short array @@ -30,7 +30,7 @@ public class SASTORE extends ArrayInstru public SASTORE() { - super(org.apache.bcel.Constants.SASTORE); + super(org.apache.commons.bcel6.Constants.SASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.util.ByteSequence; /** * SIPUSH - Push short @@ -44,7 +45,7 @@ public class SIPUSH extends Instruction public SIPUSH(short b) { - super(org.apache.bcel.Constants.SIPUSH, (short) 3); + super(org.apache.commons.bcel6.Constants.SIPUSH, (short) 3); this.b = b; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * SWAP - Swa top operand stack word @@ -30,7 +30,7 @@ public class SWAP extends StackInstructi public SWAP() { - super(org.apache.bcel.Constants.SWAP); + super(org.apache.commons.bcel6.Constants.SWAP); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * SWITCH - Branch depending on int value, generates either LOOKUPSWITCH or Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.util.ByteSequence; /** * Select - Abstract super class for LOOKUPSWITCH and TABLESWITCH instructions. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java Sun Aug 9 21:21:10 2015 @@ -15,17 +15,18 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -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.ConstantUtf8; -import org.apache.bcel.classfile.ElementValue; -import org.apache.bcel.classfile.SimpleElementValue; + +import org.apache.commons.bcel6.classfile.ConstantDouble; +import org.apache.commons.bcel6.classfile.ConstantFloat; +import org.apache.commons.bcel6.classfile.ConstantInteger; +import org.apache.commons.bcel6.classfile.ConstantLong; +import org.apache.commons.bcel6.classfile.ConstantUtf8; +import org.apache.commons.bcel6.classfile.ElementValue; +import org.apache.commons.bcel6.classfile.SimpleElementValue; /** * @since 6.0 Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackConsumer.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackConsumer.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackConsumer.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackConsumer.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denote an instruction that may consume a value from the stack. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Super class for stack operations like DUP and POP. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackProducer.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackProducer.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackProducer.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackProducer.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denote an instruction that may produce a value on top of the stack Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denotes an unparameterized instruction to store a value into a local variable, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; + +import org.apache.commons.bcel6.util.ByteSequence; /** * TABLESWITCH - Switch within given range of values, i.e., low..high @@ -48,7 +49,7 @@ public class TABLESWITCH extends Select * @param defaultTarget default branch */ public TABLESWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) { - super(org.apache.bcel.Constants.TABLESWITCH, match, targets, defaultTarget); + super(org.apache.commons.bcel6.Constants.TABLESWITCH, match, targets, defaultTarget); length = (short) (13 + match_length * 4); /* Alignment remainder assumed * 0 here, until dump time */ fixed_length = length; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Thrown by InstructionList.remove() when one or multiple disposed instructions Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java Sun Aug 9 21:21:10 2015 @@ -15,16 +15,16 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.util.ArrayList; import java.util.List; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.ClassFormatException; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.verifier.structurals.LocalVariables; -import org.apache.bcel.verifier.structurals.OperandStack; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.ClassFormatException; +import org.apache.commons.bcel6.classfile.Utility; +import org.apache.commons.bcel6.verifier.structurals.LocalVariables; +import org.apache.commons.bcel6.verifier.structurals.OperandStack; /** * Abstract super class for all possible java types, namely basic types Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TypedInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TypedInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TypedInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TypedInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Get the type associated with an instruction, int for ILOAD, or the type Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/UnconditionalBranch.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/UnconditionalBranch.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/UnconditionalBranch.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/UnconditionalBranch.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denotes an instruction to perform an unconditional branch, i.e., GOTO, JSR. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/VariableLengthInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/VariableLengthInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/VariableLengthInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/VariableLengthInstruction.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denotes an instruction to be a variable length instruction, such as Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Visitor.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Visitor.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Visitor.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Visitor.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Interface implementing the Visitor pattern programming style. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java Sun Aug 9 21:21:10 2015 @@ -15,26 +15,27 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.CodeException; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.ExceptionTable; -import org.apache.bcel.classfile.InnerClass; -import org.apache.bcel.classfile.InnerClasses; -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.SourceFile; -import org.apache.bcel.classfile.Utility; + +import org.apache.commons.bcel6.classfile.Attribute; +import org.apache.commons.bcel6.classfile.Code; +import org.apache.commons.bcel6.classfile.CodeException; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantUtf8; +import org.apache.commons.bcel6.classfile.ConstantValue; +import org.apache.commons.bcel6.classfile.ExceptionTable; +import org.apache.commons.bcel6.classfile.InnerClass; +import org.apache.commons.bcel6.classfile.InnerClasses; +import org.apache.commons.bcel6.classfile.LineNumber; +import org.apache.commons.bcel6.classfile.LineNumberTable; +import org.apache.commons.bcel6.classfile.LocalVariable; +import org.apache.commons.bcel6.classfile.LocalVariableTable; +import org.apache.commons.bcel6.classfile.SourceFile; +import org.apache.commons.bcel6.classfile.Utility; /** * Convert found attributes into HTML file. @@ -43,7 +44,7 @@ import org.apache.bcel.classfile.Utility * @author <A HREF="mailto:[email protected]";>M. Dahm</A> * */ -final class AttributeHTML implements org.apache.bcel.Constants { +final class AttributeHTML implements org.apache.commons.bcel6.Constants { private final String class_name; // name of current class private final PrintWriter file; // file to write to Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELComparator.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELComparator.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELComparator.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELComparator.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; /** * Used for BCEL comparison strategy Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.PrintWriter; import java.util.ArrayList; @@ -24,37 +24,37 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.generic.AllocationInstruction; -import org.apache.bcel.generic.ArrayInstruction; -import org.apache.bcel.generic.ArrayType; -import org.apache.bcel.generic.BranchHandle; -import org.apache.bcel.generic.BranchInstruction; -import org.apache.bcel.generic.CHECKCAST; -import org.apache.bcel.generic.CPInstruction; -import org.apache.bcel.generic.CodeExceptionGen; -import org.apache.bcel.generic.ConstantPoolGen; -import org.apache.bcel.generic.ConstantPushInstruction; -import org.apache.bcel.generic.EmptyVisitor; -import org.apache.bcel.generic.FieldInstruction; -import org.apache.bcel.generic.IINC; -import org.apache.bcel.generic.INSTANCEOF; -import org.apache.bcel.generic.Instruction; -import org.apache.bcel.generic.InstructionConstants; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.InvokeInstruction; -import org.apache.bcel.generic.LDC; -import org.apache.bcel.generic.LDC2_W; -import org.apache.bcel.generic.LocalVariableInstruction; -import org.apache.bcel.generic.MULTIANEWARRAY; -import org.apache.bcel.generic.MethodGen; -import org.apache.bcel.generic.NEWARRAY; -import org.apache.bcel.generic.ObjectType; -import org.apache.bcel.generic.RET; -import org.apache.bcel.generic.ReturnInstruction; -import org.apache.bcel.generic.Select; -import org.apache.bcel.generic.Type; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.Utility; +import org.apache.commons.bcel6.generic.AllocationInstruction; +import org.apache.commons.bcel6.generic.ArrayInstruction; +import org.apache.commons.bcel6.generic.ArrayType; +import org.apache.commons.bcel6.generic.BranchHandle; +import org.apache.commons.bcel6.generic.BranchInstruction; +import org.apache.commons.bcel6.generic.CHECKCAST; +import org.apache.commons.bcel6.generic.CPInstruction; +import org.apache.commons.bcel6.generic.CodeExceptionGen; +import org.apache.commons.bcel6.generic.ConstantPoolGen; +import org.apache.commons.bcel6.generic.ConstantPushInstruction; +import org.apache.commons.bcel6.generic.EmptyVisitor; +import org.apache.commons.bcel6.generic.FieldInstruction; +import org.apache.commons.bcel6.generic.IINC; +import org.apache.commons.bcel6.generic.INSTANCEOF; +import org.apache.commons.bcel6.generic.Instruction; +import org.apache.commons.bcel6.generic.InstructionConstants; +import org.apache.commons.bcel6.generic.InstructionHandle; +import org.apache.commons.bcel6.generic.InvokeInstruction; +import org.apache.commons.bcel6.generic.LDC; +import org.apache.commons.bcel6.generic.LDC2_W; +import org.apache.commons.bcel6.generic.LocalVariableInstruction; +import org.apache.commons.bcel6.generic.MULTIANEWARRAY; +import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.commons.bcel6.generic.NEWARRAY; +import org.apache.commons.bcel6.generic.ObjectType; +import org.apache.commons.bcel6.generic.RET; +import org.apache.commons.bcel6.generic.ReturnInstruction; +import org.apache.commons.bcel6.generic.Select; +import org.apache.commons.bcel6.generic.Type; /** * Factory creates il.append() statements, and sets instruction targets. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java Sun Aug 9 21:21:10 2015 @@ -15,23 +15,24 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.OutputStream; import java.io.PrintWriter; import java.util.Locale; -import org.apache.bcel.Constants; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.generic.ArrayType; -import org.apache.bcel.generic.ConstantPoolGen; -import org.apache.bcel.generic.MethodGen; -import org.apache.bcel.generic.Type; + +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.ClassParser; +import org.apache.commons.bcel6.classfile.ConstantValue; +import org.apache.commons.bcel6.classfile.Field; +import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.Utility; +import org.apache.commons.bcel6.generic.ArrayType; +import org.apache.commons.bcel6.generic.ConstantPoolGen; +import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.commons.bcel6.generic.Type; /** * This class takes a given JavaClass object and converts it to a @@ -43,7 +44,7 @@ import org.apache.bcel.generic.Type; * @version $Id$ * @author <A HREF="mailto:[email protected]";>M. Dahm</A> */ -public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor { +public class BCELifier extends org.apache.commons.bcel6.classfile.EmptyVisitor { private static final int FLAG_FOR_UNKNOWN = -1; private static final int FLAG_FOR_CLASS = 0; @@ -82,9 +83,9 @@ public class BCELifier extends org.apach _out.println("package " + package_name + ";"); _out.println(); } - _out.println("import org.apache.bcel.generic.*;"); - _out.println("import org.apache.bcel.classfile.*;"); - _out.println("import org.apache.bcel.*;"); + _out.println("import org.apache.commons.bcel6.generic.*;"); + _out.println("import org.apache.commons.bcel6.classfile.*;"); + _out.println("import org.apache.commons.bcel6.*;"); _out.println("import java.io.*;"); _out.println(); _out.println("public class " + class_name + "Creator implements Constants {"); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ByteSequence.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ByteSequence.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ByteSequence.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ByteSequence.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.ByteArrayInputStream; import java.io.DataInputStream; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java Sun Aug 9 21:21:10 2015 @@ -15,19 +15,20 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; + +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.Attribute; +import org.apache.commons.bcel6.classfile.ClassParser; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.Utility; /** * Read class file(s) and convert them into HTML files. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoader.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoader.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoader.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoader.java Sun Aug 9 21:21:10 2015 @@ -15,18 +15,18 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.ByteArrayInputStream; import java.util.Hashtable; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Utility; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.ClassParser; +import org.apache.commons.bcel6.classfile.ConstantClass; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantUtf8; +import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.classfile.Utility; /** * <p>Drop in replacement for the standard class loader of the JVM. You can use it
