You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/09/11 02:30:22 UTC
svn commit: r1702355 [7/8] - in /commons/proper/bcel/trunk: ./
src/main/java/org/apache/commons/bcel6/
src/main/java/org/apache/commons/bcel6/classfile/
src/main/java/org/apache/commons/bcel6/generic/
src/main/java/org/apache/commons/bcel6/util/ src/ma...
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LUSHR.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class LUSHR extends ArithmeticInstruction {
public LUSHR() {
- super(org.apache.commons.bcel6.Constants.LUSHR);
+ super(org.apache.commons.bcel6.Const.LUSHR);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LXOR.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class LXOR extends ArithmeticInstruction {
public LXOR() {
- super(org.apache.commons.bcel6.Constants.LXOR);
+ super(org.apache.commons.bcel6.Const.LXOR);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.LocalVariable;
/**
@@ -51,7 +51,7 @@ public class LocalVariableGen implements
*/
public LocalVariableGen(int index, String name, Type type, InstructionHandle start,
InstructionHandle end) {
- if ((index < 0) || (index > Constants.MAX_SHORT)) {
+ if ((index < 0) || (index > Const.MAX_SHORT)) {
throw new ClassGenException("Invalid index index: " + index);
}
this.name = name;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java Fri Sep 11 00:30:19 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.generic
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.util.ByteSequence;
/**
@@ -42,7 +42,7 @@ public abstract class LocalVariableInstr
private boolean wide() {
- return n > Constants.MAX_BYTE;
+ return n > Const.MAX_BYTE;
}
@@ -86,7 +86,7 @@ public abstract class LocalVariableInstr
@Override
public void dump( DataOutputStream out ) throws IOException {
if (wide()) {
- out.writeByte(Constants.WIDE);
+ out.writeByte(Const.WIDE);
}
out.writeByte(super.getOpcode());
if (super.getLength() > 1) { // Otherwise ILOAD_n, instruction, e.g.
@@ -111,8 +111,8 @@ public abstract class LocalVariableInstr
@Override
public String toString( boolean verbose ) {
final short _opcode = super.getOpcode();
- if (((_opcode >= Constants.ILOAD_0) && (_opcode <= Constants.ALOAD_3))
- || ((_opcode >= Constants.ISTORE_0) && (_opcode <= Constants.ASTORE_3))) {
+ if (((_opcode >= Const.ILOAD_0) && (_opcode <= Const.ALOAD_3))
+ || ((_opcode >= Const.ISTORE_0) && (_opcode <= Const.ASTORE_3))) {
return super.toString(verbose);
}
return super.toString(verbose) + " " + n;
@@ -132,15 +132,15 @@ public abstract class LocalVariableInstr
super.setLength(4);
} else {
final short _opcode = super.getOpcode();
- if (((_opcode >= Constants.ILOAD) && (_opcode <= Constants.ALOAD))
- || ((_opcode >= Constants.ISTORE) && (_opcode <= Constants.ASTORE))) {
+ if (((_opcode >= Const.ILOAD) && (_opcode <= Const.ALOAD))
+ || ((_opcode >= Const.ISTORE) && (_opcode <= Const.ASTORE))) {
n = bytes.readUnsignedByte();
super.setLength(2);
- } else if (_opcode <= Constants.ALOAD_3) { // compact load instruction such as ILOAD_2
- n = (_opcode - Constants.ILOAD_0) % 4;
+ } else if (_opcode <= Const.ALOAD_3) { // compact load instruction such as ILOAD_2
+ n = (_opcode - Const.ILOAD_0) % 4;
super.setLength(1);
} else { // Assert ISTORE_0 <= tag <= ASTORE_3
- n = (_opcode - Constants.ISTORE_0) % 4;
+ n = (_opcode - Const.ISTORE_0) % 4;
super.setLength(1);
}
}
@@ -164,7 +164,7 @@ public abstract class LocalVariableInstr
*/
@Override
public void setIndex( int n ) { // TODO could be package-protected?
- if ((n < 0) || (n > Constants.MAX_SHORT)) {
+ if ((n < 0) || (n > Const.MAX_SHORT)) {
throw new ClassGenException("Illegal value: " + n);
}
this.n = n;
@@ -201,20 +201,20 @@ public abstract class LocalVariableInstr
@Override
public Type getType( ConstantPoolGen cp ) {
switch (canon_tag) {
- case Constants.ILOAD:
- case Constants.ISTORE:
+ case Const.ILOAD:
+ case Const.ISTORE:
return Type.INT;
- case Constants.LLOAD:
- case Constants.LSTORE:
+ case Const.LLOAD:
+ case Const.LSTORE:
return Type.LONG;
- case Constants.DLOAD:
- case Constants.DSTORE:
+ case Const.DLOAD:
+ case Const.DSTORE:
return Type.DOUBLE;
- case Constants.FLOAD:
- case Constants.FSTORE:
+ case Const.FLOAD:
+ case Const.FSTORE:
return Type.FLOAT;
- case Constants.ALOAD:
- case Constants.ASTORE:
+ case Const.ALOAD:
+ case Const.ASTORE:
return Type.OBJECT;
default:
throw new ClassGenException("Oops: unknown case in switch" + canon_tag);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java Fri Sep 11 00:30:19 2015
@@ -28,7 +28,7 @@ import org.apache.commons.bcel6.Exceptio
public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer {
public MONITORENTER() {
- super(org.apache.commons.bcel6.Constants.MONITORENTER, (short) 1);
+ super(org.apache.commons.bcel6.Const.MONITORENTER, (short) 1);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java Fri Sep 11 00:30:19 2015
@@ -28,7 +28,7 @@ import org.apache.commons.bcel6.Exceptio
public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer {
public MONITOREXIT() {
- super(org.apache.commons.bcel6.Constants.MONITOREXIT, (short) 1);
+ super(org.apache.commons.bcel6.Const.MONITOREXIT, (short) 1);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java Fri Sep 11 00:30:19 2015
@@ -45,7 +45,7 @@ public class MULTIANEWARRAY extends CPIn
public MULTIANEWARRAY(int index, short dimensions) {
- super(org.apache.commons.bcel6.Constants.MULTIANEWARRAY, index);
+ super(org.apache.commons.bcel6.Const.MULTIANEWARRAY, index);
if (dimensions < 1) {
throw new ClassGenException("Invalid dimensions value: " + dimensions);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java Fri Sep 11 00:30:19 2015
@@ -24,7 +24,7 @@ import java.util.Hashtable;
import java.util.List;
import java.util.Stack;
-import org.apache.commons.bcel6.Constants;
+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;
@@ -177,7 +177,7 @@ public class MethodGen extends FieldGenO
this(m.getAccessFlags(), Type.getReturnType(m.getSignature()), Type.getArgumentTypes(m
.getSignature()), null /* may be overridden anyway */
, m.getName(), class_name,
- ((m.getAccessFlags() & (Constants.ACC_ABSTRACT | Constants.ACC_NATIVE)) == 0)
+ ((m.getAccessFlags() & (Const.ACC_ABSTRACT | Const.ACC_NATIVE)) == 0)
? new InstructionList(m.getCode().getCode())
: null, cp);
Attribute[] attributes = m.getAttributes();
@@ -194,7 +194,7 @@ public class MethodGen extends FieldGenO
ObjectType c_type = null;
if (type > 0) {
String cen = m.getConstantPool().getConstantString(type,
- Constants.CONSTANT_Class);
+ Const.CONSTANT_Class);
c_type = ObjectType.getInstance(cen);
}
int end_pc = ce.getEndPC();
@@ -274,7 +274,7 @@ public class MethodGen extends FieldGenO
public LocalVariableGen addLocalVariable( String name, Type type, int slot,
InstructionHandle start, InstructionHandle end ) {
byte t = type.getType();
- if (t != Constants.T_ADDRESS) {
+ if (t != Const.T_ADDRESS) {
int add = type.getSize();
if (slot + add > max_locals) {
max_locals = slot + add;
@@ -956,7 +956,7 @@ public class MethodGen extends FieldGenO
} else if (!(branch instanceof IfInstruction)) {
// if an instruction that comes back to following PC,
// push next instruction, with stack depth reduced by 1.
- if (opcode == Constants.JSR || opcode == Constants.JSR_W) {
+ if (opcode == Const.JSR || opcode == Const.JSR_W) {
branchTargets.push(ih.getNext(), stackDepth - 1);
}
ih = null;
@@ -967,8 +967,8 @@ public class MethodGen extends FieldGenO
branchTargets.push(branch.getTarget(), stackDepth);
} else {
// check for instructions that terminate the method.
- if (opcode == Constants.ATHROW || opcode == Constants.RET
- || (opcode >= Constants.IRETURN && opcode <= Constants.RETURN)) {
+ if (opcode == Const.ATHROW || opcode == Const.RET
+ || (opcode >= Const.IRETURN && opcode <= Const.RETURN)) {
ih = null;
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java Fri Sep 11 00:30:19 2015
@@ -37,7 +37,7 @@ public class NEW extends CPInstruction i
public NEW(int index) {
- super(org.apache.commons.bcel6.Constants.NEW, index);
+ super(org.apache.commons.bcel6.Const.NEW, index);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java Fri Sep 11 00:30:19 2015
@@ -45,7 +45,7 @@ public class NEWARRAY extends Instructio
public NEWARRAY(byte type) {
- super(org.apache.commons.bcel6.Constants.NEWARRAY, (short) 2);
+ super(org.apache.commons.bcel6.Const.NEWARRAY, (short) 2);
this.type = type;
}
@@ -87,7 +87,7 @@ public class NEWARRAY extends Instructio
*/
@Override
public String toString( boolean verbose ) {
- return super.toString(verbose) + " " + org.apache.commons.bcel6.Constants.getTypeName(type);
+ return super.toString(verbose) + " " + org.apache.commons.bcel6.Const.getTypeName(type);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java Fri Sep 11 00:30:19 2015
@@ -25,7 +25,7 @@ package org.apache.commons.bcel6.generic
public class NOP extends Instruction {
public NOP() {
- super(org.apache.commons.bcel6.Constants.NOP, (short) 1);
+ super(org.apache.commons.bcel6.Const.NOP, (short) 1);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.Repository;
import org.apache.commons.bcel6.classfile.JavaClass;
@@ -41,7 +41,7 @@ public class ObjectType extends Referenc
* @param class_name fully qualified class name, e.g. java.lang.String
*/
public ObjectType(String class_name) {
- super(Constants.T_REFERENCE, "L" + class_name.replace('.', '/') + ";");
+ super(Const.T_REFERENCE, "L" + class_name.replace('.', '/') + ";");
this.class_name = class_name.replace('/', '.');
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java Fri Sep 11 00:30:19 2015
@@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic
public class POP extends StackInstruction implements PopInstruction {
public POP() {
- super(org.apache.commons.bcel6.Constants.POP);
+ super(org.apache.commons.bcel6.Const.POP);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java Fri Sep 11 00:30:19 2015
@@ -27,7 +27,7 @@ package org.apache.commons.bcel6.generic
public class POP2 extends StackInstruction implements PopInstruction {
public POP2() {
- super(org.apache.commons.bcel6.Constants.POP2);
+ super(org.apache.commons.bcel6.Const.POP2);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
/**
* Wrapper class for push operations, which are implemented either as BIPUSH,
@@ -38,7 +38,7 @@ public final class PUSH implements Compo
*/
public PUSH(ConstantPoolGen cp, int value) {
if ((value >= -1) && (value <= 5)) {
- instruction = InstructionConst.getInstruction(Constants.ICONST_0 + value);
+ instruction = InstructionConst.getInstruction(Const.ICONST_0 + value);
} else if (Instruction.isValidByte(value)) {
instruction = new BIPUSH((byte) value);
} else if (Instruction.isValidShort(value)) {
@@ -54,7 +54,7 @@ public final class PUSH implements Compo
* @param value to be pushed
*/
public PUSH(ConstantPoolGen cp, boolean value) {
- instruction = InstructionConst.getInstruction(Constants.ICONST_0 + (value ? 1 : 0));
+ instruction = InstructionConst.getInstruction(Const.ICONST_0 + (value ? 1 : 0));
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.ExceptionConst;
/**
@@ -39,7 +39,7 @@ public class PUTFIELD extends FieldInstr
public PUTFIELD(int index) {
- super(Constants.PUTFIELD, index);
+ super(Const.PUTFIELD, index);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.ExceptionConst;
/**
@@ -39,7 +39,7 @@ public class PUTSTATIC extends FieldInst
public PUTSTATIC(int index) {
- super(Constants.PUTSTATIC, index);
+ super(Const.PUTSTATIC, index);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java Fri Sep 11 00:30:19 2015
@@ -44,7 +44,7 @@ public class RET extends Instruction imp
public RET(int index) {
- super(org.apache.commons.bcel6.Constants.RET, (short) 2);
+ super(org.apache.commons.bcel6.Const.RET, (short) 2);
setIndex(index); // May set wide as side effect
}
@@ -56,7 +56,7 @@ public class RET extends Instruction imp
@Override
public void dump( DataOutputStream out ) throws IOException {
if (wide) {
- out.writeByte(org.apache.commons.bcel6.Constants.WIDE);
+ out.writeByte(org.apache.commons.bcel6.Const.WIDE);
}
out.writeByte(super.getOpcode());
if (wide) {
@@ -68,7 +68,7 @@ public class RET extends Instruction imp
private void setWide() {
- wide = index > org.apache.commons.bcel6.Constants.MAX_BYTE;
+ wide = index > org.apache.commons.bcel6.Const.MAX_BYTE;
if (wide) {
super.setLength(4); // Including the wide byte
} else {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class RETURN extends ReturnInstruction {
public RETURN() {
- super(org.apache.commons.bcel6.Constants.RETURN);
+ super(org.apache.commons.bcel6.Const.RETURN);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.Repository;
import org.apache.commons.bcel6.classfile.JavaClass;
@@ -36,7 +36,7 @@ public abstract class ReferenceType exte
/** Class is non-abstract but not instantiable from the outside
*/
ReferenceType() {
- super(Constants.T_OBJECT, "<null object>");
+ super(Const.T_OBJECT, "<null object>");
}
@@ -161,7 +161,7 @@ public abstract class ReferenceType exte
// on one of them "interfaces implemented by arrays" is exchanged with "'Cloneable' or
// 'java.io.Serializable'"
if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) {
- for (String element : Constants.getInterfacesImplementedByArrays()) {
+ for (String element : Const.getInterfacesImplementedByArrays()) {
if (T.equals(ObjectType.getInstance(element))) {
return true;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.ExceptionConst;
/**
@@ -47,17 +47,17 @@ public abstract class ReturnInstruction
public Type getType() {
final short _opcode = super.getOpcode();
switch (_opcode) {
- case Constants.IRETURN:
+ case Const.IRETURN:
return Type.INT;
- case Constants.LRETURN:
+ case Const.LRETURN:
return Type.LONG;
- case Constants.FRETURN:
+ case Const.FRETURN:
return Type.FLOAT;
- case Constants.DRETURN:
+ case Const.DRETURN:
return Type.DOUBLE;
- case Constants.ARETURN:
+ case Const.ARETURN:
return Type.OBJECT;
- case Constants.RETURN:
+ case Const.RETURN:
return Type.VOID;
default: // Never reached
throw new ClassGenException("Unknown type " + _opcode);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java Fri Sep 11 00:30:19 2015
@@ -17,7 +17,7 @@
*/
package org.apache.commons.bcel6.generic;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
/**
* Returnaddress, the type JSR or JSR_W instructions push upon the stack.
@@ -35,7 +35,7 @@ public class ReturnaddressType extends T
* A Returnaddress [that doesn't know where to return to].
*/
private ReturnaddressType() {
- super(Constants.T_ADDRESS, "<return address>");
+ super(Const.T_ADDRESS, "<return address>");
}
@@ -43,7 +43,7 @@ public class ReturnaddressType extends T
* Creates a ReturnaddressType object with a target.
*/
public ReturnaddressType(InstructionHandle returnTarget) {
- super(Constants.T_ADDRESS, "<return address targeting " + returnTarget + ">");
+ super(Const.T_ADDRESS, "<return address targeting " + returnTarget + ">");
this.returnTarget = returnTarget;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class SALOAD extends ArrayInstruction implements StackProducer {
public SALOAD() {
- super(org.apache.commons.bcel6.Constants.SALOAD);
+ super(org.apache.commons.bcel6.Const.SALOAD);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class SASTORE extends ArrayInstruction implements StackConsumer {
public SASTORE() {
- super(org.apache.commons.bcel6.Constants.SASTORE);
+ super(org.apache.commons.bcel6.Const.SASTORE);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java Fri Sep 11 00:30:19 2015
@@ -43,7 +43,7 @@ public class SIPUSH extends Instruction
public SIPUSH(short b) {
- super(org.apache.commons.bcel6.Constants.SIPUSH, (short) 3);
+ super(org.apache.commons.bcel6.Const.SIPUSH, (short) 3);
this.b = b;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ package org.apache.commons.bcel6.generic
public class SWAP extends StackInstruction implements StackConsumer, StackProducer {
public SWAP() {
- super(org.apache.commons.bcel6.Constants.SWAP);
+ super(org.apache.commons.bcel6.Const.SWAP);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java Fri Sep 11 00:30:19 2015
@@ -45,7 +45,7 @@ public class TABLESWITCH extends Select
* @param defaultTarget default branch
*/
public TABLESWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
- super(org.apache.commons.bcel6.Constants.TABLESWITCH, match, targets, defaultTarget);
+ super(org.apache.commons.bcel6.Const.TABLESWITCH, match, targets, defaultTarget);
/* Alignment remainder assumed 0 here, until dump time */
final short _length = (short) (13 + getMatch_length() * 4);
super.setLength(_length);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java Fri Sep 11 00:30:19 2015
@@ -20,7 +20,7 @@ package org.apache.commons.bcel6.generic
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.ClassFormatException;
import org.apache.commons.bcel6.classfile.Utility;
@@ -45,15 +45,15 @@ public abstract class Type {
protected String signature; // signature for the type TODO should be private
/** Predefined constants
*/
- public static final BasicType VOID = new BasicType(Constants.T_VOID);
- public static final BasicType BOOLEAN = new BasicType(Constants.T_BOOLEAN);
- public static final BasicType INT = new BasicType(Constants.T_INT);
- public static final BasicType SHORT = new BasicType(Constants.T_SHORT);
- public static final BasicType BYTE = new BasicType(Constants.T_BYTE);
- public static final BasicType LONG = new BasicType(Constants.T_LONG);
- public static final BasicType DOUBLE = new BasicType(Constants.T_DOUBLE);
- public static final BasicType FLOAT = new BasicType(Constants.T_FLOAT);
- public static final BasicType CHAR = new BasicType(Constants.T_CHAR);
+ public static final BasicType VOID = new BasicType(Const.T_VOID);
+ public static final BasicType BOOLEAN = new BasicType(Const.T_BOOLEAN);
+ public static final BasicType INT = new BasicType(Const.T_INT);
+ public static final BasicType SHORT = new BasicType(Const.T_SHORT);
+ public static final BasicType BYTE = new BasicType(Const.T_BYTE);
+ public static final BasicType LONG = new BasicType(Const.T_LONG);
+ public static final BasicType DOUBLE = new BasicType(Const.T_DOUBLE);
+ public static final BasicType FLOAT = new BasicType(Const.T_FLOAT);
+ public static final BasicType CHAR = new BasicType(Const.T_CHAR);
public static final ObjectType OBJECT = new ObjectType("java.lang.Object");
public static final ObjectType CLASS = new ObjectType("java.lang.Class");
public static final ObjectType STRING = new ObjectType("java.lang.String");
@@ -62,7 +62,7 @@ public abstract class Type {
public static final Type[] NO_ARGS = new Type[0]; // EMPTY, so immutable
public static final ReferenceType NULL = new ReferenceType() {
};
- public static final Type UNKNOWN = new Type(Constants.T_UNKNOWN, "<unknown object>") {
+ public static final Type UNKNOWN = new Type(Const.T_UNKNOWN, "<unknown object>") {
};
@@ -129,10 +129,10 @@ public abstract class Type {
*/
public int getSize() {
switch (type) {
- case Constants.T_DOUBLE:
- case Constants.T_LONG:
+ case Const.T_DOUBLE:
+ case Const.T_LONG:
return 2;
- case Constants.T_VOID:
+ case Const.T_VOID:
return 0;
default:
return 1;
@@ -145,7 +145,7 @@ public abstract class Type {
*/
@Override
public String toString() {
- return ((this.equals(Type.NULL) || (type >= Constants.T_UNKNOWN))) ? signature : Utility
+ return ((this.equals(Type.NULL) || (type >= Const.T_UNKNOWN))) ? signature : Utility
.signatureToString(signature, false);
}
@@ -197,11 +197,11 @@ public abstract class Type {
// @since 6.0 no longer final
public static Type getType( String signature ) throws StringIndexOutOfBoundsException {
byte type = Utility.typeOfSignature(signature);
- if (type <= Constants.T_VOID) {
+ if (type <= Const.T_VOID) {
//corrected concurrent private static field acess
wrap(consumed_chars, 1);
return BasicType.getType(type);
- } else if (type == Constants.T_ARRAY) {
+ } else if (type == Const.T_ARRAY) {
int dim = 0;
do { // Count dimensions
dim++;
@@ -371,9 +371,9 @@ public abstract class Type {
static int getTypeSize( String signature ) throws StringIndexOutOfBoundsException {
byte type = Utility.typeOfSignature(signature);
- if (type <= Constants.T_VOID) {
+ if (type <= Const.T_VOID) {
return encode(BasicType.getType(type).getSize(), 1);
- } else if (type == Constants.T_ARRAY) {
+ } else if (type == Const.T_ARRAY) {
int dim = 0;
do { // Count dimensions
dim++;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java Fri Sep 11 00:30:19 2015
@@ -21,7 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Attribute;
import org.apache.commons.bcel6.classfile.Code;
import org.apache.commons.bcel6.classfile.CodeException;
@@ -83,7 +83,7 @@ final class AttributeHTML {
final void writeAttribute( Attribute attribute, String anchor, int method_number ) {
byte tag = attribute.getTag();
int index;
- if (tag == Constants.ATTR_UNKNOWN) {
+ if (tag == Const.ATTR_UNKNOWN) {
return;
}
attr_count++; // Increment number of attributes found so far
@@ -92,12 +92,12 @@ final class AttributeHTML {
} else {
file.print("<TR BGCOLOR=\"#A0A0A0\"><TD>");
}
- file.println("<H4><A NAME=\"" + anchor + "\">" + attr_count + " " + Constants.getAttributeName(tag)
+ file.println("<H4><A NAME=\"" + anchor + "\">" + attr_count + " " + Const.getAttributeName(tag)
+ "</A></H4>");
/* Handle different attributes
*/
switch (tag) {
- case Constants.ATTR_CODE:
+ case Const.ATTR_CODE:
Code c = (Code) attribute;
// Some directly printable values
file.print("<UL><LI>Maximum stack size = " + c.getMaxStack()
@@ -125,20 +125,20 @@ final class AttributeHTML {
file.print("</UL>");
}
break;
- case Constants.ATTR_CONSTANT_VALUE:
+ case Const.ATTR_CONSTANT_VALUE:
index = ((ConstantValue) attribute).getConstantValueIndex();
// Reference _cp.html
file.print("<UL><LI><A HREF=\"" + class_name + "_cp.html#cp" + index
+ "\" TARGET=\"ConstantPool\">Constant value index(" + index
+ ")</A></UL>\n");
break;
- case Constants.ATTR_SOURCE_FILE:
+ case Const.ATTR_SOURCE_FILE:
index = ((SourceFile) attribute).getSourceFileIndex();
// Reference _cp.html
file.print("<UL><LI><A HREF=\"" + class_name + "_cp.html#cp" + index
+ "\" TARGET=\"ConstantPool\">Source file index(" + index + ")</A></UL>\n");
break;
- case Constants.ATTR_EXCEPTIONS:
+ case Const.ATTR_EXCEPTIONS:
// List thrown exceptions
int[] indices = ((ExceptionTable) attribute).getExceptionIndexTable();
file.print("<UL>");
@@ -149,7 +149,7 @@ final class AttributeHTML {
}
file.print("</UL>\n");
break;
- case Constants.ATTR_LINE_NUMBER_TABLE:
+ case Const.ATTR_LINE_NUMBER_TABLE:
LineNumber[] line_numbers = ((LineNumberTable) attribute).getLineNumberTable();
// List line number pairs
file.print("<P>");
@@ -161,14 +161,14 @@ final class AttributeHTML {
}
}
break;
- case Constants.ATTR_LOCAL_VARIABLE_TABLE:
+ case Const.ATTR_LOCAL_VARIABLE_TABLE:
LocalVariable[] vars = ((LocalVariableTable) attribute).getLocalVariableTable();
// List name, range and type
file.print("<UL>");
for (LocalVariable var : vars) {
index = var.getSignatureIndex();
String signature = ((ConstantUtf8) constant_pool.getConstant(index,
- Constants.CONSTANT_Utf8)).getBytes();
+ Const.CONSTANT_Utf8)).getBytes();
signature = Utility.signatureToString(signature, false);
int start = var.getStartPC();
int end = start + var.getLength();
@@ -181,7 +181,7 @@ final class AttributeHTML {
}
file.print("</UL>\n");
break;
- case Constants.ATTR_INNER_CLASSES:
+ case Const.ATTR_INNER_CLASSES:
InnerClass[] classes = ((InnerClasses) attribute).getInnerClasses();
// List inner classes
file.print("<UL>");
@@ -190,7 +190,7 @@ final class AttributeHTML {
String access;
index = classe.getInnerNameIndex();
if (index > 0) {
- name = ((ConstantUtf8) constant_pool.getConstant(index, Constants.CONSTANT_Utf8))
+ name = ((ConstantUtf8) constant_pool.getConstant(index, Const.CONSTANT_Utf8))
.getBytes();
} else {
name = "<anonymous>";
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELFactory.java Fri Sep 11 00:30:19 2015
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Utility;
import org.apache.commons.bcel6.generic.AllocationInstruction;
import org.apache.commons.bcel6.generic.ArrayInstruction;
@@ -122,11 +122,11 @@ class BCELFactory extends EmptyVisitor {
public void visitLocalVariableInstruction( LocalVariableInstruction i ) {
short opcode = i.getOpcode();
Type type = i.getType(_cp);
- if (opcode == Constants.IINC) {
+ if (opcode == Const.IINC) {
_out.println("il.append(new IINC(" + i.getIndex() + ", " + ((IINC) i).getIncrement()
+ "));");
} else {
- String kind = (opcode < Constants.ISTORE) ? "Load" : "Store";
+ String kind = (opcode < Const.ISTORE) ? "Load" : "Store";
_out.println("il.append(_factory.create" + kind + "(" + BCELifier.printType(type)
+ ", " + i.getIndex() + "));");
}
@@ -137,7 +137,7 @@ class BCELFactory extends EmptyVisitor {
public void visitArrayInstruction( ArrayInstruction i ) {
short opcode = i.getOpcode();
Type type = i.getType(_cp);
- String kind = (opcode < Constants.IASTORE) ? "Load" : "Store";
+ String kind = (opcode < Const.IASTORE) ? "Load" : "Store";
_out.println("il.append(_factory.createArray" + kind + "(" + BCELifier.printType(type)
+ "));");
}
@@ -151,7 +151,7 @@ class BCELFactory extends EmptyVisitor {
Type type = i.getFieldType(_cp);
_out.println("il.append(_factory.createFieldAccess(\"" + class_name + "\", \"" + field_name
+ "\", " + BCELifier.printType(type) + ", " + "Constants."
- + Constants.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));");
+ + Const.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));");
}
@@ -165,7 +165,7 @@ class BCELFactory extends EmptyVisitor {
_out.println("il.append(_factory.createInvoke(\"" + class_name + "\", \"" + method_name
+ "\", " + BCELifier.printType(type) + ", "
+ BCELifier.printArgumentTypes(arg_types) + ", " + "Constants."
- + Constants.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));");
+ + Const.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));");
}
@@ -180,15 +180,15 @@ class BCELFactory extends EmptyVisitor {
short opcode = ((Instruction) i).getOpcode();
int dim = 1;
switch (opcode) {
- case Constants.NEW:
+ case Const.NEW:
_out.println("il.append(_factory.createNew(\"" + ((ObjectType) type).getClassName()
+ "\"));");
break;
- case Constants.MULTIANEWARRAY:
+ case Const.MULTIANEWARRAY:
dim = ((MULTIANEWARRAY) i).getDimensions();
//$FALL-THROUGH$
- case Constants.ANEWARRAY:
- case Constants.NEWARRAY:
+ case Const.ANEWARRAY:
+ case Const.NEWARRAY:
if (type instanceof ArrayType) {
type = ((ArrayType) type).getBasicType();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/BCELifier.java Fri Sep 11 00:30:19 2015
@@ -22,7 +22,7 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.Locale;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.Repository;
import org.apache.commons.bcel6.classfile.ClassParser;
import org.apache.commons.bcel6.classfile.ConstantValue;
@@ -56,7 +56,7 @@ public class BCELifier extends org.apach
};
// The base package name for imports; assumes Constants is at the top level
- private static final String BASE_PACKAGE = Constants.class.getPackage().getName();
+ private static final String BASE_PACKAGE = Const.class.getPackage().getName();
private final JavaClass _clazz;
private final PrintWriter _out;
private final ConstantPoolGen _cp;
@@ -209,17 +209,17 @@ public class BCELifier extends org.apach
return "0";
}
StringBuilder buf = new StringBuilder();
- for (int i = 0, pow = 1; pow <= Constants.MAX_ACC_FLAG; i++) {
+ for (int i = 0, pow = 1; pow <= Const.MAX_ACC_FLAG; i++) {
if ((flags & pow) != 0) {
- if ((pow == Constants.ACC_SYNCHRONIZED) && (location == FLAGS.CLASS)) {
+ if ((pow == Const.ACC_SYNCHRONIZED) && (location == FLAGS.CLASS)) {
buf.append("ACC_SUPER | ");
- } else if ((pow == Constants.ACC_VOLATILE) && (location == FLAGS.METHOD)) {
+ } else if ((pow == Const.ACC_VOLATILE) && (location == FLAGS.METHOD)) {
buf.append("ACC_BRIDGE | ");
- } else if ((pow == Constants.ACC_TRANSIENT) && (location == FLAGS.METHOD)) {
+ } else if ((pow == Const.ACC_TRANSIENT) && (location == FLAGS.METHOD)) {
buf.append("ACC_VARARGS | ");
} else {
- if (i < Constants.ACCESS_NAMES_LENGTH) {
- buf.append("ACC_").append(Constants.getAccessName(i).toUpperCase(Locale.ENGLISH)).append( " | ");
+ if (i < Const.ACCESS_NAMES_LENGTH) {
+ buf.append("ACC_").append(Const.getAccessName(i).toUpperCase(Locale.ENGLISH)).append( " | ");
} else {
buf.append(String.format ("ACC_BIT %x | ", pow));
}
@@ -255,8 +255,8 @@ public class BCELifier extends org.apach
static String printType( String signature ) {
Type type = Type.getType(signature);
byte t = type.getType();
- if (t <= Constants.T_VOID) {
- return "Type." + Constants.getTypeName(t).toUpperCase(Locale.ENGLISH);
+ if (t <= Const.T_VOID) {
+ return "Type." + Const.getTypeName(t).toUpperCase(Locale.ENGLISH);
} else if (type.toString().equals("java.lang.String")) {
return "Type.STRING";
} else if (type.toString().equals("java.lang.Object")) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java Fri Sep 11 00:30:19 2015
@@ -24,7 +24,7 @@ import java.io.PrintWriter;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Attribute;
import org.apache.commons.bcel6.classfile.ClassParser;
import org.apache.commons.bcel6.classfile.ConstantPool;
@@ -167,7 +167,7 @@ public class Class2HTML {
* i.e., an index to a string.
*/
static String referenceClass( int index ) {
- String str = constant_pool.getConstantString(index, Constants.CONSTANT_Class);
+ String str = constant_pool.getConstantString(index, Const.CONSTANT_Class);
str = Utility.compactClassName(str);
str = Utility.compactClassName(str, class_package + ".", true);
return "<A HREF=\"" + class_name + "_cp.html#cp" + index + "\" TARGET=ConstantPool>" + str
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java Fri Sep 11 00:30:19 2015
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.BitSet;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Attribute;
import org.apache.commons.bcel6.classfile.Code;
import org.apache.commons.bcel6.classfile.CodeException;
@@ -92,11 +92,11 @@ final class CodeHTML {
int no_pad_bytes = 0;
int offset;
StringBuilder buf = new StringBuilder(256); // CHECKSTYLE IGNORE MagicNumber
- buf.append("<TT>").append(Constants.getOpcodeName(opcode)).append("</TT></TD><TD>");
+ buf.append("<TT>").append(Const.getOpcodeName(opcode)).append("</TT></TD><TD>");
/* Special case: Skip (0-3) padding bytes, i.e., the
* following bytes are 4-byte-aligned
*/
- if ((opcode == Constants.TABLESWITCH) || (opcode == Constants.LOOKUPSWITCH)) {
+ if ((opcode == Const.TABLESWITCH) || (opcode == Const.LOOKUPSWITCH)) {
int remainder = bytes.getIndex() % 4;
no_pad_bytes = (remainder == 0) ? 0 : 4 - remainder;
for (int i = 0; i < no_pad_bytes; i++) {
@@ -106,7 +106,7 @@ final class CodeHTML {
default_offset = bytes.readInt();
}
switch (opcode) {
- case Constants.TABLESWITCH:
+ case Const.TABLESWITCH:
low = bytes.readInt();
high = bytes.readInt();
offset = bytes.getIndex() - 12 - no_pad_bytes - 1;
@@ -130,7 +130,7 @@ final class CodeHTML {
break;
/* Lookup switch has variable length arguments.
*/
- case Constants.LOOKUPSWITCH:
+ case Const.LOOKUPSWITCH:
int npairs = bytes.readInt();
offset = bytes.getIndex() - 8 - no_pad_bytes - 1;
jump_table = new int[npairs];
@@ -155,49 +155,49 @@ final class CodeHTML {
/* Two address bytes + offset from start of byte stream form the
* jump target.
*/
- case Constants.GOTO:
- case Constants.IFEQ:
- case Constants.IFGE:
- case Constants.IFGT:
- case Constants.IFLE:
- case Constants.IFLT:
- case Constants.IFNE:
- case Constants.IFNONNULL:
- case Constants.IFNULL:
- case Constants.IF_ACMPEQ:
- case Constants.IF_ACMPNE:
- case Constants.IF_ICMPEQ:
- case Constants.IF_ICMPGE:
- case Constants.IF_ICMPGT:
- case Constants.IF_ICMPLE:
- case Constants.IF_ICMPLT:
- case Constants.IF_ICMPNE:
- case Constants.JSR:
+ case Const.GOTO:
+ case Const.IFEQ:
+ case Const.IFGE:
+ case Const.IFGT:
+ case Const.IFLE:
+ case Const.IFLT:
+ case Const.IFNE:
+ case Const.IFNONNULL:
+ case Const.IFNULL:
+ case Const.IF_ACMPEQ:
+ case Const.IF_ACMPNE:
+ case Const.IF_ICMPEQ:
+ case Const.IF_ICMPGE:
+ case Const.IF_ICMPGT:
+ case Const.IF_ICMPLE:
+ case Const.IF_ICMPLT:
+ case Const.IF_ICMPNE:
+ case Const.JSR:
index = bytes.getIndex() + bytes.readShort() - 1;
buf.append("<A HREF=\"#code").append(method_number).append("@").append(index)
.append("\">").append(index).append("</A>");
break;
/* Same for 32-bit wide jumps
*/
- case Constants.GOTO_W:
- case Constants.JSR_W:
+ case Const.GOTO_W:
+ case Const.JSR_W:
int windex = bytes.getIndex() + bytes.readInt() - 1;
buf.append("<A HREF=\"#code").append(method_number).append("@").append(windex)
.append("\">").append(windex).append("</A>");
break;
/* Index byte references local variable (register)
*/
- case Constants.ALOAD:
- case Constants.ASTORE:
- case Constants.DLOAD:
- case Constants.DSTORE:
- case Constants.FLOAD:
- case Constants.FSTORE:
- case Constants.ILOAD:
- case Constants.ISTORE:
- case Constants.LLOAD:
- case Constants.LSTORE:
- case Constants.RET:
+ case Const.ALOAD:
+ case Const.ASTORE:
+ case Const.DLOAD:
+ case Const.DSTORE:
+ case Const.FLOAD:
+ case Const.FSTORE:
+ case Const.ILOAD:
+ case Const.ISTORE:
+ case Const.LLOAD:
+ case Const.LSTORE:
+ case Const.RET:
if (wide) {
vindex = bytes.readShort();
wide = false; // Clear flag
@@ -211,30 +211,30 @@ final class CodeHTML {
* following instruction. Relies on that the method is called again with
* the following opcode.
*/
- case Constants.WIDE:
+ case Const.WIDE:
wide = true;
buf.append("(wide)");
break;
/* Array of basic type.
*/
- case Constants.NEWARRAY:
- buf.append("<FONT COLOR=\"#00FF00\">").append(Constants.getTypeName(bytes.readByte())).append(
+ case Const.NEWARRAY:
+ buf.append("<FONT COLOR=\"#00FF00\">").append(Const.getTypeName(bytes.readByte())).append(
"</FONT>");
break;
/* Access object/class fields.
*/
- case Constants.GETFIELD:
- case Constants.GETSTATIC:
- case Constants.PUTFIELD:
- case Constants.PUTSTATIC:
+ case Const.GETFIELD:
+ case Const.GETSTATIC:
+ case Const.PUTFIELD:
+ case Const.PUTSTATIC:
index = bytes.readShort();
ConstantFieldref c1 = (ConstantFieldref) constant_pool.getConstant(index,
- Constants.CONSTANT_Fieldref);
+ Const.CONSTANT_Fieldref);
class_index = c1.getClassIndex();
- name = constant_pool.getConstantString(class_index, Constants.CONSTANT_Class);
+ name = constant_pool.getConstantString(class_index, Const.CONSTANT_Class);
name = Utility.compactClassName(name, false);
index = c1.getNameAndTypeIndex();
- String field_name = constant_pool.constantToString(index, Constants.CONSTANT_NameAndType);
+ String field_name = constant_pool.constantToString(index, Const.CONSTANT_NameAndType);
if (name.equals(class_name)) { // Local field
buf.append("<A HREF=\"").append(class_name).append("_methods.html#field")
.append(field_name).append("\" TARGET=Methods>").append(field_name)
@@ -246,36 +246,36 @@ final class CodeHTML {
break;
/* Operands are references to classes in constant pool
*/
- case Constants.CHECKCAST:
- case Constants.INSTANCEOF:
- case Constants.NEW:
+ case Const.CHECKCAST:
+ case Const.INSTANCEOF:
+ case Const.NEW:
index = bytes.readShort();
buf.append(constant_html.referenceConstant(index));
break;
/* Operands are references to methods in constant pool
*/
- case Constants.INVOKESPECIAL:
- case Constants.INVOKESTATIC:
- case Constants.INVOKEVIRTUAL:
- case Constants.INVOKEINTERFACE:
- case Constants.INVOKEDYNAMIC:
+ case Const.INVOKESPECIAL:
+ case Const.INVOKESTATIC:
+ case Const.INVOKEVIRTUAL:
+ case Const.INVOKEINTERFACE:
+ case Const.INVOKEDYNAMIC:
int m_index = bytes.readShort();
String str;
- if (opcode == Constants.INVOKEINTERFACE) { // Special treatment needed
+ if (opcode == Const.INVOKEINTERFACE) { // Special treatment needed
bytes.readUnsignedByte(); // Redundant
bytes.readUnsignedByte(); // Reserved
// int nargs = bytes.readUnsignedByte(); // Redundant
// int reserved = bytes.readUnsignedByte(); // Reserved
ConstantInterfaceMethodref c = (ConstantInterfaceMethodref) constant_pool
- .getConstant(m_index, Constants.CONSTANT_InterfaceMethodref);
+ .getConstant(m_index, Const.CONSTANT_InterfaceMethodref);
class_index = c.getClassIndex();
index = c.getNameAndTypeIndex();
name = Class2HTML.referenceClass(class_index);
- } else if (opcode == Constants.INVOKEDYNAMIC) { // Special treatment needed
+ } else if (opcode == Const.INVOKEDYNAMIC) { // Special treatment needed
bytes.readUnsignedByte(); // Reserved
bytes.readUnsignedByte(); // Reserved
ConstantInvokeDynamic c = (ConstantInvokeDynamic) constant_pool
- .getConstant(m_index, Constants.CONSTANT_InvokeDynamic);
+ .getConstant(m_index, Const.CONSTANT_InvokeDynamic);
index = c.getNameAndTypeIndex();
name = "#" + c.getBootstrapMethodAttrIndex();
} else {
@@ -283,17 +283,17 @@ final class CodeHTML {
// reference EITHER a Methodref OR an InterfaceMethodref.
// Not sure if that affects this code or not. (markro)
ConstantMethodref c = (ConstantMethodref) constant_pool.getConstant(m_index,
- Constants.CONSTANT_Methodref);
+ Const.CONSTANT_Methodref);
class_index = c.getClassIndex();
index = c.getNameAndTypeIndex();
name = Class2HTML.referenceClass(class_index);
}
str = Class2HTML.toHTML(constant_pool.constantToString(constant_pool.getConstant(
- index, Constants.CONSTANT_NameAndType)));
+ index, Const.CONSTANT_NameAndType)));
// Get signature, i.e., types
ConstantNameAndType c2 = (ConstantNameAndType) constant_pool.getConstant(index,
- Constants.CONSTANT_NameAndType);
- signature = constant_pool.constantToString(c2.getSignatureIndex(), Constants.CONSTANT_Utf8);
+ Const.CONSTANT_NameAndType);
+ signature = constant_pool.constantToString(c2.getSignatureIndex(), Const.CONSTANT_Utf8);
String[] args = Utility.methodSignatureArgumentTypes(signature, false);
String type = Utility.methodSignatureReturnType(signature, false);
buf.append(name).append(".<A HREF=\"").append(class_name).append("_cp.html#cp")
@@ -311,15 +311,15 @@ final class CodeHTML {
break;
/* Operands are references to items in constant pool
*/
- case Constants.LDC_W:
- case Constants.LDC2_W:
+ case Const.LDC_W:
+ case Const.LDC2_W:
index = bytes.readShort();
buf.append("<A HREF=\"").append(class_name).append("_cp.html#cp").append(index)
.append("\" TARGET=\"ConstantPool\">").append(
Class2HTML.toHTML(constant_pool.constantToString(index,
constant_pool.getConstant(index).getTag()))).append("</a>");
break;
- case Constants.LDC:
+ case Const.LDC:
index = bytes.readUnsignedByte();
buf.append("<A HREF=\"").append(class_name).append("_cp.html#cp").append(index)
.append("\" TARGET=\"ConstantPool\">").append(
@@ -328,13 +328,13 @@ final class CodeHTML {
break;
/* Array of references.
*/
- case Constants.ANEWARRAY:
+ case Const.ANEWARRAY:
index = bytes.readShort();
buf.append(constant_html.referenceConstant(index));
break;
/* Multidimensional array of references.
*/
- case Constants.MULTIANEWARRAY:
+ case Const.MULTIANEWARRAY:
index = bytes.readShort();
int dimensions = bytes.readByte();
buf.append(constant_html.referenceConstant(index)).append(":").append(dimensions)
@@ -342,7 +342,7 @@ final class CodeHTML {
break;
/* Increment local variable.
*/
- case Constants.IINC:
+ case Const.IINC:
if (wide) {
vindex = bytes.readShort();
constant = bytes.readShort();
@@ -354,21 +354,21 @@ final class CodeHTML {
buf.append("%").append(vindex).append(" ").append(constant);
break;
default:
- if (Constants.getNoOfOperands(opcode) > 0) {
- for (int i = 0; i < Constants.getOperandTypeCount(opcode); i++) {
- switch (Constants.getOperandType(opcode, i)) {
- case Constants.T_BYTE:
+ if (Const.getNoOfOperands(opcode) > 0) {
+ for (int i = 0; i < Const.getOperandTypeCount(opcode); i++) {
+ switch (Const.getOperandType(opcode, i)) {
+ case Const.T_BYTE:
buf.append(bytes.readUnsignedByte());
break;
- case Constants.T_SHORT: // Either branch or index
+ case Const.T_SHORT: // Either branch or index
buf.append(bytes.readShort());
break;
- case Constants.T_INT:
+ case Const.T_INT:
buf.append(bytes.readInt());
break;
default: // Never reached
throw new IllegalStateException(
- "Unreachable default case reached! "+Constants.getOperandType(opcode, i));
+ "Unreachable default case reached! "+Const.getOperandType(opcode, i));
}
buf.append(" ");
}
@@ -400,7 +400,7 @@ final class CodeHTML {
// Look for local variables and their range
Attribute[] attributes = code.getAttributes();
for (Attribute attribute : attributes) {
- if (attribute.getTag() == Constants.ATTR_LOCAL_VARIABLE_TABLE) {
+ if (attribute.getTag() == Const.ATTR_LOCAL_VARIABLE_TABLE) {
LocalVariable[] vars = ((LocalVariableTable) attribute)
.getLocalVariableTable();
for (LocalVariable var : vars) {
@@ -418,8 +418,8 @@ final class CodeHTML {
opcode = bytes.readUnsignedByte();
//System.out.println(getOpcodeName(opcode));
switch (opcode) {
- case Constants.TABLESWITCH:
- case Constants.LOOKUPSWITCH:
+ case Const.TABLESWITCH:
+ case Const.LOOKUPSWITCH:
//bytes.readByte(); // Skip already read byte
int remainder = bytes.getIndex() % 4;
int no_pad_bytes = (remainder == 0) ? 0 : 4 - remainder;
@@ -430,7 +430,7 @@ final class CodeHTML {
}
// Both cases have a field default_offset in common
default_offset = bytes.readInt();
- if (opcode == Constants.TABLESWITCH) {
+ if (opcode == Const.TABLESWITCH) {
int low = bytes.readInt();
int high = bytes.readInt();
offset = bytes.getIndex() - 12 - no_pad_bytes - 1;
@@ -453,30 +453,30 @@ final class CodeHTML {
}
}
break;
- case Constants.GOTO:
- case Constants.IFEQ:
- case Constants.IFGE:
- case Constants.IFGT:
- case Constants.IFLE:
- case Constants.IFLT:
- case Constants.IFNE:
- case Constants.IFNONNULL:
- case Constants.IFNULL:
- case Constants.IF_ACMPEQ:
- case Constants.IF_ACMPNE:
- case Constants.IF_ICMPEQ:
- case Constants.IF_ICMPGE:
- case Constants.IF_ICMPGT:
- case Constants.IF_ICMPLE:
- case Constants.IF_ICMPLT:
- case Constants.IF_ICMPNE:
- case Constants.JSR:
+ case Const.GOTO:
+ case Const.IFEQ:
+ case Const.IFGE:
+ case Const.IFGT:
+ case Const.IFLE:
+ case Const.IFLT:
+ case Const.IFNE:
+ case Const.IFNONNULL:
+ case Const.IFNULL:
+ case Const.IF_ACMPEQ:
+ case Const.IF_ACMPNE:
+ case Const.IF_ICMPEQ:
+ case Const.IF_ICMPGE:
+ case Const.IF_ICMPGT:
+ case Const.IF_ICMPLE:
+ case Const.IF_ICMPLT:
+ case Const.IF_ICMPNE:
+ case Const.JSR:
//bytes.readByte(); // Skip already read byte
index = bytes.getIndex() + bytes.readShort() - 1;
goto_set.set(index);
break;
- case Constants.GOTO_W:
- case Constants.JSR_W:
+ case Const.GOTO_W:
+ case Const.JSR_W:
//bytes.readByte(); // Skip already read byte
index = bytes.getIndex() + bytes.readInt() - 1;
goto_set.set(index);
@@ -524,14 +524,14 @@ final class CodeHTML {
file.print("<H4>Attributes</H4><UL>\n");
for (int i = 0; i < attributes.length; i++) {
byte tag = attributes[i].getTag();
- if (tag != Constants.ATTR_UNKNOWN) {
+ if (tag != Const.ATTR_UNKNOWN) {
file.print("<LI><A HREF=\"" + class_name + "_attributes.html#method"
+ method_number + "@" + i + "\" TARGET=Attributes>"
- + Constants.getAttributeName(tag) + "</A></LI>\n");
+ + Const.getAttributeName(tag) + "</A></LI>\n");
} else {
file.print("<LI>" + attributes[i] + "</LI>");
}
- if (tag == Constants.ATTR_CODE) {
+ if (tag == Const.ATTR_CODE) {
c = (Code) attributes[i];
Attribute[] attributes2 = c.getAttributes();
code = c.getCode();
@@ -540,7 +540,7 @@ final class CodeHTML {
tag = attributes2[j].getTag();
file.print("<LI><A HREF=\"" + class_name + "_attributes.html#" + "method"
+ method_number + "@" + i + "@" + j + "\" TARGET=Attributes>"
- + Constants.getAttributeName(tag) + "</A></LI>\n");
+ + Const.getAttributeName(tag) + "</A></LI>\n");
}
file.print("</UL>");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java Fri Sep 11 00:30:19 2015
@@ -21,7 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.classfile.Constant;
import org.apache.commons.bcel6.classfile.ConstantClass;
import org.apache.commons.bcel6.classfile.ConstantFieldref;
@@ -89,39 +89,39 @@ final class ConstantHTML {
int name_index;
String ref;
// The header is always the same
- file.println("<H4> <A NAME=cp" + index + ">" + index + "</A> " + Constants.getConstantName(tag)
+ file.println("<H4> <A NAME=cp" + index + ">" + index + "</A> " + Const.getConstantName(tag)
+ "</H4>");
/* For every constant type get the needed parameters and print them appropiately
*/
switch (tag) {
- case Constants.CONSTANT_InterfaceMethodref:
- case Constants.CONSTANT_Methodref:
+ case Const.CONSTANT_InterfaceMethodref:
+ case Const.CONSTANT_Methodref:
// Get class_index and name_and_type_index, depending on type
- if (tag == Constants.CONSTANT_Methodref) {
+ if (tag == Const.CONSTANT_Methodref) {
ConstantMethodref c = (ConstantMethodref) constant_pool.getConstant(index,
- Constants.CONSTANT_Methodref);
+ Const.CONSTANT_Methodref);
class_index = c.getClassIndex();
name_index = c.getNameAndTypeIndex();
} else {
ConstantInterfaceMethodref c1 = (ConstantInterfaceMethodref) constant_pool
- .getConstant(index, Constants.CONSTANT_InterfaceMethodref);
+ .getConstant(index, Const.CONSTANT_InterfaceMethodref);
class_index = c1.getClassIndex();
name_index = c1.getNameAndTypeIndex();
}
// Get method name and its class
String method_name = constant_pool.constantToString(name_index,
- Constants.CONSTANT_NameAndType);
+ Const.CONSTANT_NameAndType);
String html_method_name = Class2HTML.toHTML(method_name);
// Partially compacted class name, i.e., / -> .
- String method_class = constant_pool.constantToString(class_index, Constants.CONSTANT_Class);
+ String method_class = constant_pool.constantToString(class_index, Const.CONSTANT_Class);
String short_method_class = Utility.compactClassName(method_class); // I.e., remove java.lang.
short_method_class = Utility.compactClassName(short_method_class, class_package
+ ".", true); // Remove class package prefix
// Get method signature
ConstantNameAndType c2 = (ConstantNameAndType) constant_pool.getConstant(
- name_index, Constants.CONSTANT_NameAndType);
+ name_index, Const.CONSTANT_NameAndType);
String signature = constant_pool.constantToString(c2.getSignatureIndex(),
- Constants.CONSTANT_Utf8);
+ Const.CONSTANT_Utf8);
// Get array of strings containing the argument types
String[] args = Utility.methodSignatureArgumentTypes(signature, false);
// Get return type string
@@ -153,19 +153,19 @@ final class ConstantHTML {
+ "\">Class index(" + class_index + ")</A>\n" + "<LI><A HREF=\"#cp"
+ name_index + "\">NameAndType index(" + name_index + ")</A></UL>");
break;
- case Constants.CONSTANT_Fieldref:
+ case Const.CONSTANT_Fieldref:
// Get class_index and name_and_type_index
ConstantFieldref c3 = (ConstantFieldref) constant_pool.getConstant(index,
- Constants.CONSTANT_Fieldref);
+ Const.CONSTANT_Fieldref);
class_index = c3.getClassIndex();
name_index = c3.getNameAndTypeIndex();
// Get method name and its class (compacted)
- String field_class = constant_pool.constantToString(class_index, Constants.CONSTANT_Class);
+ String field_class = constant_pool.constantToString(class_index, Const.CONSTANT_Class);
String short_field_class = Utility.compactClassName(field_class); // I.e., remove java.lang.
short_field_class = Utility.compactClassName(short_field_class,
class_package + ".", true); // Remove class package prefix
String field_name = constant_pool
- .constantToString(name_index, Constants.CONSTANT_NameAndType);
+ .constantToString(name_index, Const.CONSTANT_NameAndType);
if (field_class.equals(class_name)) {
ref = "<A HREF=\"" + field_class + "_methods.html#field" + field_name
+ "\" TARGET=Methods>" + field_name + "</A>";
@@ -182,8 +182,8 @@ final class ConstantHTML {
+ "<LI><A HREF=\"#cp" + name_index + "\">NameAndType(" + name_index
+ ")</A></UL>");
break;
- case Constants.CONSTANT_Class:
- ConstantClass c4 = (ConstantClass) constant_pool.getConstant(index, Constants.CONSTANT_Class);
+ case Const.CONSTANT_Class:
+ ConstantClass c4 = (ConstantClass) constant_pool.getConstant(index, Const.CONSTANT_Class);
name_index = c4.getNameIndex();
String class_name2 = constant_pool.constantToString(index, tag); // / -> .
String short_class_name = Utility.compactClassName(class_name2); // I.e., remove java.lang.
@@ -196,17 +196,17 @@ final class ConstantHTML {
file.println("<P><TT>" + ref + "</TT><UL>" + "<LI><A HREF=\"#cp" + name_index
+ "\">Name index(" + name_index + ")</A></UL>\n");
break;
- case Constants.CONSTANT_String:
+ case Const.CONSTANT_String:
ConstantString c5 = (ConstantString) constant_pool.getConstant(index,
- Constants.CONSTANT_String);
+ Const.CONSTANT_String);
name_index = c5.getStringIndex();
String str = Class2HTML.toHTML(constant_pool.constantToString(index, tag));
file.println("<P><TT>" + str + "</TT><UL>" + "<LI><A HREF=\"#cp" + name_index
+ "\">Name index(" + name_index + ")</A></UL>\n");
break;
- case Constants.CONSTANT_NameAndType:
+ case Const.CONSTANT_NameAndType:
ConstantNameAndType c6 = (ConstantNameAndType) constant_pool.getConstant(index,
- Constants.CONSTANT_NameAndType);
+ Const.CONSTANT_NameAndType);
name_index = c6.getNameIndex();
int signature_index = c6.getSignatureIndex();
file.println("<P><TT>"
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java?rev=1702355&r1=1702354&r2=1702355&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java Fri Sep 11 00:30:19 2015
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Const;
import org.apache.commons.bcel6.generic.ClassGenException;
import org.apache.commons.bcel6.generic.InstructionHandle;
import org.apache.commons.bcel6.generic.InstructionList;
@@ -114,7 +114,7 @@ public class InstructionFinder {
return result;
}
for (short i = 0; i < NO_OPCODES; i++) {
- if (pattern.equals(Constants.getOpcodeName(i))) {
+ if (pattern.equals(Const.getOpcodeName(i))) {
return "" + makeChar(i);
}
}
@@ -343,20 +343,20 @@ public class InstructionFinder {
map.put("if_acmp", "(if_acmpeq|if_acmpne)");
map.put("if", "(ifeq|ifne|iflt|ifge|ifgt|ifle)");
// Precompile some aliases first
- map.put("iconst", precompile(Constants.ICONST_0, Constants.ICONST_5, Constants.ICONST_M1));
- map.put("lconst", new String(new char[] { '(', makeChar(Constants.LCONST_0), '|', makeChar(Constants.LCONST_1), ')' }));
- map.put("dconst", new String(new char[] { '(', makeChar(Constants.DCONST_0), '|', makeChar(Constants.DCONST_1), ')' }));
- map.put("fconst", new String(new char[] { '(', makeChar(Constants.FCONST_0), '|', makeChar(Constants.FCONST_1), ')' }));
- map.put("lload", precompile(Constants.LLOAD_0, Constants.LLOAD_3, Constants.LLOAD));
- map.put("iload", precompile(Constants.ILOAD_0, Constants.ILOAD_3, Constants.ILOAD));
- map.put("dload", precompile(Constants.DLOAD_0, Constants.DLOAD_3, Constants.DLOAD));
- map.put("fload", precompile(Constants.FLOAD_0, Constants.FLOAD_3, Constants.FLOAD));
- map.put("aload", precompile(Constants.ALOAD_0, Constants.ALOAD_3, Constants.ALOAD));
- map.put("lstore", precompile(Constants.LSTORE_0, Constants.LSTORE_3, Constants.LSTORE));
- map.put("istore", precompile(Constants.ISTORE_0, Constants.ISTORE_3, Constants.ISTORE));
- map.put("dstore", precompile(Constants.DSTORE_0, Constants.DSTORE_3, Constants.DSTORE));
- map.put("fstore", precompile(Constants.FSTORE_0, Constants.FSTORE_3, Constants.FSTORE));
- map.put("astore", precompile(Constants.ASTORE_0, Constants.ASTORE_3, Constants.ASTORE));
+ map.put("iconst", precompile(Const.ICONST_0, Const.ICONST_5, Const.ICONST_M1));
+ map.put("lconst", new String(new char[] { '(', makeChar(Const.LCONST_0), '|', makeChar(Const.LCONST_1), ')' }));
+ map.put("dconst", new String(new char[] { '(', makeChar(Const.DCONST_0), '|', makeChar(Const.DCONST_1), ')' }));
+ map.put("fconst", new String(new char[] { '(', makeChar(Const.FCONST_0), '|', makeChar(Const.FCONST_1), ')' }));
+ map.put("lload", precompile(Const.LLOAD_0, Const.LLOAD_3, Const.LLOAD));
+ map.put("iload", precompile(Const.ILOAD_0, Const.ILOAD_3, Const.ILOAD));
+ map.put("dload", precompile(Const.DLOAD_0, Const.DLOAD_3, Const.DLOAD));
+ map.put("fload", precompile(Const.FLOAD_0, Const.FLOAD_3, Const.FLOAD));
+ map.put("aload", precompile(Const.ALOAD_0, Const.ALOAD_3, Const.ALOAD));
+ map.put("lstore", precompile(Const.LSTORE_0, Const.LSTORE_3, Const.LSTORE));
+ map.put("istore", precompile(Const.ISTORE_0, Const.ISTORE_3, Const.ISTORE));
+ map.put("dstore", precompile(Const.DSTORE_0, Const.DSTORE_3, Const.DSTORE));
+ map.put("fstore", precompile(Const.FSTORE_0, Const.FSTORE_3, Const.FSTORE));
+ map.put("astore", precompile(Const.ASTORE_0, Const.ASTORE_3, Const.ASTORE));
// Compile strings
for (Map.Entry<String, String> entry : map.entrySet()) {
String key = entry.getKey();
@@ -369,7 +369,7 @@ public class InstructionFinder {
// Add instruction alias to match anything
StringBuilder buf = new StringBuilder("(");
for (short i = 0; i < NO_OPCODES; i++) {
- if (Constants.getNoOfOperands(i) != Constants.UNDEFINED) { // Not an invalid opcode
+ if (Const.getNoOfOperands(i) != Const.UNDEFINED) { // Not an invalid opcode
buf.append(makeChar(i));
if (i < NO_OPCODES - 1) {
buf.append('|');