Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FRETURN.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FRETURN.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FRETURN.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FRETURN.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; /** * FRETURN - Return float from method @@ -32,7 +32,7 @@ public class FRETURN extends ReturnInstr /** Return float from method */ public FRETURN() { - super(org.apache.bcel.Constants.FRETURN); + super(org.apache.commons.bcel6.Constants.FRETURN); }
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSTORE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSTORE.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; /** * FSTORE - Store float into local variable @@ -34,7 +34,7 @@ public class FSTORE extends StoreInstruc * Instruction.readInstruction(). Not to be used otherwise. */ FSTORE() { - super(org.apache.bcel.Constants.FSTORE, org.apache.bcel.Constants.FSTORE_0); + super(org.apache.commons.bcel6.Constants.FSTORE, org.apache.commons.bcel6.Constants.FSTORE_0); } @@ -42,7 +42,7 @@ public class FSTORE extends StoreInstruc * @param n index of local variable */ public FSTORE(int n) { - super(org.apache.bcel.Constants.FSTORE, org.apache.bcel.Constants.FSTORE_0, n); + super(org.apache.commons.bcel6.Constants.FSTORE, org.apache.commons.bcel6.Constants.FSTORE_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSUB.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSUB.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSUB.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FSUB.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; /** * FSUB - Substract floats @@ -32,7 +32,7 @@ public class FSUB extends ArithmeticInst /** Substract floats */ public FSUB() { - super(org.apache.bcel.Constants.FSUB); + super(org.apache.commons.bcel6.Constants.FSUB); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java Sun Aug 9 21:21:10 2015 @@ -15,21 +15,22 @@ * 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.AnnotationEntry; -import org.apache.bcel.classfile.Annotations; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantObject; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.util.BCELComparator; + +import org.apache.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.Constant; +import org.apache.commons.bcel6.classfile.ConstantObject; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantValue; +import org.apache.commons.bcel6.classfile.Field; +import org.apache.commons.bcel6.classfile.Utility; +import org.apache.commons.bcel6.util.BCELComparator; /** * Template class for building up a field. The only extraordinary thing Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java Sun Aug 9 21:21:10 2015 @@ -15,14 +15,14 @@ * 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.AccessFlags; -import org.apache.bcel.classfile.Attribute; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.AccessFlags; +import org.apache.commons.bcel6.classfile.Attribute; /** * Super class for FieldGen and MethodGen objects, since they have Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.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.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantPool; /** * Super class for the GET/PUTxxx family of instructions. @@ -51,8 +51,8 @@ public abstract class FieldInstruction e */ @Override public String toString( ConstantPool cp ) { - return org.apache.bcel.Constants.OPCODE_NAMES[opcode] + " " - + cp.constantToString(index, org.apache.bcel.Constants.CONSTANT_Fieldref); + return org.apache.commons.bcel6.Constants.OPCODE_NAMES[opcode] + " " + + cp.constantToString(index, org.apache.commons.bcel6.Constants.CONSTANT_Fieldref); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldObserver.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldObserver.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldObserver.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldObserver.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; /** * Imnplement this interface if you're interested in changes to a FieldGen object Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.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; // We have removed Deprecated from getClassName() as we continue to use // it with our tools and want to remove warnings. (markro) @@ -87,7 +87,7 @@ public abstract class FieldOrMethod exte ConstantPool cp = cpg.getConstantPool(); ConstantCP cmr = (ConstantCP) cp.getConstant(index); String className = cp.getConstantString(cmr.getClassIndex(), - org.apache.bcel.Constants.CONSTANT_Class); + org.apache.commons.bcel6.Constants.CONSTANT_Class); if (className.startsWith("[")) { // Turn array classes into java.lang.Object. return "java.lang.Object"; @@ -119,7 +119,7 @@ public abstract class FieldOrMethod exte ConstantPool cp = cpg.getConstantPool(); ConstantCP cmr = (ConstantCP) cp.getConstant(index); String className = cp.getConstantString(cmr.getClassIndex(), - org.apache.bcel.Constants.CONSTANT_Class); + org.apache.commons.bcel6.Constants.CONSTANT_Class); if (className.startsWith("[")) { return (ArrayType) Type.getType(className); } else { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETFIELD.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; /** * GETFIELD - Fetch field from object Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GETSTATIC.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; /** * GETSTATIC - Fetch static field from class Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.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.io.DataOutputStream; import java.io.IOException; @@ -40,7 +40,7 @@ public class GOTO extends GotoInstructio public GOTO(InstructionHandle target) { - super(org.apache.bcel.Constants.GOTO, target); + super(org.apache.commons.bcel6.Constants.GOTO, target); } @@ -51,7 +51,7 @@ public class GOTO extends GotoInstructio @Override public void dump( DataOutputStream out ) throws IOException { index = getTargetOffset(); - if (opcode == org.apache.bcel.Constants.GOTO) { + if (opcode == org.apache.commons.bcel6.Constants.GOTO) { super.dump(out); } else { // GOTO_W index = getTargetOffset(); @@ -69,7 +69,7 @@ public class GOTO extends GotoInstructio int i = getTargetOffset(); // Depending on old position value position += offset; // Position may be shifted by preceding expansions if (Math.abs(i) >= (32767 - max_offset)) { // to large for short (estimate) - opcode = org.apache.bcel.Constants.GOTO_W; + opcode = org.apache.commons.bcel6.Constants.GOTO_W; short old_length = length; length = 5; return length - old_length; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.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; /** * GOTO_W - Branch always (to relative offset, not absolute address) @@ -41,7 +42,7 @@ public class GOTO_W extends GotoInstruct public GOTO_W(InstructionHandle target) { - super(org.apache.bcel.Constants.GOTO_W, target); + super(org.apache.commons.bcel6.Constants.GOTO_W, target); length = 5; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GotoInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GotoInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GotoInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GotoInstruction.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 GOTO Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2B.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2B.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2B.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2B.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; /** * I2B - Convert int to byte @@ -32,7 +32,7 @@ public class I2B extends ConversionInstr /** Convert int to byte */ public I2B() { - super(org.apache.bcel.Constants.I2B); + super(org.apache.commons.bcel6.Constants.I2B); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2C.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2C.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2C.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2C.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; /** * I2C - Convert int to char @@ -32,7 +32,7 @@ public class I2C extends ConversionInstr /** Convert int to char */ public I2C() { - super(org.apache.bcel.Constants.I2C); + super(org.apache.commons.bcel6.Constants.I2C); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2D.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2D.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2D.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2D.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; /** * I2D - Convert int to double @@ -32,7 +32,7 @@ public class I2D extends ConversionInstr /** Convert int to double */ public I2D() { - super(org.apache.bcel.Constants.I2D); + super(org.apache.commons.bcel6.Constants.I2D); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2F.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2F.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2F.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2F.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; /** * I2F - Convert int to float @@ -32,7 +32,7 @@ public class I2F extends ConversionInstr /** Convert int to float */ public I2F() { - super(org.apache.bcel.Constants.I2F); + super(org.apache.commons.bcel6.Constants.I2F); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2L.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2L.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2L.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2L.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; /** * I2L - Convert int to long @@ -32,7 +32,7 @@ public class I2L extends ConversionInstr /** Convert int to long */ public I2L() { - super(org.apache.bcel.Constants.I2L); + super(org.apache.commons.bcel6.Constants.I2L); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2S.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2S.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2S.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/I2S.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; /** * I2S - Convert int to short @@ -30,7 +30,7 @@ public class I2S extends ConversionInstr public I2S() { - super(org.apache.bcel.Constants.I2S); + super(org.apache.commons.bcel6.Constants.I2S); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IADD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IADD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IADD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IADD.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; /** * IADD - Add ints @@ -32,7 +32,7 @@ public class IADD extends ArithmeticInst /** Add ints */ public IADD() { - super(org.apache.bcel.Constants.IADD); + super(org.apache.commons.bcel6.Constants.IADD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IALOAD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IALOAD.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; /** * IALOAD - Load int from array @@ -33,7 +33,7 @@ public class IALOAD extends ArrayInstruc * Load int from array */ public IALOAD() { - super(org.apache.bcel.Constants.IALOAD); + super(org.apache.commons.bcel6.Constants.IALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IAND.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IAND.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IAND.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IAND.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; /** * IAND - Bitwise AND int @@ -30,7 +30,7 @@ public class IAND extends ArithmeticInst public IAND() { - super(org.apache.bcel.Constants.IAND); + super(org.apache.commons.bcel6.Constants.IAND); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IASTORE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IASTORE.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; /** * IASTORE - Store into int array @@ -33,7 +33,7 @@ public class IASTORE extends ArrayInstru * Store into int array */ public IASTORE() { - super(org.apache.bcel.Constants.IASTORE); + super(org.apache.commons.bcel6.Constants.IASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.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; /** * ICONST - Push value between -1, ..., 5, other values cause an exception @@ -40,9 +40,9 @@ public class ICONST extends Instruction public ICONST(int i) { - super(org.apache.bcel.Constants.ICONST_0, (short) 1); + super(org.apache.commons.bcel6.Constants.ICONST_0, (short) 1); if ((i >= -1) && (i <= 5)) { - opcode = (short) (org.apache.bcel.Constants.ICONST_0 + i); // Even works for i == -1 + opcode = (short) (org.apache.commons.bcel6.Constants.ICONST_0 + i); // Even works for i == -1 } else { throw new ClassGenException("ICONST can be used only for value between -1 and 5: " + i); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IDIV.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IDIV.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IDIV.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IDIV.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; /** * IDIV - Divide ints @@ -32,7 +32,7 @@ public class IDIV extends ArithmeticInst /** Divide ints */ public IDIV() { - super(org.apache.bcel.Constants.IDIV); + super(org.apache.commons.bcel6.Constants.IDIV); } @@ -40,7 +40,7 @@ public class IDIV extends ArithmeticInst */ 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/IFEQ.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFEQ.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFEQ.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFEQ.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; /** * IFEQ - Branch if int comparison with zero succeeds @@ -39,7 +39,7 @@ public class IFEQ extends IfInstruction public IFEQ(InstructionHandle target) { - super(org.apache.bcel.Constants.IFEQ, target); + super(org.apache.commons.bcel6.Constants.IFEQ, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.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; /** * IFGE - Branch if int comparison with zero succeeds @@ -39,7 +39,7 @@ public class IFGE extends IfInstruction public IFGE(InstructionHandle target) { - super(org.apache.bcel.Constants.IFGE, target); + super(org.apache.commons.bcel6.Constants.IFGE, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.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; /** * IFGT - Branch if int comparison with zero succeeds @@ -39,7 +39,7 @@ public class IFGT extends IfInstruction public IFGT(InstructionHandle target) { - super(org.apache.bcel.Constants.IFGT, target); + super(org.apache.commons.bcel6.Constants.IFGT, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.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; /** * IFLE - Branch if int comparison with zero succeeds @@ -39,7 +39,7 @@ public class IFLE extends IfInstruction public IFLE(InstructionHandle target) { - super(org.apache.bcel.Constants.IFLE, target); + super(org.apache.commons.bcel6.Constants.IFLE, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.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; /** * IFLT - Branch if int comparison with zero succeeds @@ -39,7 +39,7 @@ public class IFLT extends IfInstruction public IFLT(InstructionHandle target) { - super(org.apache.bcel.Constants.IFLT, target); + super(org.apache.commons.bcel6.Constants.IFLT, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.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; /** * IFNE - Branch if int comparison with zero succeeds @@ -39,7 +39,7 @@ public class IFNE extends IfInstruction public IFNE(InstructionHandle target) { - super(org.apache.bcel.Constants.IFNE, target); + super(org.apache.commons.bcel6.Constants.IFNE, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.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; /** * IFNONNULL - Branch if reference is not null @@ -39,7 +39,7 @@ public class IFNONNULL extends IfInstruc public IFNONNULL(InstructionHandle target) { - super(org.apache.bcel.Constants.IFNONNULL, target); + super(org.apache.commons.bcel6.Constants.IFNONNULL, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.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; /** * IFNULL - Branch if reference is not null @@ -39,7 +39,7 @@ public class IFNULL extends IfInstructio public IFNULL(InstructionHandle target) { - super(org.apache.bcel.Constants.IFNULL, target); + super(org.apache.commons.bcel6.Constants.IFNULL, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.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; /** * IF_ACMPEQ - Branch if reference comparison succeeds @@ -39,7 +39,7 @@ public class IF_ACMPEQ extends IfInstruc public IF_ACMPEQ(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ACMPEQ, target); + super(org.apache.commons.bcel6.Constants.IF_ACMPEQ, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.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; /** * IF_ACMPNE - Branch if reference comparison doesn't succeed @@ -39,7 +39,7 @@ public class IF_ACMPNE extends IfInstruc public IF_ACMPNE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ACMPNE, target); + super(org.apache.commons.bcel6.Constants.IF_ACMPNE, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.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; /** * IF_ICMPEQ - Branch if int comparison succeeds @@ -39,7 +39,7 @@ public class IF_ICMPEQ extends IfInstruc public IF_ICMPEQ(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPEQ, target); + super(org.apache.commons.bcel6.Constants.IF_ICMPEQ, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.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; /** * IF_ICMPGE - Branch if int comparison succeeds @@ -39,7 +39,7 @@ public class IF_ICMPGE extends IfInstruc public IF_ICMPGE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPGE, target); + super(org.apache.commons.bcel6.Constants.IF_ICMPGE, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.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; /** * IF_ICMPGT - Branch if int comparison succeeds @@ -39,7 +39,7 @@ public class IF_ICMPGT extends IfInstruc public IF_ICMPGT(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPGT, target); + super(org.apache.commons.bcel6.Constants.IF_ICMPGT, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.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; /** * IF_ICMPLE - Branch if int comparison succeeds @@ -39,7 +39,7 @@ public class IF_ICMPLE extends IfInstruc public IF_ICMPLE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPLE, target); + super(org.apache.commons.bcel6.Constants.IF_ICMPLE, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.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; /** * IF_ICMPLT - Branch if int comparison succeeds @@ -39,7 +39,7 @@ public class IF_ICMPLT extends IfInstruc public IF_ICMPLT(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPLT, target); + super(org.apache.commons.bcel6.Constants.IF_ICMPLT, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.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; /** * IF_ICMPNE - Branch if int comparison doesn't succeed @@ -39,7 +39,7 @@ public class IF_ICMPNE extends IfInstruc public IF_ICMPNE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPNE, target); + super(org.apache.commons.bcel6.Constants.IF_ICMPNE, target); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.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; /** * IINC - Increment local variable by constant @@ -48,7 +49,7 @@ public class IINC extends LocalVariableI */ public IINC(int n, int c) { super(); // Default behaviour of LocalVariableInstruction causes error - this.opcode = org.apache.bcel.Constants.IINC; + this.opcode = org.apache.commons.bcel6.Constants.IINC; this.length = (short) 3; setIndex(n); // May set wide as side effect setIncrement(c); @@ -62,7 +63,7 @@ public class IINC extends LocalVariableI @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) { @@ -76,7 +77,7 @@ public class IINC extends LocalVariableI private void setWide() { - wide = (n > org.apache.bcel.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE); + wide = (n > org.apache.commons.bcel6.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE); if (wide) { length = 6; // wide byte included } else { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ILOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ILOAD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ILOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ILOAD.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; /** * ILOAD - Load int from local variable onto stack @@ -34,7 +34,7 @@ public class ILOAD extends LoadInstructi * Instruction.readInstruction(). Not to be used otherwise. */ ILOAD() { - super(org.apache.bcel.Constants.ILOAD, org.apache.bcel.Constants.ILOAD_0); + super(org.apache.commons.bcel6.Constants.ILOAD, org.apache.commons.bcel6.Constants.ILOAD_0); } @@ -42,7 +42,7 @@ public class ILOAD extends LoadInstructi * @param n index of local variable */ public ILOAD(int n) { - super(org.apache.bcel.Constants.ILOAD, org.apache.bcel.Constants.ILOAD_0, n); + super(org.apache.commons.bcel6.Constants.ILOAD, org.apache.commons.bcel6.Constants.ILOAD_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP1.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP1.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP1.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP1.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; /** * IMPDEP1 - Implementation dependent @@ -29,7 +29,7 @@ public class IMPDEP1 extends Instruction public IMPDEP1() { - super(org.apache.bcel.Constants.IMPDEP1, (short) 1); + super(org.apache.commons.bcel6.Constants.IMPDEP1, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP2.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP2.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP2.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMPDEP2.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; /** * IMPDEP2 - Implementation dependent @@ -29,7 +29,7 @@ public class IMPDEP2 extends Instruction public IMPDEP2() { - super(org.apache.bcel.Constants.IMPDEP2, (short) 1); + super(org.apache.commons.bcel6.Constants.IMPDEP2, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMUL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMUL.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMUL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IMUL.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; /** * IMUL - Multiply ints @@ -32,7 +32,7 @@ public class IMUL extends ArithmeticInst /** Multiply ints */ public IMUL() { - super(org.apache.bcel.Constants.IMUL); + super(org.apache.commons.bcel6.Constants.IMUL); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INEG.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INEG.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INEG.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INEG.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; /** * INEG - Negate int @@ -30,7 +30,7 @@ public class INEG extends ArithmeticInst public INEG() { - super(org.apache.bcel.Constants.INEG); + super(org.apache.commons.bcel6.Constants.INEG); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INSTANCEOF.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; /** * INSTANCEOF - Determine if object is of given type @@ -39,12 +39,12 @@ public class INSTANCEOF extends CPInstru public INSTANCEOF(int index) { - super(org.apache.bcel.Constants.INSTANCEOF, index); + super(org.apache.commons.bcel6.Constants.INSTANCEOF, index); } public Class<?>[] getExceptions() { - return org.apache.bcel.ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION; + return org.apache.commons.bcel6.ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java Sun Aug 9 21:21:10 2015 @@ -15,15 +15,15 @@ * 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.ExceptionConstants; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.ExceptionConstants; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.util.ByteSequence; /** * Class for INVOKEDYNAMIC. Not an instance of InvokeInstruction, since that class Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java Sun Aug 9 21:21:10 2015 @@ -15,15 +15,15 @@ * 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.ExceptionConstants; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.ExceptionConstants; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.util.ByteSequence; /** * INVOKEINTERFACE - Invoke interface method Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESPECIAL.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; /** * INVOKESPECIAL - Invoke instance method; special handling for superclass, private Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKESTATIC.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; /** * INVOKESTATIC - Invoke a class (static) method Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEVIRTUAL.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; /** * INVOKEVIRTUAL - Invoke instance method; dispatch based on class Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IOR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IOR.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IOR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IOR.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; /** * IOR - Bitwise OR int @@ -30,7 +30,7 @@ public class IOR extends ArithmeticInstr public IOR() { - super(org.apache.bcel.Constants.IOR); + super(org.apache.commons.bcel6.Constants.IOR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IREM.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IREM.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IREM.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IREM.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; /** * IREM - Remainder of int @@ -32,7 +32,7 @@ public class IREM extends ArithmeticInst /** Remainder of ints */ public IREM() { - super(org.apache.bcel.Constants.IREM); + super(org.apache.commons.bcel6.Constants.IREM); } @@ -40,7 +40,7 @@ public class IREM extends ArithmeticInst */ 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/IRETURN.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IRETURN.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IRETURN.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IRETURN.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; /** * IRETURN - Return int from method @@ -32,7 +32,7 @@ public class IRETURN extends ReturnInstr /** Return int from method */ public IRETURN() { - super(org.apache.bcel.Constants.IRETURN); + super(org.apache.commons.bcel6.Constants.IRETURN); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHL.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHL.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; /** * ISHL - Arithmetic shift left int @@ -30,7 +30,7 @@ public class ISHL extends ArithmeticInst public ISHL() { - super(org.apache.bcel.Constants.ISHL); + super(org.apache.commons.bcel6.Constants.ISHL); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHR.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISHR.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; /** * ISHR - Arithmetic shift right int @@ -30,7 +30,7 @@ public class ISHR extends ArithmeticInst public ISHR() { - super(org.apache.bcel.Constants.ISHR); + super(org.apache.commons.bcel6.Constants.ISHR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISTORE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISTORE.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; /** * ISTORE - Store int from stack into local variable @@ -34,7 +34,7 @@ public class ISTORE extends StoreInstruc * Instruction.readInstruction(). Not to be used otherwise. */ ISTORE() { - super(org.apache.bcel.Constants.ISTORE, org.apache.bcel.Constants.ISTORE_0); + super(org.apache.commons.bcel6.Constants.ISTORE, org.apache.commons.bcel6.Constants.ISTORE_0); } @@ -42,7 +42,7 @@ public class ISTORE extends StoreInstruc * @param n index of local variable */ public ISTORE(int n) { - super(org.apache.bcel.Constants.ISTORE, org.apache.bcel.Constants.ISTORE_0, n); + super(org.apache.commons.bcel6.Constants.ISTORE, org.apache.commons.bcel6.Constants.ISTORE_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISUB.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISUB.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISUB.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ISUB.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; /** * ISUB - Substract ints @@ -32,7 +32,7 @@ public class ISUB extends ArithmeticInst /** Substract ints */ public ISUB() { - super(org.apache.bcel.Constants.ISUB); + super(org.apache.commons.bcel6.Constants.ISUB); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IUSHR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IUSHR.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IUSHR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IUSHR.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; /** * IUSHR - Logical shift right int @@ -30,7 +30,7 @@ public class IUSHR extends ArithmeticIns public IUSHR() { - super(org.apache.bcel.Constants.IUSHR); + super(org.apache.commons.bcel6.Constants.IUSHR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IXOR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IXOR.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IXOR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IXOR.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; /** * IXOR - Bitwise XOR int @@ -30,7 +30,7 @@ public class IXOR extends ArithmeticInst public IXOR() { - super(org.apache.bcel.Constants.IXOR); + super(org.apache.commons.bcel6.Constants.IXOR); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IfInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IfInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IfInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IfInstruction.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 the IFxxx family of instructions. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IndexedInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IndexedInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IndexedInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IndexedInstruction.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 refers to an index, e.g. local variable instructions, Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java Sun Aug 9 21:21:10 2015 @@ -15,15 +15,15 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.io.DataOutputStream; import java.io.IOException; import java.io.Serializable; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.util.ByteSequence; /** * Abstract super class for all Java byte codes. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.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; /** * Equality of instructions isn't clearly to be defined. You might Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionConstants.java 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; /** * This interface contains shareable instruction objects. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java 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; /** * Instances of this class may be used, e.g., to generate typed @@ -579,7 +579,7 @@ public class InstructionFactory implemen && (src == Constants.T_CHAR || src == Constants.T_BYTE || src == Constants.T_SHORT)) { src = Constants.T_INT; } - String name = "org.apache.bcel.generic." + short_names[src - Constants.T_CHAR] + "2" + String name = "org.apache.commons.bcel6.generic." + short_names[src - Constants.T_CHAR] + "2" + short_names[dest - Constants.T_CHAR]; Instruction i = null; try { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java Sun Aug 9 21:21:10 2015 @@ -15,14 +15,15 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.bcel.classfile.Utility; + +import org.apache.commons.bcel6.classfile.Utility; /** * Instances of this class give users a handle to the instructions contained in Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java 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.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -28,9 +28,9 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.util.ByteSequence; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.Constant; +import org.apache.commons.bcel6.util.ByteSequence; /** * This class is a container for a list of <a Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionListObserver.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionListObserver.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionListObserver.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionListObserver.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 an InstructionList object Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionTargeter.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionTargeter.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionTargeter.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionTargeter.java Sun Aug 9 21:21:10 2015 @@ -16,7 +16,7 @@ * */ -package org.apache.bcel.generic; +package org.apache.commons.bcel6.generic; /** * Denote that a class targets InstructionHandles within an InstructionList. Namely Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java 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.util.StringTokenizer; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantPool; + +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.Constant; +import org.apache.commons.bcel6.classfile.ConstantPool; /** * Super class for the INVOKExxx family of instructions. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java 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.io.DataOutputStream; import java.io.IOException; @@ -40,7 +40,7 @@ public class JSR extends JsrInstruction public JSR(InstructionHandle target) { - super(org.apache.bcel.Constants.JSR, target); + super(org.apache.commons.bcel6.Constants.JSR, target); } @@ -51,7 +51,7 @@ public class JSR extends JsrInstruction @Override public void dump( DataOutputStream out ) throws IOException { index = getTargetOffset(); - if (opcode == org.apache.bcel.Constants.JSR) { + if (opcode == org.apache.commons.bcel6.Constants.JSR) { super.dump(out); } else { // JSR_W index = getTargetOffset(); @@ -66,7 +66,7 @@ public class JSR extends JsrInstruction int i = getTargetOffset(); // Depending on old position value position += offset; // Position may be shifted by preceding expansions if (Math.abs(i) >= (32767 - max_offset)) { // to large for short (estimate) - opcode = org.apache.bcel.Constants.JSR_W; + opcode = org.apache.commons.bcel6.Constants.JSR_W; short old_length = length; length = 5; return length - old_length; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java 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; /** * JSR_W - Jump to subroutine @@ -41,7 +42,7 @@ public class JSR_W extends JsrInstructio public JSR_W(InstructionHandle target) { - super(org.apache.bcel.Constants.JSR_W, target); + super(org.apache.commons.bcel6.Constants.JSR_W, target); length = 5; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.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 JSR - Jump to subroutine Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2D.java 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; /** * L2D - Convert long to double @@ -30,7 +30,7 @@ public class L2D extends ConversionInstr public L2D() { - super(org.apache.bcel.Constants.L2D); + super(org.apache.commons.bcel6.Constants.L2D); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2F.java 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; /** * L2F - Convert long to float @@ -30,7 +30,7 @@ public class L2F extends ConversionInstr public L2F() { - super(org.apache.bcel.Constants.L2F); + super(org.apache.commons.bcel6.Constants.L2F); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/L2I.java 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; /** * L2I - Convert long to int @@ -30,7 +30,7 @@ public class L2I extends ConversionInstr public L2I() { - super(org.apache.bcel.Constants.L2I); + super(org.apache.commons.bcel6.Constants.L2I); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LADD.java 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; /** * LADD - Add longs @@ -31,7 +31,7 @@ public class LADD extends ArithmeticInst public LADD() { - super(org.apache.bcel.Constants.LADD); + super(org.apache.commons.bcel6.Constants.LADD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LALOAD.java 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; /** * LALOAD - Load long from array @@ -32,7 +32,7 @@ public class LALOAD extends ArrayInstruc /** Load long from array */ public LALOAD() { - super(org.apache.bcel.Constants.LALOAD); + super(org.apache.commons.bcel6.Constants.LALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LAND.java 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; /** * LAND - Bitwise AND longs @@ -31,7 +31,7 @@ public class LAND extends ArithmeticInst public LAND() { - super(org.apache.bcel.Constants.LAND); + super(org.apache.commons.bcel6.Constants.LAND); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LASTORE.java 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; /** * LASTORE - Store into long array @@ -32,7 +32,7 @@ public class LASTORE extends ArrayInstru /** Store long into array */ public LASTORE() { - super(org.apache.bcel.Constants.LASTORE); + super(org.apache.commons.bcel6.Constants.LASTORE); }
