You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2016/06/07 17:28:47 UTC
svn commit: r1747278 [3/6] - in /commons/proper/bcel/trunk: ./
src/main/java/org/apache/bcel/classfile/
src/main/java/org/apache/bcel/generic/ src/main/java/org/apache/bcel/util/
src/main/java/org/apache/bcel/verifier/ src/main/java/org/apache/bcel/ver...
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2D.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2D.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2D.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2D.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;
/**
* F2D - Convert float to double
@@ -28,7 +28,7 @@ public class F2D extends ConversionInstr
/** Convert float to double
*/
public F2D() {
- super(org.apache.commons.bcel6.Const.F2D);
+ super(org.apache.bcel.Const.F2D);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2I.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2I.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2I.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2I.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;
/**
* F2I - Convert float to int
@@ -28,7 +28,7 @@ public class F2I extends ConversionInstr
/** Convert float to int
*/
public F2I() {
- super(org.apache.commons.bcel6.Const.F2I);
+ super(org.apache.bcel.Const.F2I);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2L.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2L.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2L.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/F2L.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;
/**
* F2L - Convert float to long
@@ -28,7 +28,7 @@ public class F2L extends ConversionInstr
/** Convert float to long
*/
public F2L() {
- super(org.apache.commons.bcel6.Const.F2L);
+ super(org.apache.bcel.Const.F2L);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FADD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FADD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FADD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FADD.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;
/**
* FADD - Add floats
@@ -28,7 +28,7 @@ public class FADD extends ArithmeticInst
/** Add floats
*/
public FADD() {
- super(org.apache.commons.bcel6.Const.FADD);
+ super(org.apache.bcel.Const.FADD);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FALOAD.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;
/**
* FALOAD - Load float from array
@@ -28,7 +28,7 @@ public class FALOAD extends ArrayInstruc
/** Load float from array
*/
public FALOAD() {
- super(org.apache.commons.bcel6.Const.FALOAD);
+ super(org.apache.bcel.Const.FALOAD);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FASTORE.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;
/**
* FASTORE - Store into float array
@@ -28,7 +28,7 @@ public class FASTORE extends ArrayInstru
/** Store float into array
*/
public FASTORE() {
- super(org.apache.commons.bcel6.Const.FASTORE);
+ super(org.apache.bcel.Const.FASTORE);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPG.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPG.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPG.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPG.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;
/**
* FCMPG - Compare floats: value1 > value2
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class FCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
public FCMPG() {
- super(org.apache.commons.bcel6.Const.FCMPG, (short) 1);
+ super(org.apache.bcel.Const.FCMPG, (short) 1);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCMPL.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;
/**
* FCMPL - Compare floats: value1 < value2
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class FCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
public FCMPL() {
- super(org.apache.commons.bcel6.Const.FCMPL, (short) 1);
+ super(org.apache.bcel.Const.FCMPL, (short) 1);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCONST.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCONST.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCONST.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FCONST.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;
/**
* FCONST - Push 0.0, 1.0 or 2.0, other values cause an exception
@@ -38,13 +38,13 @@ public class FCONST extends Instruction
public FCONST(final float f) {
- super(org.apache.commons.bcel6.Const.FCONST_0, (short) 1);
+ super(org.apache.bcel.Const.FCONST_0, (short) 1);
if (f == 0.0) {
- super.setOpcode(org.apache.commons.bcel6.Const.FCONST_0);
+ super.setOpcode(org.apache.bcel.Const.FCONST_0);
} else if (f == 1.0) {
- super.setOpcode(org.apache.commons.bcel6.Const.FCONST_1);
+ super.setOpcode(org.apache.bcel.Const.FCONST_1);
} else if (f == 2.0) {
- super.setOpcode(org.apache.commons.bcel6.Const.FCONST_2);
+ super.setOpcode(org.apache.bcel.Const.FCONST_2);
} else {
throw new ClassGenException("FCONST can be used only for 0.0, 1.0 and 2.0: " + f);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FDIV.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FDIV.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FDIV.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FDIV.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;
/**
* FDIV - Divide floats
@@ -28,7 +28,7 @@ public class FDIV extends ArithmeticInst
/** Divide floats
*/
public FDIV() {
- super(org.apache.commons.bcel6.Const.FDIV);
+ super(org.apache.bcel.Const.FDIV);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FLOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FLOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FLOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FLOAD.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;
/**
* FLOAD - Load float from local variable
@@ -30,7 +30,7 @@ public class FLOAD extends LoadInstructi
* Instruction.readInstruction(). Not to be used otherwise.
*/
FLOAD() {
- super(org.apache.commons.bcel6.Const.FLOAD, org.apache.commons.bcel6.Const.FLOAD_0);
+ super(org.apache.bcel.Const.FLOAD, org.apache.bcel.Const.FLOAD_0);
}
@@ -38,7 +38,7 @@ public class FLOAD extends LoadInstructi
* @param n index of local variable
*/
public FLOAD(final int n) {
- super(org.apache.commons.bcel6.Const.FLOAD, org.apache.commons.bcel6.Const.FLOAD_0, n);
+ super(org.apache.bcel.Const.FLOAD, org.apache.bcel.Const.FLOAD_0, n);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FMUL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FMUL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FMUL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FMUL.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;
/**
* FMUL - Multiply floats
@@ -28,7 +28,7 @@ public class FMUL extends ArithmeticInst
/** Multiply floats
*/
public FMUL() {
- super(org.apache.commons.bcel6.Const.FMUL);
+ super(org.apache.bcel.Const.FMUL);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FNEG.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FNEG.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FNEG.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FNEG.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;
/**
* FNEG - Negate float
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class FNEG extends ArithmeticInstruction {
public FNEG() {
- super(org.apache.commons.bcel6.Const.FNEG);
+ super(org.apache.bcel.Const.FNEG);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FREM.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FREM.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FREM.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FREM.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;
/**
* FREM - Remainder of floats
@@ -28,7 +28,7 @@ public class FREM extends ArithmeticInst
/** Remainder of floats
*/
public FREM() {
- super(org.apache.commons.bcel6.Const.FREM);
+ super(org.apache.bcel.Const.FREM);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FRETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FRETURN.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FRETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FRETURN.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;
/**
* FRETURN - Return float from method
@@ -28,7 +28,7 @@ public class FRETURN extends ReturnInstr
/** Return float from method
*/
public FRETURN() {
- super(org.apache.commons.bcel6.Const.FRETURN);
+ super(org.apache.bcel.Const.FRETURN);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSTORE.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;
/**
* FSTORE - Store float into local variable
@@ -30,7 +30,7 @@ public class FSTORE extends StoreInstruc
* Instruction.readInstruction(). Not to be used otherwise.
*/
FSTORE() {
- super(org.apache.commons.bcel6.Const.FSTORE, org.apache.commons.bcel6.Const.FSTORE_0);
+ super(org.apache.bcel.Const.FSTORE, org.apache.bcel.Const.FSTORE_0);
}
@@ -38,7 +38,7 @@ public class FSTORE extends StoreInstruc
* @param n index of local variable
*/
public FSTORE(final int n) {
- super(org.apache.commons.bcel6.Const.FSTORE, org.apache.commons.bcel6.Const.FSTORE_0, n);
+ super(org.apache.bcel.Const.FSTORE, org.apache.bcel.Const.FSTORE_0, n);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSUB.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSUB.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSUB.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FSUB.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;
/**
* FSUB - Substract floats
@@ -28,7 +28,7 @@ public class FSUB extends ArithmeticInst
/** Substract floats
*/
public FSUB() {
- super(org.apache.commons.bcel6.Const.FSUB);
+ super(org.apache.bcel.Const.FSUB);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java Tue Jun 7 17:28:43 2016
@@ -15,22 +15,22 @@
* 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.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;
+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.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;
/**
* Template class for building up a field. The only extraordinary thing
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGenOrMethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGenOrMethodGen.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGenOrMethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGenOrMethodGen.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.AccessFlags;
-import org.apache.commons.bcel6.classfile.Attribute;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.AccessFlags;
+import org.apache.bcel.classfile.Attribute;
/**
* Super class for FieldGen and MethodGen objects, since they have
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldInstruction.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.ConstantPool;
+import org.apache.bcel.classfile.ConstantPool;
/**
* Super class for the GET/PUTxxx family of instructions.
@@ -47,8 +47,8 @@ public abstract class FieldInstruction e
*/
@Override
public String toString( final ConstantPool cp ) {
- return org.apache.commons.bcel6.Const.getOpcodeName(super.getOpcode()) + " "
- + cp.constantToString(super.getIndex(), org.apache.commons.bcel6.Const.CONSTANT_Fieldref);
+ return org.apache.bcel.Const.getOpcodeName(super.getOpcode()) + " "
+ + cp.constantToString(super.getIndex(), org.apache.bcel.Const.CONSTANT_Fieldref);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldObserver.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldObserver.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldObserver.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldObserver.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;
/**
* Imnplement this interface if you're interested in changes to a FieldGen object
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.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 org.apache.commons.bcel6.Const;
-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.Const;
+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 InvokeInstruction and FieldInstruction, since they have
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.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;
/**
* GETFIELD - Fetch field from object
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.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;
/**
* GETSTATIC - Fetch static field from class
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO.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 GOTO extends GotoInstructio
public GOTO(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.GOTO, target);
+ super(org.apache.bcel.Const.GOTO, target);
}
@@ -48,7 +48,7 @@ public class GOTO extends GotoInstructio
public void dump( final DataOutputStream out ) throws IOException {
super.setIndex(getTargetOffset());
final short _opcode = getOpcode();
- if (_opcode == org.apache.commons.bcel6.Const.GOTO) {
+ if (_opcode == org.apache.bcel.Const.GOTO) {
super.dump(out);
} else { // GOTO_W
super.setIndex(getTargetOffset());
@@ -71,7 +71,7 @@ public class GOTO extends GotoInstructio
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.GOTO_W);
+ super.setOpcode(org.apache.bcel.Const.GOTO_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/GOTO_W.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO_W.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO_W.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO_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;
/**
* GOTO_W - Branch always (to relative offset, not absolute address)
@@ -38,7 +38,7 @@ public class GOTO_W extends GotoInstruct
public GOTO_W(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.GOTO_W, target);
+ super(org.apache.bcel.Const.GOTO_W, target);
super.setLength(5);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GotoInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GotoInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GotoInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GotoInstruction.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 GOTO
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2B.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2B.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2B.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2B.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;
/**
* I2B - Convert int to byte
@@ -28,7 +28,7 @@ public class I2B extends ConversionInstr
/** Convert int to byte
*/
public I2B() {
- super(org.apache.commons.bcel6.Const.I2B);
+ super(org.apache.bcel.Const.I2B);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2C.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2C.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2C.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2C.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;
/**
* I2C - Convert int to char
@@ -28,7 +28,7 @@ public class I2C extends ConversionInstr
/** Convert int to char
*/
public I2C() {
- super(org.apache.commons.bcel6.Const.I2C);
+ super(org.apache.bcel.Const.I2C);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2D.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2D.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2D.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2D.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;
/**
* I2D - Convert int to double
@@ -28,7 +28,7 @@ public class I2D extends ConversionInstr
/** Convert int to double
*/
public I2D() {
- super(org.apache.commons.bcel6.Const.I2D);
+ super(org.apache.bcel.Const.I2D);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2F.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2F.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2F.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2F.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;
/**
* I2F - Convert int to float
@@ -28,7 +28,7 @@ public class I2F extends ConversionInstr
/** Convert int to float
*/
public I2F() {
- super(org.apache.commons.bcel6.Const.I2F);
+ super(org.apache.bcel.Const.I2F);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2L.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2L.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2L.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2L.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;
/**
* I2L - Convert int to long
@@ -28,7 +28,7 @@ public class I2L extends ConversionInstr
/** Convert int to long
*/
public I2L() {
- super(org.apache.commons.bcel6.Const.I2L);
+ super(org.apache.bcel.Const.I2L);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2S.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2S.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2S.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/I2S.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;
/**
* I2S - Convert int to short
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class I2S extends ConversionInstruction {
public I2S() {
- super(org.apache.commons.bcel6.Const.I2S);
+ super(org.apache.bcel.Const.I2S);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IADD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IADD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IADD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IADD.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;
/**
* IADD - Add ints
@@ -28,7 +28,7 @@ public class IADD extends ArithmeticInst
/** Add ints
*/
public IADD() {
- super(org.apache.commons.bcel6.Const.IADD);
+ super(org.apache.bcel.Const.IADD);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IALOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IALOAD.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;
/**
* IALOAD - Load int from array
@@ -29,7 +29,7 @@ public class IALOAD extends ArrayInstruc
* Load int from array
*/
public IALOAD() {
- super(org.apache.commons.bcel6.Const.IALOAD);
+ super(org.apache.bcel.Const.IALOAD);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IAND.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IAND.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IAND.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IAND.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;
/**
* IAND - Bitwise AND int
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class IAND extends ArithmeticInstruction {
public IAND() {
- super(org.apache.commons.bcel6.Const.IAND);
+ super(org.apache.bcel.Const.IAND);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IASTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IASTORE.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;
/**
* IASTORE - Store into int array
@@ -29,7 +29,7 @@ public class IASTORE extends ArrayInstru
* Store into int array
*/
public IASTORE() {
- super(org.apache.commons.bcel6.Const.IASTORE);
+ super(org.apache.bcel.Const.IASTORE);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ICONST.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ICONST.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ICONST.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ICONST.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;
/**
* ICONST - Push value between -1, ..., 5, other values cause an exception
@@ -38,9 +38,9 @@ public class ICONST extends Instruction
public ICONST(final int i) {
- super(org.apache.commons.bcel6.Const.ICONST_0, (short) 1);
+ super(org.apache.bcel.Const.ICONST_0, (short) 1);
if ((i >= -1) && (i <= 5)) {
- super.setOpcode((short) (org.apache.commons.bcel6.Const.ICONST_0 + i)); // Even works for i == -1
+ super.setOpcode((short) (org.apache.bcel.Const.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/bcel/generic/IDIV.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IDIV.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IDIV.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IDIV.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;
/**
* IDIV - Divide ints
@@ -30,7 +30,7 @@ public class IDIV extends ArithmeticInst
/** Divide ints
*/
public IDIV() {
- super(org.apache.commons.bcel6.Const.IDIV);
+ super(org.apache.bcel.Const.IDIV);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFEQ.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFEQ.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFEQ.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFEQ.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;
/**
* IFEQ - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@ public class IFEQ extends IfInstruction
public IFEQ(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFEQ, target);
+ super(org.apache.bcel.Const.IFEQ, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGE.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;
/**
* IFGE - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@ public class IFGE extends IfInstruction
public IFGE(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFGE, target);
+ super(org.apache.bcel.Const.IFGE, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGT.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFGT.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;
/**
* IFGT - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@ public class IFGT extends IfInstruction
public IFGT(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFGT, target);
+ super(org.apache.bcel.Const.IFGT, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLE.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;
/**
* IFLE - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@ public class IFLE extends IfInstruction
public IFLE(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFLE, target);
+ super(org.apache.bcel.Const.IFLE, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLT.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFLT.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;
/**
* IFLT - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@ public class IFLT extends IfInstruction
public IFLT(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFLT, target);
+ super(org.apache.bcel.Const.IFLT, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNE.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;
/**
* IFNE - Branch if int comparison with zero succeeds
@@ -35,7 +35,7 @@ public class IFNE extends IfInstruction
public IFNE(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFNE, target);
+ super(org.apache.bcel.Const.IFNE, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNONNULL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNONNULL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNONNULL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNONNULL.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;
/**
* IFNONNULL - Branch if reference is not null
@@ -35,7 +35,7 @@ public class IFNONNULL extends IfInstruc
public IFNONNULL(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFNONNULL, target);
+ super(org.apache.bcel.Const.IFNONNULL, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNULL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNULL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNULL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IFNULL.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;
/**
* IFNULL - Branch if reference is not null
@@ -35,7 +35,7 @@ public class IFNULL extends IfInstructio
public IFNULL(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IFNULL, target);
+ super(org.apache.bcel.Const.IFNULL, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPEQ.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPEQ.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPEQ.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPEQ.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;
/**
* IF_ACMPEQ - Branch if reference comparison succeeds
@@ -35,7 +35,7 @@ public class IF_ACMPEQ extends IfInstruc
public IF_ACMPEQ(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ACMPEQ, target);
+ super(org.apache.bcel.Const.IF_ACMPEQ, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPNE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPNE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPNE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ACMPNE.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;
/**
* IF_ACMPNE - Branch if reference comparison doesn't succeed
@@ -35,7 +35,7 @@ public class IF_ACMPNE extends IfInstruc
public IF_ACMPNE(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ACMPNE, target);
+ super(org.apache.bcel.Const.IF_ACMPNE, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.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;
/**
* IF_ICMPEQ - Branch if int comparison succeeds
@@ -35,7 +35,7 @@ public class IF_ICMPEQ extends IfInstruc
public IF_ICMPEQ(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ICMPEQ, target);
+ super(org.apache.bcel.Const.IF_ICMPEQ, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.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;
/**
* IF_ICMPGE - Branch if int comparison succeeds
@@ -35,7 +35,7 @@ public class IF_ICMPGE extends IfInstruc
public IF_ICMPGE(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ICMPGE, target);
+ super(org.apache.bcel.Const.IF_ICMPGE, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.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;
/**
* IF_ICMPGT - Branch if int comparison succeeds
@@ -35,7 +35,7 @@ public class IF_ICMPGT extends IfInstruc
public IF_ICMPGT(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ICMPGT, target);
+ super(org.apache.bcel.Const.IF_ICMPGT, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.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;
/**
* IF_ICMPLE - Branch if int comparison succeeds
@@ -35,7 +35,7 @@ public class IF_ICMPLE extends IfInstruc
public IF_ICMPLE(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ICMPLE, target);
+ super(org.apache.bcel.Const.IF_ICMPLE, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.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;
/**
* IF_ICMPLT - Branch if int comparison succeeds
@@ -35,7 +35,7 @@ public class IF_ICMPLT extends IfInstruc
public IF_ICMPLT(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ICMPLT, target);
+ super(org.apache.bcel.Const.IF_ICMPLT, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.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;
/**
* IF_ICMPNE - Branch if int comparison doesn't succeed
@@ -35,7 +35,7 @@ public class IF_ICMPNE extends IfInstruc
public IF_ICMPNE(final InstructionHandle target) {
- super(org.apache.commons.bcel6.Const.IF_ICMPNE, target);
+ super(org.apache.bcel.Const.IF_ICMPNE, target);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.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;
/**
* IINC - Increment local variable by constant
@@ -47,7 +47,7 @@ public class IINC extends LocalVariableI
*/
public IINC(final int n, final int c) {
super(); // Default behaviour of LocalVariableInstruction causes error
- super.setOpcode(org.apache.commons.bcel6.Const.IINC);
+ super.setOpcode(org.apache.bcel.Const.IINC);
super.setLength((short) 3);
setIndex(n); // May set wide as side effect
setIncrement(c);
@@ -61,7 +61,7 @@ public class IINC extends LocalVariableI
@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) {
@@ -75,7 +75,7 @@ public class IINC extends LocalVariableI
private void setWide() {
- wide = (super.getIndex() > org.apache.commons.bcel6.Const.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE);
+ wide = (super.getIndex() > org.apache.bcel.Const.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE);
if (wide) {
super.setLength(6); // wide byte included
} else {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.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;
/**
* ILOAD - Load int from local variable onto stack
@@ -30,7 +30,7 @@ public class ILOAD extends LoadInstructi
* Instruction.readInstruction(). Not to be used otherwise.
*/
ILOAD() {
- super(org.apache.commons.bcel6.Const.ILOAD, org.apache.commons.bcel6.Const.ILOAD_0);
+ super(org.apache.bcel.Const.ILOAD, org.apache.bcel.Const.ILOAD_0);
}
@@ -38,7 +38,7 @@ public class ILOAD extends LoadInstructi
* @param n index of local variable
*/
public ILOAD(final int n) {
- super(org.apache.commons.bcel6.Const.ILOAD, org.apache.commons.bcel6.Const.ILOAD_0, n);
+ super(org.apache.bcel.Const.ILOAD, org.apache.bcel.Const.ILOAD_0, n);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.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;
/**
* IMPDEP1 - Implementation dependent
@@ -25,7 +25,7 @@ package org.apache.commons.bcel6.generic
public class IMPDEP1 extends Instruction {
public IMPDEP1() {
- super(org.apache.commons.bcel6.Const.IMPDEP1, (short) 1);
+ super(org.apache.bcel.Const.IMPDEP1, (short) 1);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.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;
/**
* IMPDEP2 - Implementation dependent
@@ -25,7 +25,7 @@ package org.apache.commons.bcel6.generic
public class IMPDEP2 extends Instruction {
public IMPDEP2() {
- super(org.apache.commons.bcel6.Const.IMPDEP2, (short) 1);
+ super(org.apache.bcel.Const.IMPDEP2, (short) 1);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.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;
/**
* IMUL - Multiply ints
@@ -28,7 +28,7 @@ public class IMUL extends ArithmeticInst
/** Multiply ints
*/
public IMUL() {
- super(org.apache.commons.bcel6.Const.IMUL);
+ super(org.apache.bcel.Const.IMUL);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.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;
/**
* INEG - Negate int
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class INEG extends ArithmeticInstruction {
public INEG() {
- super(org.apache.commons.bcel6.Const.INEG);
+ super(org.apache.bcel.Const.INEG);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.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;
/**
* INSTANCEOF - Determine if object is of given type
@@ -37,7 +37,7 @@ public class INSTANCEOF extends CPInstru
public INSTANCEOF(final int index) {
- super(org.apache.commons.bcel6.Const.INSTANCEOF, index);
+ super(org.apache.bcel.Const.INSTANCEOF, index);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java Tue Jun 7 17:28:43 2016
@@ -15,17 +15,17 @@
* 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.ExceptionConst;
-import org.apache.commons.bcel6.classfile.ConstantInvokeDynamic;
-import org.apache.commons.bcel6.classfile.ConstantNameAndType;
-import org.apache.commons.bcel6.classfile.ConstantPool;
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.Const;
+import org.apache.bcel.ExceptionConst;
+import org.apache.bcel.classfile.ConstantInvokeDynamic;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.util.ByteSequence;
/**
* Class for INVOKEDYNAMIC. Not an instance of InvokeInstruction, since that class
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java Tue Jun 7 17:28:43 2016
@@ -15,15 +15,15 @@
* 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.ExceptionConst;
-import org.apache.commons.bcel6.classfile.ConstantPool;
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.Const;
+import org.apache.bcel.ExceptionConst;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.util.ByteSequence;
/**
* INVOKEINTERFACE - Invoke interface method
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.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.ExceptionConst;
+import org.apache.bcel.Const;
+import org.apache.bcel.ExceptionConst;
/**
* INVOKESPECIAL - Invoke instance method; special handling for superclass, private
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.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.ExceptionConst;
+import org.apache.bcel.Const;
+import org.apache.bcel.ExceptionConst;
/**
* INVOKESTATIC - Invoke a class (static) method
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.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.ExceptionConst;
+import org.apache.bcel.Const;
+import org.apache.bcel.ExceptionConst;
/**
* INVOKEVIRTUAL - Invoke instance method; dispatch based on class
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.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;
/**
* IOR - Bitwise OR int
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class IOR extends ArithmeticInstruction {
public IOR() {
- super(org.apache.commons.bcel6.Const.IOR);
+ super(org.apache.bcel.Const.IOR);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.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;
/**
* IREM - Remainder of int
@@ -30,7 +30,7 @@ public class IREM extends ArithmeticInst
/** Remainder of ints
*/
public IREM() {
- super(org.apache.commons.bcel6.Const.IREM);
+ super(org.apache.bcel.Const.IREM);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.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;
/**
* IRETURN - Return int from method
@@ -28,7 +28,7 @@ public class IRETURN extends ReturnInstr
/** Return int from method
*/
public IRETURN() {
- super(org.apache.commons.bcel6.Const.IRETURN);
+ super(org.apache.bcel.Const.IRETURN);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.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;
/**
* ISHL - Arithmetic shift left int
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class ISHL extends ArithmeticInstruction {
public ISHL() {
- super(org.apache.commons.bcel6.Const.ISHL);
+ super(org.apache.bcel.Const.ISHL);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.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;
/**
* ISHR - Arithmetic shift right int
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class ISHR extends ArithmeticInstruction {
public ISHR() {
- super(org.apache.commons.bcel6.Const.ISHR);
+ super(org.apache.bcel.Const.ISHR);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.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;
/**
* ISTORE - Store int from stack into local variable
@@ -30,7 +30,7 @@ public class ISTORE extends StoreInstruc
* Instruction.readInstruction(). Not to be used otherwise.
*/
ISTORE() {
- super(org.apache.commons.bcel6.Const.ISTORE, org.apache.commons.bcel6.Const.ISTORE_0);
+ super(org.apache.bcel.Const.ISTORE, org.apache.bcel.Const.ISTORE_0);
}
@@ -38,7 +38,7 @@ public class ISTORE extends StoreInstruc
* @param n index of local variable
*/
public ISTORE(final int n) {
- super(org.apache.commons.bcel6.Const.ISTORE, org.apache.commons.bcel6.Const.ISTORE_0, n);
+ super(org.apache.bcel.Const.ISTORE, org.apache.bcel.Const.ISTORE_0, n);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.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;
/**
* ISUB - Substract ints
@@ -28,7 +28,7 @@ public class ISUB extends ArithmeticInst
/** Substract ints
*/
public ISUB() {
- super(org.apache.commons.bcel6.Const.ISUB);
+ super(org.apache.bcel.Const.ISUB);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.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;
/**
* IUSHR - Logical shift right int
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class IUSHR extends ArithmeticInstruction {
public IUSHR() {
- super(org.apache.commons.bcel6.Const.IUSHR);
+ super(org.apache.bcel.Const.IUSHR);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.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;
/**
* IXOR - Bitwise XOR int
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class IXOR extends ArithmeticInstruction {
public IXOR() {
- super(org.apache.commons.bcel6.Const.IXOR);
+ super(org.apache.bcel.Const.IXOR);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IfInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IfInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IfInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IfInstruction.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 the IFxxx family of instructions.
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IndexedInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IndexedInstruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IndexedInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IndexedInstruction.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 refers to an index, e.g. local variable instructions,
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.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.Const;
-import org.apache.commons.bcel6.classfile.ConstantPool;
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.util.ByteSequence;
/**
* Abstract super class for all Java byte codes.
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.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;
/**
* Equality of instructions isn't clearly to be defined. You might
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConst.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConst.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConst.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConst.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;
/**
* This interface contains shareable instruction objects.
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionConstants.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;
/**
* This interface contains shareable instruction objects.
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.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;
/**
* Instances of this class may be used, e.g., to generate typed
@@ -592,7 +592,7 @@ public class InstructionFactory {
&& (src == Const.T_CHAR || src == Const.T_BYTE || src == Const.T_SHORT)) {
src = Const.T_INT;
}
- String name = "org.apache.commons.bcel6.generic." + short_names[src - Const.T_CHAR] + "2"
+ String name = "org.apache.bcel.generic." + short_names[src - Const.T_CHAR] + "2"
+ short_names[dest - Const.T_CHAR];
Instruction i = null;
try {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.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.Collection;
import java.util.HashMap;
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.bcel6.classfile.Utility;
+import org.apache.bcel.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/bcel/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.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.ByteArrayOutputStream;
import java.io.DataOutputStream;
@@ -27,9 +27,9 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import org.apache.commons.bcel6.Const;
-import org.apache.commons.bcel6.classfile.Constant;
-import org.apache.commons.bcel6.util.ByteSequence;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.Constant;
+import org.apache.bcel.util.ByteSequence;
/**
* This class is a container for a list of <a href="Instruction.html">Instruction</a> objects. Instructions can be appended, inserted, moved, deleted, etc..
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionListObserver.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionListObserver.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionListObserver.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionListObserver.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 an InstructionList object
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionTargeter.java?rev=1747278&r1=1747277&r2=1747278&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionTargeter.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionTargeter.java Tue Jun 7 17:28:43 2016
@@ -16,7 +16,7 @@
*
*/
-package org.apache.commons.bcel6.generic;
+package org.apache.bcel.generic;
/**
* Denote that a class targets InstructionHandles within an InstructionList. Namely