Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,14 +15,14 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.util.StringTokenizer; -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; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantCP; +import org.apache.bcel.classfile.ConstantPool; /** * Super class for the INVOKExxx family of instructions.
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; @@ -36,7 +36,7 @@ public class JSR extends JsrInstruction public JSR(final InstructionHandle target) { - super(org.apache.commons.bcel6.Const.JSR, target); + super(org.apache.bcel.Const.JSR, target); } @@ -47,7 +47,7 @@ public class JSR extends JsrInstruction @Override public void dump( final DataOutputStream out ) throws IOException { super.setIndex(getTargetOffset()); - if (super.getOpcode() == org.apache.commons.bcel6.Const.JSR) { + if (super.getOpcode() == org.apache.bcel.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.Const.JSR_W); + super.setOpcode(org.apache.bcel.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/bcel/generic/JSR_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR_W.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR_W.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.util.ByteSequence; /** * JSR_W - Jump to subroutine @@ -38,7 +38,7 @@ public class JSR_W extends JsrInstructio public JSR_W(final InstructionHandle target) { - super(org.apache.commons.bcel6.Const.JSR_W, target); + super(org.apache.bcel.Const.JSR_W, target); super.setLength(5); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JsrInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JsrInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JsrInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JsrInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Super class for JSR - Jump to subroutine Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * L2D - Convert long to double @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class L2D extends ConversionInstruction { public L2D() { - super(org.apache.commons.bcel6.Const.L2D); + super(org.apache.bcel.Const.L2D); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * L2F - Convert long to float @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class L2F extends ConversionInstruction { public L2F() { - super(org.apache.commons.bcel6.Const.L2F); + super(org.apache.bcel.Const.L2F); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * L2I - Convert long to int @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class L2I extends ConversionInstruction { public L2I() { - super(org.apache.commons.bcel6.Const.L2I); + super(org.apache.bcel.Const.L2I); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LADD - Add longs @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LADD extends ArithmeticInstruction { public LADD() { - super(org.apache.commons.bcel6.Const.LADD); + super(org.apache.bcel.Const.LADD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LALOAD - Load long from array @@ -28,7 +28,7 @@ public class LALOAD extends ArrayInstruc /** Load long from array */ public LALOAD() { - super(org.apache.commons.bcel6.Const.LALOAD); + super(org.apache.bcel.Const.LALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LAND - Bitwise AND longs @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LAND extends ArithmeticInstruction { public LAND() { - super(org.apache.commons.bcel6.Const.LAND); + super(org.apache.bcel.Const.LAND); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LASTORE - Store into long array @@ -28,7 +28,7 @@ public class LASTORE extends ArrayInstru /** Store long into array */ public LASTORE() { - super(org.apache.commons.bcel6.Const.LASTORE); + super(org.apache.bcel.Const.LASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LCMP - Compare longs: @@ -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.Const.LCMP, (short) 1); + super(org.apache.bcel.Const.LCMP, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LCONST - Push 0 or 1, other values cause an exception @@ -38,11 +38,11 @@ public class LCONST extends Instruction public LCONST(final long l) { - super(org.apache.commons.bcel6.Const.LCONST_0, (short) 1); + super(org.apache.bcel.Const.LCONST_0, (short) 1); if (l == 0) { - super.setOpcode(org.apache.commons.bcel6.Const.LCONST_0); + super.setOpcode(org.apache.bcel.Const.LCONST_0); } else if (l == 1) { - super.setOpcode(org.apache.commons.bcel6.Const.LCONST_1); + super.setOpcode(org.apache.bcel.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/bcel/generic/LDC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java Tue Jun 7 17:28:43 2016 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.ExceptionConst; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.ExceptionConst; +import org.apache.bcel.util.ByteSequence; /** * LDC - Push item from constant pool. @@ -41,18 +41,18 @@ public class LDC extends CPInstruction i public LDC(final int index) { - super(org.apache.commons.bcel6.Const.LDC_W, index); + super(org.apache.bcel.Const.LDC_W, index); setSize(); } // Adjust to proper size protected final void setSize() { - if (super.getIndex() <= org.apache.commons.bcel6.Const.MAX_BYTE) { // Fits in one byte? - super.setOpcode(org.apache.commons.bcel6.Const.LDC); + if (super.getIndex() <= org.apache.bcel.Const.MAX_BYTE) { // Fits in one byte? + super.setOpcode(org.apache.bcel.Const.LDC); super.setLength(2); } else { - super.setOpcode(org.apache.commons.bcel6.Const.LDC_W); + super.setOpcode(org.apache.bcel.Const.LDC_W); super.setLength(3); } } @@ -94,20 +94,20 @@ public class LDC extends CPInstruction i public Object getValue( final ConstantPoolGen cpg ) { - org.apache.commons.bcel6.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); + org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); switch (c.getTag()) { - case org.apache.commons.bcel6.Const.CONSTANT_String: - int i = ((org.apache.commons.bcel6.classfile.ConstantString) c).getStringIndex(); + case org.apache.bcel.Const.CONSTANT_String: + int i = ((org.apache.bcel.classfile.ConstantString) c).getStringIndex(); c = cpg.getConstantPool().getConstant(i); - return ((org.apache.commons.bcel6.classfile.ConstantUtf8) c).getBytes(); - case org.apache.commons.bcel6.Const.CONSTANT_Float: - return new Float(((org.apache.commons.bcel6.classfile.ConstantFloat) c).getBytes()); - case org.apache.commons.bcel6.Const.CONSTANT_Integer: - return Integer.valueOf(((org.apache.commons.bcel6.classfile.ConstantInteger) c).getBytes()); - case org.apache.commons.bcel6.Const.CONSTANT_Class: - int nameIndex = ((org.apache.commons.bcel6.classfile.ConstantClass) c).getNameIndex(); + return ((org.apache.bcel.classfile.ConstantUtf8) c).getBytes(); + case org.apache.bcel.Const.CONSTANT_Float: + return new Float(((org.apache.bcel.classfile.ConstantFloat) c).getBytes()); + case org.apache.bcel.Const.CONSTANT_Integer: + return Integer.valueOf(((org.apache.bcel.classfile.ConstantInteger) c).getBytes()); + case org.apache.bcel.Const.CONSTANT_Class: + int nameIndex = ((org.apache.bcel.classfile.ConstantClass) c).getNameIndex(); c = cpg.getConstantPool().getConstant(nameIndex); - return new ObjectType(((org.apache.commons.bcel6.classfile.ConstantUtf8) c).getBytes()); + return new ObjectType(((org.apache.bcel.classfile.ConstantUtf8) c).getBytes()); default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + super.getIndex()); } @@ -117,13 +117,13 @@ public class LDC extends CPInstruction i @Override public Type getType( final ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) { - case org.apache.commons.bcel6.Const.CONSTANT_String: + case org.apache.bcel.Const.CONSTANT_String: return Type.STRING; - case org.apache.commons.bcel6.Const.CONSTANT_Float: + case org.apache.bcel.Const.CONSTANT_Float: return Type.FLOAT; - case org.apache.commons.bcel6.Const.CONSTANT_Integer: + case org.apache.bcel.Const.CONSTANT_Integer: return Type.INT; - case org.apache.commons.bcel6.Const.CONSTANT_Class: + case org.apache.bcel.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/bcel/generic/LDC2_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LDC2_W - Push long or double from constant pool @@ -35,16 +35,16 @@ public class LDC2_W extends CPInstructio public LDC2_W(final int index) { - super(org.apache.commons.bcel6.Const.LDC2_W, index); + super(org.apache.bcel.Const.LDC2_W, index); } @Override public Type getType( final ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) { - case org.apache.commons.bcel6.Const.CONSTANT_Long: + case org.apache.bcel.Const.CONSTANT_Long: return Type.LONG; - case org.apache.commons.bcel6.Const.CONSTANT_Double: + case org.apache.bcel.Const.CONSTANT_Double: return Type.DOUBLE; default: // Never reached throw new RuntimeException("Unknown constant type " + super.getOpcode()); @@ -53,12 +53,12 @@ public class LDC2_W extends CPInstructio public Number getValue( final ConstantPoolGen cpg ) { - org.apache.commons.bcel6.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); + org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); switch (c.getTag()) { - case org.apache.commons.bcel6.Const.CONSTANT_Long: - return Long.valueOf(((org.apache.commons.bcel6.classfile.ConstantLong) c).getBytes()); - case org.apache.commons.bcel6.Const.CONSTANT_Double: - return new Double(((org.apache.commons.bcel6.classfile.ConstantDouble) c).getBytes()); + case org.apache.bcel.Const.CONSTANT_Long: + return Long.valueOf(((org.apache.bcel.classfile.ConstantLong) c).getBytes()); + case org.apache.bcel.Const.CONSTANT_Double: + return new Double(((org.apache.bcel.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/bcel/generic/LDC_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC_W.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC_W.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.IOException; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.util.ByteSequence; /** * LDC_W - Push item from constant pool (wide index) @@ -50,7 +50,7 @@ public class LDC_W extends LDC { protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { setIndex(bytes.readUnsignedShort()); // Override just in case it has been changed - super.setOpcode(org.apache.commons.bcel6.Const.LDC_W); + super.setOpcode(org.apache.bcel.Const.LDC_W); super.setLength(3); } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.ExceptionConst; /** * LDIV - Divide longs @@ -29,7 +29,7 @@ import org.apache.commons.bcel6.Exceptio public class LDIV extends ArithmeticInstruction implements ExceptionThrower { public LDIV() { - super(org.apache.commons.bcel6.Const.LDIV); + super(org.apache.bcel.Const.LDIV); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LLOAD - Load long from local variable @@ -30,12 +30,12 @@ public class LLOAD extends LoadInstructi * Instruction.readInstruction(). Not to be used otherwise. */ LLOAD() { - super(org.apache.commons.bcel6.Const.LLOAD, org.apache.commons.bcel6.Const.LLOAD_0); + super(org.apache.bcel.Const.LLOAD, org.apache.bcel.Const.LLOAD_0); } public LLOAD(final int n) { - super(org.apache.commons.bcel6.Const.LLOAD, org.apache.commons.bcel6.Const.LLOAD_0, n); + super(org.apache.bcel.Const.LLOAD, org.apache.bcel.Const.LLOAD_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LMUL - Multiply longs @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LMUL extends ArithmeticInstruction { public LMUL() { - super(org.apache.commons.bcel6.Const.LMUL); + super(org.apache.bcel.Const.LMUL); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LNEG - Negate long @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LNEG extends ArithmeticInstruction { public LNEG() { - super(org.apache.commons.bcel6.Const.LNEG); + super(org.apache.bcel.Const.LNEG); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.util.ByteSequence; /** * LOOKUPSWITCH - Switch with unordered set of values @@ -39,7 +39,7 @@ public class LOOKUPSWITCH extends Select public LOOKUPSWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) { - super(org.apache.commons.bcel6.Const.LOOKUPSWITCH, match, targets, defaultTarget); + super(org.apache.bcel.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/bcel/generic/LOR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOR.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOR.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LOR - Bitwise OR long @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LOR extends ArithmeticInstruction { public LOR() { - super(org.apache.commons.bcel6.Const.LOR); + super(org.apache.bcel.Const.LOR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.ExceptionConst; /** * LREM - Remainder of long @@ -28,7 +28,7 @@ import org.apache.commons.bcel6.Exceptio public class LREM extends ArithmeticInstruction implements ExceptionThrower { public LREM() { - super(org.apache.commons.bcel6.Const.LREM); + super(org.apache.bcel.Const.LREM); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LRETURN - Return long from method @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LRETURN extends ReturnInstruction { public LRETURN() { - super(org.apache.commons.bcel6.Const.LRETURN); + super(org.apache.bcel.Const.LRETURN); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LSHL - Arithmetic shift left long @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LSHL extends ArithmeticInstruction { public LSHL() { - super(org.apache.commons.bcel6.Const.LSHL); + super(org.apache.bcel.Const.LSHL); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LSHR - Arithmetic shift right long @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LSHR extends ArithmeticInstruction { public LSHR() { - super(org.apache.commons.bcel6.Const.LSHR); + super(org.apache.bcel.Const.LSHR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LSTORE - Store long into local variable @@ -30,12 +30,12 @@ public class LSTORE extends StoreInstruc * Instruction.readInstruction(). Not to be used otherwise. */ LSTORE() { - super(org.apache.commons.bcel6.Const.LSTORE, org.apache.commons.bcel6.Const.LSTORE_0); + super(org.apache.bcel.Const.LSTORE, org.apache.bcel.Const.LSTORE_0); } public LSTORE(final int n) { - super(org.apache.commons.bcel6.Const.LSTORE, org.apache.commons.bcel6.Const.LSTORE_0, n); + super(org.apache.bcel.Const.LSTORE, org.apache.bcel.Const.LSTORE_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LSUB - Substract longs @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class LSUB extends ArithmeticInstruction { public LSUB() { - super(org.apache.commons.bcel6.Const.LSUB); + super(org.apache.bcel.Const.LSUB); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LUSHR - Logical shift right long @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LUSHR extends ArithmeticInstruction { public LUSHR() { - super(org.apache.commons.bcel6.Const.LUSHR); + super(org.apache.bcel.Const.LUSHR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * LXOR - Bitwise XOR long @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class LXOR extends ArithmeticInstruction { public LXOR() { - super(org.apache.commons.bcel6.Const.LXOR); + super(org.apache.bcel.Const.LXOR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.classfile.LineNumber; +import org.apache.bcel.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/bcel/generic/LoadClass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadClass.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadClass.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadClass.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denotes that an instruction may start the process of loading and resolving Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denotes an unparameterized instruction to load a value from a local Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java Tue Jun 7 17:28:43 2016 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.classfile.LocalVariable; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.LocalVariable; /** * This class represents a local variable within a method. It contains its Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.Const; +import org.apache.bcel.util.ByteSequence; /** * Abstract super class for instructions dealing with local variables. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.ExceptionConst; /** * MONITORENTER - Enter monitor for object @@ -28,7 +28,7 @@ import org.apache.commons.bcel6.Exceptio public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer { public MONITORENTER() { - super(org.apache.commons.bcel6.Const.MONITORENTER, (short) 1); + super(org.apache.bcel.Const.MONITORENTER, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.ExceptionConst; /** * MONITOREXIT - Exit monitor for object @@ -28,7 +28,7 @@ import org.apache.commons.bcel6.Exceptio public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer { public MONITOREXIT() { - super(org.apache.commons.bcel6.Const.MONITOREXIT, (short) 1); + super(org.apache.bcel.Const.MONITOREXIT, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java Tue Jun 7 17:28:43 2016 @@ -15,14 +15,14 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.ExceptionConst; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.ExceptionConst; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.util.ByteSequence; /** * MULTIANEWARRAY - Create new mutidimensional array of references @@ -45,7 +45,7 @@ public class MULTIANEWARRAY extends CPIn public MULTIANEWARRAY(final int index, final short dimensions) { - super(org.apache.commons.bcel6.Const.MULTIANEWARRAY, index); + super(org.apache.bcel.Const.MULTIANEWARRAY, index); if (dimensions < 1) { throw new ClassGenException("Invalid dimensions value: " + dimensions); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.util.ArrayList; import java.util.Arrays; @@ -24,23 +24,23 @@ import java.util.Hashtable; import java.util.List; import java.util.Stack; -import org.apache.commons.bcel6.Const; -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.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; +import org.apache.bcel.Const; +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.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; /** * Template class for building up a method. This is done by defining exception Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodObserver.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodObserver.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodObserver.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodObserver.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Implement this interface if you're interested in changes to a MethodGen object Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.ExceptionConst; /** * NEW - Create new object @@ -37,7 +37,7 @@ public class NEW extends CPInstruction i public NEW(final int index) { - super(org.apache.commons.bcel6.Const.NEW, index); + super(org.apache.bcel.Const.NEW, index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java Tue Jun 7 17:28:43 2016 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.ExceptionConst; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.ExceptionConst; +import org.apache.bcel.util.ByteSequence; /** * NEWARRAY - Create new array of basic type (int, short, ...) @@ -45,7 +45,7 @@ public class NEWARRAY extends Instructio public NEWARRAY(final byte type) { - super(org.apache.commons.bcel6.Const.NEWARRAY, (short) 2); + super(org.apache.bcel.Const.NEWARRAY, (short) 2); this.type = type; } @@ -87,7 +87,7 @@ public class NEWARRAY extends Instructio */ @Override public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + org.apache.commons.bcel6.Const.getTypeName(type); + return super.toString(verbose) + " " + org.apache.bcel.Const.getTypeName(type); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * NOP - Do nothing @@ -25,7 +25,7 @@ package org.apache.commons.bcel6.generic public class NOP extends Instruction { public NOP() { - super(org.apache.commons.bcel6.Const.NOP, (short) 1); + super(org.apache.bcel.Const.NOP, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NameSignatureInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NameSignatureInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NameSignatureInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NameSignatureInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -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; +import org.apache.bcel.classfile.ConstantCP; +import org.apache.bcel.classfile.ConstantNameAndType; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.ConstantUtf8; /** * Super class for FieldOrMethod and INVOKEDYNAMIC, since they both have Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NamedAndTyped.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NamedAndTyped.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NamedAndTyped.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NamedAndTyped.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.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/bcel/generic/ObjectType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.Const; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.JavaClass; /** * Denotes reference such as java.lang.String. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * POP - Pop top operand stack word @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class POP extends StackInstruction implements PopInstruction { public POP() { - super(org.apache.commons.bcel6.Const.POP); + super(org.apache.bcel.Const.POP); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * POP2 - Pop two top operand stack words @@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic public class POP2 extends StackInstruction implements PopInstruction { public POP2() { - super(org.apache.commons.bcel6.Const.POP2); + super(org.apache.bcel.Const.POP2); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; +import org.apache.bcel.Const; /** * Wrapper class for push operations, which are implemented either as BIPUSH, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java Tue Jun 7 17:28:43 2016 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.Const; +import org.apache.bcel.ExceptionConst; /** * PUTFIELD - Put field in object Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java Tue Jun 7 17:28:43 2016 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.Const; +import org.apache.bcel.ExceptionConst; /** * PUTSTATIC - Put static field in class Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PopInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PopInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PopInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PopInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denotes an unparameterized instruction to pop a value on top from the stack, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PushInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PushInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PushInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PushInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denotes an unparameterized instruction to produce a value on top of the stack, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.util.ByteSequence; /** * RET - Return from subroutine @@ -44,7 +44,7 @@ public class RET extends Instruction imp public RET(final int index) { - super(org.apache.commons.bcel6.Const.RET, (short) 2); + super(org.apache.bcel.Const.RET, (short) 2); setIndex(index); // May set wide as side effect } @@ -56,7 +56,7 @@ public class RET extends Instruction imp @Override public void dump( final DataOutputStream out ) throws IOException { if (wide) { - out.writeByte(org.apache.commons.bcel6.Const.WIDE); + out.writeByte(org.apache.bcel.Const.WIDE); } out.writeByte(super.getOpcode()); if (wide) { @@ -68,7 +68,7 @@ public class RET extends Instruction imp private void setWide() { - wide = index > org.apache.commons.bcel6.Const.MAX_BYTE; + wide = index > org.apache.bcel.Const.MAX_BYTE; if (wide) { super.setLength(4); // Including the wide byte } else { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * RETURN - Return from void method @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class RETURN extends ReturnInstruction { public RETURN() { - super(org.apache.commons.bcel6.Const.RETURN); + super(org.apache.bcel.Const.RETURN); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java Tue Jun 7 17:28:43 2016 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.Const; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.JavaClass; /** * Super class for object and array types. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.ExceptionConst; +import org.apache.bcel.Const; +import org.apache.bcel.ExceptionConst; /** * Super class for the xRETURN family of instructions. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java Tue Jun 7 17:28:43 2016 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; -import org.apache.commons.bcel6.Const; +import org.apache.bcel.Const; /** * Returnaddress, the type JSR or JSR_W instructions push upon the stack. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * SALOAD - Load short from array @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class SALOAD extends ArrayInstruction implements StackProducer { public SALOAD() { - super(org.apache.commons.bcel6.Const.SALOAD); + super(org.apache.bcel.Const.SALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * SASTORE - Store into short array @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class SASTORE extends ArrayInstruction implements StackConsumer { public SASTORE() { - super(org.apache.commons.bcel6.Const.SASTORE); + super(org.apache.bcel.Const.SASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.util.ByteSequence; /** * SIPUSH - Push short @@ -43,7 +43,7 @@ public class SIPUSH extends Instruction public SIPUSH(final short b) { - super(org.apache.commons.bcel6.Const.SIPUSH, (short) 3); + super(org.apache.bcel.Const.SIPUSH, (short) 3); this.b = b; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * SWAP - Swa top operand stack word @@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic public class SWAP extends StackInstruction implements StackConsumer, StackProducer { public SWAP() { - super(org.apache.commons.bcel6.Const.SWAP); + super(org.apache.bcel.Const.SWAP); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWITCH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWITCH.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWITCH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWITCH.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * SWITCH - Branch depending on int value, generates either LOOKUPSWITCH or Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.util.ByteSequence; /** * Select - Abstract super class for LOOKUPSWITCH and TABLESWITCH instructions. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java Tue Jun 7 17:28:43 2016 @@ -15,18 +15,18 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -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; +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; /** * @since 6.0 Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackConsumer.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackConsumer.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackConsumer.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackConsumer.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denote an instruction that may consume a value from the stack. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Super class for stack operations like DUP and POP. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackProducer.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackProducer.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackProducer.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackProducer.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denote an instruction that may produce a value on top of the stack Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denotes an unparameterized instruction to store a value into a local variable, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java Tue Jun 7 17:28:43 2016 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.util.ByteSequence; +import org.apache.bcel.util.ByteSequence; /** * TABLESWITCH - Switch within given range of values, i.e., low..high @@ -45,7 +45,7 @@ public class TABLESWITCH extends Select * @param defaultTarget default branch */ public TABLESWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) { - super(org.apache.commons.bcel6.Const.TABLESWITCH, match, targets, defaultTarget); + super(org.apache.bcel.Const.TABLESWITCH, match, targets, defaultTarget); /* Alignment remainder assumed 0 here, until dump time */ final short _length = (short) (13 + getMatch_length() * 4); super.setLength(_length); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TargetLostException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TargetLostException.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TargetLostException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TargetLostException.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Thrown by InstructionList.remove() when one or multiple disposed instructions Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java Tue Jun 7 17:28:43 2016 @@ -15,14 +15,14 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; import java.util.ArrayList; import java.util.List; -import org.apache.commons.bcel6.Const; -import org.apache.commons.bcel6.classfile.ClassFormatException; -import org.apache.commons.bcel6.classfile.Utility; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.ClassFormatException; +import org.apache.bcel.classfile.Utility; /** * Abstract super class for all possible java types, namely basic types Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TypedInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TypedInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TypedInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TypedInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Get the type associated with an instruction, int for ILOAD, or the type Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/UnconditionalBranch.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/UnconditionalBranch.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/UnconditionalBranch.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/UnconditionalBranch.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denotes an instruction to perform an unconditional branch, i.e., GOTO, JSR. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/VariableLengthInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/VariableLengthInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/VariableLengthInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/VariableLengthInstruction.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Denotes an instruction to be a variable length instruction, such as Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.generic; +package org.apache.bcel.generic; /** * Interface implementing the Visitor pattern programming style. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java Tue Jun 7 17:28:43 2016 @@ -15,28 +15,28 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import org.apache.commons.bcel6.Const; -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; +import org.apache.bcel.Const; +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; /** * Convert found attributes into HTML file. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELComparator.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELComparator.java?rev=1747278&r1=1747277&r2=1747278&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELComparator.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELComparator.java Tue Jun 7 17:28:43 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6.util; +package org.apache.bcel.util; /** * Used for BCEL comparison strategy
