Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleAnnotations.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleAnnotations.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleAnnotations.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleAnnotations.java Fri Sep 11 00:30:19 2015 @@ -21,7 +21,7 @@ import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * represents an annotation that is represented in the class file but is not @@ -45,7 +45,7 @@ public class RuntimeInvisibleAnnotations public RuntimeInvisibleAnnotations(int name_index, int length, DataInput input, ConstantPool constant_pool) throws IOException { - super(Constants.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS, name_index, length, input, constant_pool, false); + super(Const.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS, name_index, length, input, constant_pool, false); } /**
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleParameterAnnotations.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleParameterAnnotations.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleParameterAnnotations.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeInvisibleParameterAnnotations.java Fri Sep 11 00:30:19 2015 @@ -20,7 +20,7 @@ package org.apache.commons.bcel6.classfi import java.io.DataInput; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * Represents a parameter annotation that is represented in the class file @@ -39,6 +39,6 @@ public class RuntimeInvisibleParameterAn */ public RuntimeInvisibleParameterAnnotations(int name_index, int length, DataInput input, ConstantPool constant_pool) throws IOException { - super(Constants.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS, name_index, length, input, constant_pool); + super(Const.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS, name_index, length, input, constant_pool); } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleAnnotations.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleAnnotations.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleAnnotations.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleAnnotations.java Fri Sep 11 00:30:19 2015 @@ -21,7 +21,7 @@ import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * represents an annotation that is represented in the class file and is @@ -44,7 +44,7 @@ public class RuntimeVisibleAnnotations e */ public RuntimeVisibleAnnotations(int name_index, int length, DataInput input, ConstantPool constant_pool) throws IOException { - super(Constants.ATTR_RUNTIME_VISIBLE_ANNOTATIONS, name_index, length, input, constant_pool, true); + super(Const.ATTR_RUNTIME_VISIBLE_ANNOTATIONS, name_index, length, input, constant_pool, true); } /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleParameterAnnotations.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleParameterAnnotations.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleParameterAnnotations.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/RuntimeVisibleParameterAnnotations.java Fri Sep 11 00:30:19 2015 @@ -20,7 +20,7 @@ package org.apache.commons.bcel6.classfi import java.io.DataInput; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * Represents a parameter annotation that is represented in the class file @@ -39,6 +39,6 @@ public class RuntimeVisibleParameterAnno */ public RuntimeVisibleParameterAnnotations(int name_index, int length, DataInput input, ConstantPool constant_pool) throws IOException { - super(Constants.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, name_index, length, input, constant_pool); + super(Const.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, name_index, length, input, constant_pool); } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Signature.java Fri Sep 11 00:30:19 2015 @@ -22,7 +22,7 @@ import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class is derived from <em>Attribute</em> and represents a reference @@ -66,7 +66,7 @@ public final class Signature extends Att * @param constant_pool Array of constants */ public Signature(int name_index, int length, int signature_index, ConstantPool constant_pool) { - super(Constants.ATTR_SIGNATURE, name_index, length, constant_pool); + super(Const.ATTR_SIGNATURE, name_index, length, constant_pool); this.signature_index = signature_index; } @@ -119,7 +119,7 @@ public final class Signature extends Att */ public final String getSignature() { ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(signature_index, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return c.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java Fri Sep 11 00:30:19 2015 @@ -20,7 +20,7 @@ package org.apache.commons.bcel6.classfi import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * @since 6.0 @@ -55,7 +55,7 @@ public class SimpleElementValue extends "Dont call getValueString() on a non STRING ElementValue"); } ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(getIndex(), - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return c.getBytes(); } @@ -66,7 +66,7 @@ public class SimpleElementValue extends "Dont call getValueString() on a non STRING ElementValue"); } ConstantInteger c = (ConstantInteger) super.getConstantPool().getConstant(getIndex(), - Constants.CONSTANT_Integer); + Const.CONSTANT_Integer); return c.getBytes(); } @@ -77,7 +77,7 @@ public class SimpleElementValue extends "Dont call getValueByte() on a non BYTE ElementValue"); } ConstantInteger c = (ConstantInteger) super.getConstantPool().getConstant(getIndex(), - Constants.CONSTANT_Integer); + Const.CONSTANT_Integer); return (byte) c.getBytes(); } @@ -88,7 +88,7 @@ public class SimpleElementValue extends "Dont call getValueChar() on a non CHAR ElementValue"); } ConstantInteger c = (ConstantInteger) super.getConstantPool().getConstant(getIndex(), - Constants.CONSTANT_Integer); + Const.CONSTANT_Integer); return (char) c.getBytes(); } @@ -158,42 +158,42 @@ public class SimpleElementValue extends { case PRIMITIVE_INT: ConstantInteger c = (ConstantInteger) cpool.getConstant(getIndex(), - Constants.CONSTANT_Integer); + Const.CONSTANT_Integer); return Integer.toString(c.getBytes()); case PRIMITIVE_LONG: ConstantLong j = (ConstantLong) cpool.getConstant(getIndex(), - Constants.CONSTANT_Long); + Const.CONSTANT_Long); return Long.toString(j.getBytes()); case PRIMITIVE_DOUBLE: ConstantDouble d = (ConstantDouble) cpool.getConstant(getIndex(), - Constants.CONSTANT_Double); + Const.CONSTANT_Double); return Double.toString(d.getBytes()); case PRIMITIVE_FLOAT: ConstantFloat f = (ConstantFloat) cpool.getConstant(getIndex(), - Constants.CONSTANT_Float); + Const.CONSTANT_Float); return Float.toString(f.getBytes()); case PRIMITIVE_SHORT: ConstantInteger s = (ConstantInteger) cpool.getConstant(getIndex(), - Constants.CONSTANT_Integer); + Const.CONSTANT_Integer); return Integer.toString(s.getBytes()); case PRIMITIVE_BYTE: ConstantInteger b = (ConstantInteger) cpool.getConstant(getIndex(), - Constants.CONSTANT_Integer); + Const.CONSTANT_Integer); return Integer.toString(b.getBytes()); case PRIMITIVE_CHAR: ConstantInteger ch = (ConstantInteger) cpool.getConstant( - getIndex(), Constants.CONSTANT_Integer); + getIndex(), Const.CONSTANT_Integer); return String.valueOf((char)ch.getBytes()); case PRIMITIVE_BOOLEAN: ConstantInteger bo = (ConstantInteger) cpool.getConstant( - getIndex(), Constants.CONSTANT_Integer); + getIndex(), Const.CONSTANT_Integer); if (bo.getBytes() == 0) { return "false"; } return "true"; case STRING: ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(getIndex(), - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return cu8.getBytes(); default: throw new RuntimeException( Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SourceFile.java Fri Sep 11 00:30:19 2015 @@ -21,7 +21,7 @@ import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class is derived from <em>Attribute</em> and represents a reference @@ -74,7 +74,7 @@ public final class SourceFile extends At * many cases, the JVM. */ public SourceFile(int name_index, int length, int sourcefile_index, ConstantPool constant_pool) { - super(Constants.ATTR_SOURCE_FILE, name_index, length, constant_pool); + super(Const.ATTR_SOURCE_FILE, name_index, length, constant_pool); this.sourcefile_index = sourcefile_index; } @@ -126,7 +126,7 @@ public final class SourceFile extends At */ public final String getSourceFileName() { ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(sourcefile_index, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return c.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java Fri Sep 11 00:30:19 2015 @@ -21,7 +21,7 @@ import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class represents a stack map attribute used for @@ -49,7 +49,7 @@ public final class StackMap extends Attr * @param constant_pool Array of constants */ public StackMap(int name_index, int length, StackMapEntry[] map, ConstantPool constant_pool) { - super(Constants.ATTR_STACK_MAP, name_index, length, constant_pool); + super(Const.ATTR_STACK_MAP, name_index, length, constant_pool); this.map = map; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapEntry.java Fri Sep 11 00:30:19 2015 @@ -20,7 +20,7 @@ package org.apache.commons.bcel6.classfi import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class represents a stack map entry recording the types of @@ -50,29 +50,29 @@ public final class StackMapEntry impleme StackMapEntry(DataInput input, ConstantPool constant_pool) throws IOException { this(input.readByte() & 0xFF, -1, null, null, constant_pool); - if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) { - byte_code_offset = frame_type - Constants.SAME_FRAME; - } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && - frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - byte_code_offset = frame_type - Constants.SAME_LOCALS_1_STACK_ITEM_FRAME; + if (frame_type >= Const.SAME_FRAME && frame_type <= Const.SAME_FRAME_MAX) { + byte_code_offset = frame_type - Const.SAME_FRAME; + } else if (frame_type >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && + frame_type <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { + byte_code_offset = frame_type - Const.SAME_LOCALS_1_STACK_ITEM_FRAME; types_of_stack_items = new StackMapType[1]; types_of_stack_items[0] = new StackMapType(input, constant_pool); - } else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { byte_code_offset = input.readShort(); types_of_stack_items = new StackMapType[1]; types_of_stack_items[0] = new StackMapType(input, constant_pool); - } else if (frame_type >= Constants.CHOP_FRAME && frame_type <= Constants.CHOP_FRAME_MAX) { + } else if (frame_type >= Const.CHOP_FRAME && frame_type <= Const.CHOP_FRAME_MAX) { byte_code_offset = input.readShort(); - } else if (frame_type == Constants.SAME_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_FRAME_EXTENDED) { byte_code_offset = input.readShort(); - } else if (frame_type >= Constants.APPEND_FRAME && frame_type <= Constants.APPEND_FRAME_MAX) { + } else if (frame_type >= Const.APPEND_FRAME && frame_type <= Const.APPEND_FRAME_MAX) { byte_code_offset = input.readShort(); int number_of_locals = frame_type - 251; types_of_locals = new StackMapType[number_of_locals]; for (int i = 0; i < number_of_locals; i++) { types_of_locals[i] = new StackMapType(input, constant_pool); } - } else if (frame_type == Constants.FULL_FRAME) { + } else if (frame_type == Const.FULL_FRAME) { byte_code_offset = input.readShort(); int number_of_locals = input.readShort(); types_of_locals = new StackMapType[number_of_locals]; @@ -139,24 +139,24 @@ public final class StackMapEntry impleme */ public final void dump( DataOutputStream file ) throws IOException { file.write(frame_type); - if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) { + if (frame_type >= Const.SAME_FRAME && frame_type <= Const.SAME_FRAME_MAX) { // nothing to be done - } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && - frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { + } else if (frame_type >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && + frame_type <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { types_of_stack_items[0].dump(file); - } else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { file.writeShort(byte_code_offset); types_of_stack_items[0].dump(file); - } else if (frame_type >= Constants.CHOP_FRAME && frame_type <= Constants.CHOP_FRAME_MAX) { + } else if (frame_type >= Const.CHOP_FRAME && frame_type <= Const.CHOP_FRAME_MAX) { file.writeShort(byte_code_offset); - } else if (frame_type == Constants.SAME_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_FRAME_EXTENDED) { file.writeShort(byte_code_offset); - } else if (frame_type >= Constants.APPEND_FRAME && frame_type <= Constants.APPEND_FRAME_MAX) { + } else if (frame_type >= Const.APPEND_FRAME && frame_type <= Const.APPEND_FRAME_MAX) { file.writeShort(byte_code_offset); for (StackMapType type : types_of_locals) { type.dump(file); } - } else if (frame_type == Constants.FULL_FRAME) { + } else if (frame_type == Const.FULL_FRAME) { file.writeShort(byte_code_offset); file.writeShort(types_of_locals.length); for (StackMapType type : types_of_locals) { @@ -180,20 +180,20 @@ public final class StackMapEntry impleme public final String toString() { StringBuilder buf = new StringBuilder(64); buf.append("("); - if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) { + if (frame_type >= Const.SAME_FRAME && frame_type <= Const.SAME_FRAME_MAX) { buf.append("SAME"); - } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && - frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { + } else if (frame_type >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && + frame_type <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { buf.append("SAME_LOCALS_1_STACK"); - } else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { buf.append("SAME_LOCALS_1_STACK_EXTENDED"); - } else if (frame_type >= Constants.CHOP_FRAME && frame_type <= Constants.CHOP_FRAME_MAX) { + } else if (frame_type >= Const.CHOP_FRAME && frame_type <= Const.CHOP_FRAME_MAX) { buf.append("CHOP ").append(String.valueOf(251-frame_type)); - } else if (frame_type == Constants.SAME_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_FRAME_EXTENDED) { buf.append("SAME_EXTENDED"); - } else if (frame_type >= Constants.APPEND_FRAME && frame_type <= Constants.APPEND_FRAME_MAX) { + } else if (frame_type >= Const.APPEND_FRAME && frame_type <= Const.APPEND_FRAME_MAX) { buf.append("APPEND ").append(String.valueOf(frame_type-251)); - } else if (frame_type == Constants.FULL_FRAME) { + } else if (frame_type == Const.FULL_FRAME) { buf.append("FULL"); } else { buf.append("UNKNOWN (").append(frame_type).append(")"); @@ -229,24 +229,24 @@ public final class StackMapEntry impleme * */ int getMapEntrySize() { - if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) { + if (frame_type >= Const.SAME_FRAME && frame_type <= Const.SAME_FRAME_MAX) { return 1; - } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && - frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { + } else if (frame_type >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && + frame_type <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { return 1 + (types_of_stack_items[0].hasIndex() ? 3 : 1); - } else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { return 3 + (types_of_stack_items[0].hasIndex() ? 3 : 1); - } else if (frame_type >= Constants.CHOP_FRAME && frame_type <= Constants.CHOP_FRAME_MAX) { + } else if (frame_type >= Const.CHOP_FRAME && frame_type <= Const.CHOP_FRAME_MAX) { return 3; - } else if (frame_type == Constants.SAME_FRAME_EXTENDED) { + } else if (frame_type == Const.SAME_FRAME_EXTENDED) { return 3; - } else if (frame_type >= Constants.APPEND_FRAME && frame_type <= Constants.APPEND_FRAME_MAX) { + } else if (frame_type >= Const.APPEND_FRAME && frame_type <= Const.APPEND_FRAME_MAX) { int len = 3; for (int i = 0; i < types_of_locals.length; i++) { len += types_of_locals[i].hasIndex() ? 3 : 1; } return len; - } else if (frame_type == Constants.FULL_FRAME) { + } else if (frame_type == Const.FULL_FRAME) { int len = 7; for (int i = 0; i < types_of_locals.length; i++) { len += types_of_locals[i].hasIndex() ? 3 : 1; @@ -262,16 +262,16 @@ public final class StackMapEntry impleme public void setFrameType( int f ) { - if (f >= Constants.SAME_FRAME && f <= Constants.SAME_FRAME_MAX) { - byte_code_offset = f - Constants.SAME_FRAME; - } else if (f >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && - f <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - byte_code_offset = f - Constants.SAME_LOCALS_1_STACK_ITEM_FRAME; - } else if (f == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f >= Constants.CHOP_FRAME && f <= Constants.CHOP_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f == Constants.SAME_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f >= Constants.APPEND_FRAME && f <= Constants.APPEND_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f == Constants.FULL_FRAME) { // CHECKSTYLE IGNORE EmptyBlock + if (f >= Const.SAME_FRAME && f <= Const.SAME_FRAME_MAX) { + byte_code_offset = f - Const.SAME_FRAME; + } else if (f >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && + f <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { + byte_code_offset = f - Const.SAME_LOCALS_1_STACK_ITEM_FRAME; + } else if (f == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock + } else if (f >= Const.CHOP_FRAME && f <= Const.CHOP_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock + } else if (f == Const.SAME_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock + } else if (f >= Const.APPEND_FRAME && f <= Const.APPEND_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock + } else if (f == Const.FULL_FRAME) { // CHECKSTYLE IGNORE EmptyBlock } else { throw new RuntimeException("Invalid StackMap frame_type"); } @@ -289,27 +289,27 @@ public final class StackMapEntry impleme throw new RuntimeException("Invalid StackMap offset: " + new_offset); } - if (frame_type >= Constants.SAME_FRAME && - frame_type <= Constants.SAME_FRAME_MAX) { - if (new_offset > Constants.SAME_FRAME_MAX) { - frame_type = Constants.SAME_FRAME_EXTENDED; + if (frame_type >= Const.SAME_FRAME && + frame_type <= Const.SAME_FRAME_MAX) { + if (new_offset > Const.SAME_FRAME_MAX) { + frame_type = Const.SAME_FRAME_EXTENDED; } else { frame_type = new_offset; } - } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && - frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - if (new_offset > Constants.SAME_FRAME_MAX) { - frame_type = Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED; + } else if (frame_type >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && + frame_type <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { + if (new_offset > Const.SAME_FRAME_MAX) { + frame_type = Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED; } else { - frame_type = Constants.SAME_LOCALS_1_STACK_ITEM_FRAME + new_offset; + frame_type = Const.SAME_LOCALS_1_STACK_ITEM_FRAME + new_offset; } - } else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frame_type >= Constants.CHOP_FRAME && - frame_type <= Constants.CHOP_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frame_type == Constants.SAME_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frame_type >= Constants.APPEND_FRAME && - frame_type <= Constants.APPEND_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frame_type == Constants.FULL_FRAME) { // CHECKSTYLE IGNORE EmptyBlock + } else if (frame_type == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock + } else if (frame_type >= Const.CHOP_FRAME && + frame_type <= Const.CHOP_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock + } else if (frame_type == Const.SAME_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock + } else if (frame_type >= Const.APPEND_FRAME && + frame_type <= Const.APPEND_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock + } else if (frame_type == Const.FULL_FRAME) { // CHECKSTYLE IGNORE EmptyBlock } else { throw new RuntimeException("Invalid StackMap frame_type: " + frame_type); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java Fri Sep 11 00:30:19 2015 @@ -21,7 +21,7 @@ import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class represents the type of a local variable or item on stack @@ -30,7 +30,7 @@ import org.apache.commons.bcel6.Constant * @version $Id$ * @see StackMapEntry * @see StackMap - * @see Constants + * @see Const */ public final class StackMapType implements Cloneable { @@ -58,7 +58,7 @@ public final class StackMapType implemen * @param index index to constant pool, or byte code offset */ public StackMapType(byte type, int index, ConstantPool constant_pool) { - if ((type < Constants.ITEM_Bogus) || (type > Constants.ITEM_NewObject)) { + if ((type < Const.ITEM_Bogus) || (type > Const.ITEM_NewObject)) { throw new RuntimeException("Illegal type for StackMapType: " + type); } this.type = type; @@ -68,7 +68,7 @@ public final class StackMapType implemen public void setType( byte t ) { - if ((t < Constants.ITEM_Bogus) || (t > Constants.ITEM_NewObject)) { + if ((t < Const.ITEM_Bogus) || (t > Const.ITEM_NewObject)) { throw new RuntimeException("Illegal type for StackMapType: " + t); } type = t; @@ -110,17 +110,17 @@ public final class StackMapType implemen /** @return true, if type is either ITEM_Object or ITEM_NewObject */ public final boolean hasIndex() { - return type == Constants.ITEM_Object || type == Constants.ITEM_NewObject; + return type == Const.ITEM_Object || type == Const.ITEM_NewObject; } private String printIndex() { - if (type == Constants.ITEM_Object) { + if (type == Const.ITEM_Object) { if (index < 0) { return ", class=<unknown>"; } - return ", class=" + constant_pool.constantToString(index, Constants.CONSTANT_Class); - } else if (type == Constants.ITEM_NewObject) { + return ", class=" + constant_pool.constantToString(index, Const.CONSTANT_Class); + } else if (type == Const.ITEM_NewObject) { return ", offset=" + index; } else { return ""; @@ -133,7 +133,7 @@ public final class StackMapType implemen */ @Override public final String toString() { - return "(type=" + Constants.getItemName(type) + printIndex() + ")"; + return "(type=" + Const.getItemName(type) + printIndex() + ")"; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Synthetic.java Fri Sep 11 00:30:19 2015 @@ -21,7 +21,7 @@ import java.io.DataInput; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class is derived from <em>Attribute</em> and declares this class as @@ -58,7 +58,7 @@ public final class Synthetic extends Att * with. */ public Synthetic(int name_index, int length, byte[] bytes, ConstantPool constant_pool) { - super(Constants.ATTR_SYNTHETIC, name_index, length, constant_pool); + super(Const.ATTR_SYNTHETIC, name_index, length, constant_pool); this.bytes = bytes; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Unknown.java Fri Sep 11 00:30:19 2015 @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class represents a reference to an unknown (i.e., @@ -73,9 +73,9 @@ public final class Unknown extends Attri * @param constant_pool Array of constants */ public Unknown(int name_index, int length, byte[] bytes, ConstantPool constant_pool) { - super(Constants.ATTR_UNKNOWN, name_index, length, constant_pool); + super(Const.ATTR_UNKNOWN, name_index, length, constant_pool); this.bytes = bytes; - name = ((ConstantUtf8) constant_pool.getConstant(name_index, Constants.CONSTANT_Utf8)) + name = ((ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8)) .getBytes(); unknown_attributes.put(name, this); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java Fri Sep 11 00:30:19 2015 @@ -34,7 +34,7 @@ import java.util.Locale; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; import org.apache.commons.bcel6.util.ByteSequence; /** @@ -102,7 +102,7 @@ public abstract class Utility { public static String accessToString( int access_flags, boolean for_class ) { StringBuilder buf = new StringBuilder(); int p = 0; - for (int i = 0; p < Constants.MAX_ACC_FLAG; i++) { // Loop through known flags + for (int i = 0; p < Const.MAX_ACC_FLAG; i++) { // Loop through known flags p = pow2(i); if ((access_flags & p) != 0) { /* Special case: Classes compiled with new compilers and with the @@ -110,10 +110,10 @@ public abstract class Utility { * because SUN used the same value for the flags `ACC_SUPER' and * `ACC_SYNCHRONIZED'. */ - if (for_class && ((p == Constants.ACC_SUPER) || (p == Constants.ACC_INTERFACE))) { + if (for_class && ((p == Const.ACC_SUPER) || (p == Const.ACC_INTERFACE))) { continue; } - buf.append(Constants.getAccessName(i)).append(" "); + buf.append(Const.getAccessName(i)).append(" "); } } return buf.toString().trim(); @@ -126,7 +126,7 @@ public abstract class Utility { * @return "class" or "interface", depending on the ACC_INTERFACE flag */ public static String classOrInterface( int access_flags ) { - return ((access_flags & Constants.ACC_INTERFACE) != 0) ? "interface" : "class"; + return ((access_flags & Const.ACC_INTERFACE) != 0) ? "interface" : "class"; } @@ -198,18 +198,18 @@ public abstract class Utility { int[] jump_table; int no_pad_bytes = 0; int offset; - StringBuilder buf = new StringBuilder(Constants.getOpcodeName(opcode)); + StringBuilder buf = new StringBuilder(Const.getOpcodeName(opcode)); /* 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++) { byte b; if ((b = bytes.readByte()) != 0) { System.err.println("Warning: Padding byte != 0 in " - + Constants.getOpcodeName(opcode) + ":" + b); + + Const.getOpcodeName(opcode) + ":" + b); } } // Both cases have a field default_offset in common @@ -218,7 +218,7 @@ public abstract class Utility { switch (opcode) { /* Table switch has variable length arguments. */ - case Constants.TABLESWITCH: + case Const.TABLESWITCH: low = bytes.readInt(); high = bytes.readInt(); offset = bytes.getIndex() - 12 - no_pad_bytes - 1; @@ -237,7 +237,7 @@ public abstract class Utility { break; /* Lookup switch has variable length arguments. */ - case Constants.LOOKUPSWITCH: { + case Const.LOOKUPSWITCH: { npairs = bytes.readInt(); offset = bytes.getIndex() - 8 - no_pad_bytes - 1; match = new int[npairs]; @@ -259,45 +259,45 @@ public abstract class Utility { /* 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.JSR: - 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 Const.GOTO: + case Const.IFEQ: + case Const.IFGE: + case Const.IFGT: + case Const.IFLE: + case Const.IFLT: + case Const.JSR: + 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: buf.append("\t\t#").append((bytes.getIndex() - 1) + bytes.readShort()); break; /* 32-bit wide jumps */ - case Constants.GOTO_W: - case Constants.JSR_W: + case Const.GOTO_W: + case Const.JSR_W: buf.append("\t\t#").append((bytes.getIndex() - 1) + bytes.readInt()); 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.readUnsignedShort(); wide = false; // Clear flag @@ -311,42 +311,42 @@ public abstract class Utility { * following instruction. Relies on that the method is called again with * the following opcode. */ - case Constants.WIDE: + case Const.WIDE: wide = true; buf.append("\t(wide)"); break; /* Array of basic type. */ - case Constants.NEWARRAY: - buf.append("\t\t<").append(Constants.getTypeName(bytes.readByte())).append(">"); + case Const.NEWARRAY: + buf.append("\t\t<").append(Const.getTypeName(bytes.readByte())).append(">"); 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.readUnsignedShort(); buf.append("\t\t").append( - constant_pool.constantToString(index, Constants.CONSTANT_Fieldref)).append( + constant_pool.constantToString(index, Const.CONSTANT_Fieldref)).append( verbose ? " (" + index + ")" : ""); break; /* Operands are references to classes in constant pool */ - case Constants.NEW: - case Constants.CHECKCAST: + case Const.NEW: + case Const.CHECKCAST: buf.append("\t"); //$FALL-THROUGH$ - case Constants.INSTANCEOF: + case Const.INSTANCEOF: index = bytes.readUnsignedShort(); buf.append("\t<").append( - constant_pool.constantToString(index, Constants.CONSTANT_Class)) + constant_pool.constantToString(index, Const.CONSTANT_Class)) .append(">").append(verbose ? " (" + index + ")" : ""); break; /* Operands are references to methods in constant pool */ - case Constants.INVOKESPECIAL: - case Constants.INVOKESTATIC: + case Const.INVOKESPECIAL: + case Const.INVOKESTATIC: index = bytes.readUnsignedShort(); Constant c = constant_pool.getConstant(index); // With Java8 operand may be either a CONSTANT_Methodref @@ -355,40 +355,40 @@ public abstract class Utility { constant_pool.constantToString(index, c.getTag())) .append(verbose ? " (" + index + ")" : ""); break; - case Constants.INVOKEVIRTUAL: + case Const.INVOKEVIRTUAL: index = bytes.readUnsignedShort(); buf.append("\t").append( - constant_pool.constantToString(index, Constants.CONSTANT_Methodref)) + constant_pool.constantToString(index, Const.CONSTANT_Methodref)) .append(verbose ? " (" + index + ")" : ""); break; - case Constants.INVOKEINTERFACE: + case Const.INVOKEINTERFACE: index = bytes.readUnsignedShort(); int nargs = bytes.readUnsignedByte(); // historical, redundant buf.append("\t").append( constant_pool - .constantToString(index, Constants.CONSTANT_InterfaceMethodref)) + .constantToString(index, Const.CONSTANT_InterfaceMethodref)) .append(verbose ? " (" + index + ")\t" : "").append(nargs).append("\t") .append(bytes.readUnsignedByte()); // Last byte is a reserved space break; - case Constants.INVOKEDYNAMIC: + case Const.INVOKEDYNAMIC: index = bytes.readUnsignedShort(); buf.append("\t").append( constant_pool - .constantToString(index, Constants.CONSTANT_InvokeDynamic)) + .constantToString(index, Const.CONSTANT_InvokeDynamic)) .append(verbose ? " (" + index + ")\t" : "") .append(bytes.readUnsignedByte()) // Thrid byte is a reserved space .append(bytes.readUnsignedByte()); // Last byte is a reserved space 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.readUnsignedShort(); buf.append("\t\t").append( constant_pool.constantToString(index, constant_pool.getConstant(index) .getTag())).append(verbose ? " (" + index + ")" : ""); break; - case Constants.LDC: + case Const.LDC: index = bytes.readUnsignedByte(); buf.append("\t\t").append( constant_pool.constantToString(index, constant_pool.getConstant(index) @@ -396,27 +396,27 @@ public abstract class Utility { break; /* Array of references. */ - case Constants.ANEWARRAY: + case Const.ANEWARRAY: index = bytes.readUnsignedShort(); buf.append("\t\t<").append( compactClassName(constant_pool.getConstantString(index, - Constants.CONSTANT_Class), false)).append(">").append( + Const.CONSTANT_Class), false)).append(">").append( verbose ? " (" + index + ")" : ""); break; /* Multidimensional array of references. */ - case Constants.MULTIANEWARRAY: { + case Const.MULTIANEWARRAY: { index = bytes.readUnsignedShort(); int dimensions = bytes.readUnsignedByte(); buf.append("\t<").append( compactClassName(constant_pool.getConstantString(index, - Constants.CONSTANT_Class), false)).append(">\t").append(dimensions) + Const.CONSTANT_Class), false)).append(">\t").append(dimensions) .append(verbose ? " (" + index + ")" : ""); } break; /* Increment local variable. */ - case Constants.IINC: + case Const.IINC: if (wide) { vindex = bytes.readUnsignedShort(); constant = bytes.readShort(); @@ -428,17 +428,17 @@ public abstract class Utility { buf.append("\t\t%").append(vindex).append("\t").append(constant); break; default: - if (Constants.getNoOfOperands(opcode) > 0) { - for (int i = 0; i < Constants.getOperandTypeCount(opcode); i++) { + if (Const.getNoOfOperands(opcode) > 0) { + for (int i = 0; i < Const.getOperandTypeCount(opcode); i++) { buf.append("\t\t"); - switch (Constants.getOperandType(opcode, i)) { - case Constants.T_BYTE: + switch (Const.getOperandType(opcode, i)) { + case Const.T_BYTE: buf.append(bytes.readByte()); break; - case Constants.T_SHORT: + case Const.T_SHORT: buf.append(bytes.readShort()); break; - case Constants.T_INT: + case Const.T_INT: buf.append(bytes.readInt()); break; default: // Never reached @@ -986,10 +986,10 @@ public abstract class Utility { buf.append('['); } boolean found = false; - for (int i = Constants.T_BOOLEAN; (i <= Constants.T_VOID) && !found; i++) { - if (Constants.getTypeName(i).equals(type)) { + for (int i = Const.T_BOOLEAN; (i <= Const.T_VOID) && !found; i++) { + if (Const.getTypeName(i).equals(type)) { found = true; - buf.append(Constants.getShortTypeName(i)); + buf.append(Const.getShortTypeName(i)); } } if (!found) { @@ -1035,7 +1035,7 @@ public abstract class Utility { * * @param signature in format described above * @return type of method signature - * @see Constants + * @see Const * * @throws ClassFormatException if signature is not a method signature */ @@ -1058,7 +1058,7 @@ public abstract class Utility { * * @param signature in format described above * @return type of signature - * @see Constants + * @see Const * * @throws ClassFormatException if signature isn't a known type */ @@ -1066,28 +1066,28 @@ public abstract class Utility { try { switch (signature.charAt(0)) { case 'B': - return Constants.T_BYTE; + return Const.T_BYTE; case 'C': - return Constants.T_CHAR; + return Const.T_CHAR; case 'D': - return Constants.T_DOUBLE; + return Const.T_DOUBLE; case 'F': - return Constants.T_FLOAT; + return Const.T_FLOAT; case 'I': - return Constants.T_INT; + return Const.T_INT; case 'J': - return Constants.T_LONG; + return Const.T_LONG; case 'L': case 'T': - return Constants.T_REFERENCE; + return Const.T_REFERENCE; case '[': - return Constants.T_ARRAY; + return Const.T_ARRAY; case 'V': - return Constants.T_VOID; + return Const.T_VOID; case 'Z': - return Constants.T_BOOLEAN; + return Const.T_BOOLEAN; case 'S': - return Constants.T_SHORT; + return Const.T_SHORT; default: throw new ClassFormatException("Invalid method signature: " + signature); } @@ -1101,8 +1101,8 @@ public abstract class Utility { */ public static short searchOpcode( String name ) { name = name.toLowerCase(Locale.ENGLISH); - for (short i = 0; i < Constants.OPCODE_NAMES_LENGTH; i++) { - if (Constants.getOpcodeName(i).equals(name)) { + for (short i = 0; i < Const.OPCODE_NAMES_LENGTH; i++) { + if (Const.getOpcodeName(i).equals(name)) { return i; } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AALOAD.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AALOAD.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class AALOAD extends ArrayInstruc /** Load reference from array */ public AALOAD() { - super(org.apache.commons.bcel6.Constants.AALOAD); + super(org.apache.commons.bcel6.Const.AALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AASTORE.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AASTORE.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class AASTORE extends ArrayInstru /** Store into reference array */ public AASTORE() { - super(org.apache.commons.bcel6.Constants.AASTORE); + super(org.apache.commons.bcel6.Const.AASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ACONST_NULL.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ACONST_NULL.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ACONST_NULL.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ACONST_NULL.java Fri Sep 11 00:30:19 2015 @@ -29,7 +29,7 @@ public class ACONST_NULL extends Instruc * Push null reference */ public ACONST_NULL() { - super(org.apache.commons.bcel6.Constants.ACONST_NULL, (short) 1); + super(org.apache.commons.bcel6.Const.ACONST_NULL, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ALOAD.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ALOAD.java Fri Sep 11 00:30:19 2015 @@ -30,7 +30,7 @@ public class ALOAD extends LoadInstructi * Instruction.readInstruction(). Not to be used otherwise. */ ALOAD() { - super(org.apache.commons.bcel6.Constants.ALOAD, org.apache.commons.bcel6.Constants.ALOAD_0); + super(org.apache.commons.bcel6.Const.ALOAD, org.apache.commons.bcel6.Const.ALOAD_0); } @@ -38,7 +38,7 @@ public class ALOAD extends LoadInstructi * @param n index of local variable */ public ALOAD(int n) { - super(org.apache.commons.bcel6.Constants.ALOAD, org.apache.commons.bcel6.Constants.ALOAD_0, n); + super(org.apache.commons.bcel6.Const.ALOAD, org.apache.commons.bcel6.Const.ALOAD_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ANEWARRAY.java Fri Sep 11 00:30:19 2015 @@ -37,7 +37,7 @@ public class ANEWARRAY extends CPInstruc public ANEWARRAY(int index) { - super(org.apache.commons.bcel6.Constants.ANEWARRAY, index); + super(org.apache.commons.bcel6.Const.ANEWARRAY, index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARETURN.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARETURN.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARETURN.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARETURN.java Fri Sep 11 00:30:19 2015 @@ -29,7 +29,7 @@ public class ARETURN extends ReturnInstr * Return reference from method */ public ARETURN() { - super(org.apache.commons.bcel6.Constants.ARETURN); + super(org.apache.commons.bcel6.Const.ARETURN); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ARRAYLENGTH.java Fri Sep 11 00:30:19 2015 @@ -30,7 +30,7 @@ public class ARRAYLENGTH extends Instruc /** Get length of array */ public ARRAYLENGTH() { - super(org.apache.commons.bcel6.Constants.ARRAYLENGTH, (short) 1); + super(org.apache.commons.bcel6.Const.ARRAYLENGTH, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ASTORE.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ASTORE.java Fri Sep 11 00:30:19 2015 @@ -30,7 +30,7 @@ public class ASTORE extends StoreInstruc * Instruction.readInstruction(). Not to be used otherwise. */ ASTORE() { - super(org.apache.commons.bcel6.Constants.ASTORE, org.apache.commons.bcel6.Constants.ASTORE_0); + super(org.apache.commons.bcel6.Const.ASTORE, org.apache.commons.bcel6.Const.ASTORE_0); } @@ -38,7 +38,7 @@ public class ASTORE extends StoreInstruc * @param n index of local variable */ public ASTORE(int n) { - super(org.apache.commons.bcel6.Constants.ASTORE, org.apache.commons.bcel6.Constants.ASTORE_0, n); + super(org.apache.commons.bcel6.Const.ASTORE, org.apache.commons.bcel6.Const.ASTORE_0, n); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ATHROW.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ATHROW.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ATHROW.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ATHROW.java Fri Sep 11 00:30:19 2015 @@ -31,7 +31,7 @@ public class ATHROW extends Instruction * Throw exception */ public ATHROW() { - super(org.apache.commons.bcel6.Constants.ATHROW, (short) 1); + super(org.apache.commons.bcel6.Const.ATHROW, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArithmeticInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArithmeticInstruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArithmeticInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArithmeticInstruction.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; /** * Super class for the family of arithmetic instructions. @@ -49,45 +49,45 @@ public abstract class ArithmeticInstruct public Type getType( ConstantPoolGen cp ) { final short _opcode = super.getOpcode(); switch (_opcode) { - case Constants.DADD: - case Constants.DDIV: - case Constants.DMUL: - case Constants.DNEG: - case Constants.DREM: - case Constants.DSUB: + case Const.DADD: + case Const.DDIV: + case Const.DMUL: + case Const.DNEG: + case Const.DREM: + case Const.DSUB: return Type.DOUBLE; - case Constants.FADD: - case Constants.FDIV: - case Constants.FMUL: - case Constants.FNEG: - case Constants.FREM: - case Constants.FSUB: + case Const.FADD: + case Const.FDIV: + case Const.FMUL: + case Const.FNEG: + case Const.FREM: + case Const.FSUB: return Type.FLOAT; - case Constants.IADD: - case Constants.IAND: - case Constants.IDIV: - case Constants.IMUL: - case Constants.INEG: - case Constants.IOR: - case Constants.IREM: - case Constants.ISHL: - case Constants.ISHR: - case Constants.ISUB: - case Constants.IUSHR: - case Constants.IXOR: + case Const.IADD: + case Const.IAND: + case Const.IDIV: + case Const.IMUL: + case Const.INEG: + case Const.IOR: + case Const.IREM: + case Const.ISHL: + case Const.ISHR: + case Const.ISUB: + case Const.IUSHR: + case Const.IXOR: return Type.INT; - case Constants.LADD: - case Constants.LAND: - case Constants.LDIV: - case Constants.LMUL: - case Constants.LNEG: - case Constants.LOR: - case Constants.LREM: - case Constants.LSHL: - case Constants.LSHR: - case Constants.LSUB: - case Constants.LUSHR: - case Constants.LXOR: + case Const.LADD: + case Const.LAND: + case Const.LDIV: + case Const.LMUL: + case Const.LNEG: + case Const.LOR: + case Const.LREM: + case Const.LSHL: + case Const.LSHR: + case Const.LSUB: + case Const.LUSHR: + case Const.LXOR: return Type.LONG; default: // Never reached throw new ClassGenException("Unknown type " + _opcode); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayInstruction.java Fri Sep 11 00:30:19 2015 @@ -55,29 +55,29 @@ public abstract class ArrayInstruction e public Type getType( ConstantPoolGen cp ) { final short _opcode = super.getOpcode(); switch (_opcode) { - case org.apache.commons.bcel6.Constants.IALOAD: - case org.apache.commons.bcel6.Constants.IASTORE: + case org.apache.commons.bcel6.Const.IALOAD: + case org.apache.commons.bcel6.Const.IASTORE: return Type.INT; - case org.apache.commons.bcel6.Constants.CALOAD: - case org.apache.commons.bcel6.Constants.CASTORE: + case org.apache.commons.bcel6.Const.CALOAD: + case org.apache.commons.bcel6.Const.CASTORE: return Type.CHAR; - case org.apache.commons.bcel6.Constants.BALOAD: - case org.apache.commons.bcel6.Constants.BASTORE: + case org.apache.commons.bcel6.Const.BALOAD: + case org.apache.commons.bcel6.Const.BASTORE: return Type.BYTE; - case org.apache.commons.bcel6.Constants.SALOAD: - case org.apache.commons.bcel6.Constants.SASTORE: + case org.apache.commons.bcel6.Const.SALOAD: + case org.apache.commons.bcel6.Const.SASTORE: return Type.SHORT; - case org.apache.commons.bcel6.Constants.LALOAD: - case org.apache.commons.bcel6.Constants.LASTORE: + case org.apache.commons.bcel6.Const.LALOAD: + case org.apache.commons.bcel6.Const.LASTORE: return Type.LONG; - case org.apache.commons.bcel6.Constants.DALOAD: - case org.apache.commons.bcel6.Constants.DASTORE: + case org.apache.commons.bcel6.Const.DALOAD: + case org.apache.commons.bcel6.Const.DASTORE: return Type.DOUBLE; - case org.apache.commons.bcel6.Constants.FALOAD: - case org.apache.commons.bcel6.Constants.FASTORE: + case org.apache.commons.bcel6.Const.FALOAD: + case org.apache.commons.bcel6.Const.FASTORE: return Type.FLOAT; - case org.apache.commons.bcel6.Constants.AALOAD: - case org.apache.commons.bcel6.Constants.AASTORE: + case org.apache.commons.bcel6.Const.AALOAD: + case org.apache.commons.bcel6.Const.AASTORE: return Type.OBJECT; default: throw new ClassGenException("Oops: unknown case in switch" + _opcode); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.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; /** * Denotes array type, such as int[][] @@ -56,17 +56,17 @@ public final class ArrayType extends Ref * @param type type of array (may be an array itself) */ public ArrayType(Type type, int dimensions) { - super(Constants.T_ARRAY, "<dummy>"); - if ((dimensions < 1) || (dimensions > Constants.MAX_BYTE)) { + super(Const.T_ARRAY, "<dummy>"); + if ((dimensions < 1) || (dimensions > Const.MAX_BYTE)) { throw new ClassGenException("Invalid number of dimensions: " + dimensions); } switch (type.getType()) { - case Constants.T_ARRAY: + case Const.T_ARRAY: ArrayType array = (ArrayType) type; this.dimensions = dimensions + array.dimensions; basic_type = array.basic_type; break; - case Constants.T_VOID: + case Const.T_VOID: throw new ClassGenException("Invalid type: void[]"); default: // Basic type or reference this.dimensions = dimensions; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BALOAD.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BALOAD.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class BALOAD extends ArrayInstruc /** Load byte or boolean from array */ public BALOAD() { - super(org.apache.commons.bcel6.Constants.BALOAD); + super(org.apache.commons.bcel6.Const.BALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BASTORE.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BASTORE.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class BASTORE extends ArrayInstru /** Store byte or boolean into array */ public BASTORE() { - super(org.apache.commons.bcel6.Constants.BASTORE); + super(org.apache.commons.bcel6.Const.BASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BIPUSH.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BIPUSH.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BIPUSH.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BIPUSH.java Fri Sep 11 00:30:19 2015 @@ -45,7 +45,7 @@ public class BIPUSH extends Instruction /** Push byte on stack */ public BIPUSH(byte b) { - super(org.apache.commons.bcel6.Constants.BIPUSH, (short) 2); + super(org.apache.commons.bcel6.Const.BIPUSH, (short) 2); this.b = b; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BREAKPOINT.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BREAKPOINT.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BREAKPOINT.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BREAKPOINT.java Fri Sep 11 00:30:19 2015 @@ -25,7 +25,7 @@ package org.apache.commons.bcel6.generic public class BREAKPOINT extends Instruction { public BREAKPOINT() { - super(org.apache.commons.bcel6.Constants.BREAKPOINT, (short) 1); + super(org.apache.commons.bcel6.Const.BREAKPOINT, (short) 1); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BasicType.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; /** * Denotes basic type such as int. @@ -30,11 +30,11 @@ public final class BasicType extends Typ * Constructor for basic types such as int, long, `void' * * @param type one of T_INT, T_BOOLEAN, ..., T_VOID - * @see Constants + * @see Const */ BasicType(byte type) { - super(type, Constants.getShortTypeName(type)); - if ((type < Constants.T_BOOLEAN) || (type > Constants.T_VOID)) { + super(type, Const.getShortTypeName(type)); + if ((type < Const.T_BOOLEAN) || (type > Const.T_VOID)) { throw new ClassGenException("Invalid type: " + type); } } @@ -43,23 +43,23 @@ public final class BasicType extends Typ // @since 6.0 no longer final public static BasicType getType( byte type ) { switch (type) { - case Constants.T_VOID: + case Const.T_VOID: return VOID; - case Constants.T_BOOLEAN: + case Const.T_BOOLEAN: return BOOLEAN; - case Constants.T_BYTE: + case Const.T_BYTE: return BYTE; - case Constants.T_SHORT: + case Const.T_SHORT: return SHORT; - case Constants.T_CHAR: + case Const.T_CHAR: return CHAR; - case Constants.T_INT: + case Const.T_INT: return INT; - case Constants.T_LONG: + case Const.T_LONG: return LONG; - case Constants.T_DOUBLE: + case Const.T_DOUBLE: return DOUBLE; - case Constants.T_FLOAT: + case Const.T_FLOAT: return FLOAT; default: throw new ClassGenException("Invalid type: " + type); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CALOAD.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CALOAD.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CALOAD.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CALOAD.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class CALOAD extends ArrayInstruc /** Load char from array */ public CALOAD() { - super(org.apache.commons.bcel6.Constants.CALOAD); + super(org.apache.commons.bcel6.Const.CALOAD); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CASTORE.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CASTORE.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CASTORE.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CASTORE.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class CASTORE extends ArrayInstru /** Store char into array */ public CASTORE() { - super(org.apache.commons.bcel6.Constants.CASTORE); + super(org.apache.commons.bcel6.Const.CASTORE); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CHECKCAST.java Fri Sep 11 00:30:19 2015 @@ -40,7 +40,7 @@ public class CHECKCAST extends CPInstruc * @param index index to class in constant pool */ public CHECKCAST(int index) { - super(org.apache.commons.bcel6.Constants.CHECKCAST, index); + super(org.apache.commons.bcel6.Const.CHECKCAST, index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java Fri Sep 11 00:30:19 2015 @@ -98,7 +98,7 @@ public abstract class CPInstruction exte if (c instanceof ConstantClass) { str = str.replace('.', '/'); } - return org.apache.commons.bcel6.Constants.getOpcodeName(super.getOpcode()) + " " + str; + return org.apache.commons.bcel6.Const.getOpcodeName(super.getOpcode()) + " " + str; } @@ -141,7 +141,7 @@ public abstract class CPInstruction exte @Override public Type getType( ConstantPoolGen cpg ) { ConstantPool cp = cpg.getConstantPool(); - String name = cp.getConstantString(index, org.apache.commons.bcel6.Constants.CONSTANT_Class); + String name = cp.getConstantString(index, org.apache.commons.bcel6.Const.CONSTANT_Class); if (!name.startsWith("[")) { name = "L" + name + ";"; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.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.AccessFlags; import org.apache.commons.bcel6.classfile.AnnotationEntry; import org.apache.commons.bcel6.classfile.Annotations; @@ -50,8 +50,8 @@ public class ClassGen extends AccessFlag private final String file_name; private int class_name_index = -1; private int superclass_name_index = -1; - private int major = Constants.MAJOR_1_1; - private int minor = Constants.MINOR_1_1; + private int major = Const.MAJOR_1_1; + private int minor = Const.MINOR_1_1; private ConstantPoolGen cp; // Template for building up constant pool // ArrayLists instead of arrays to gather fields, methods, etc. private final List<Field> field_vec = new ArrayList<>(); @@ -500,14 +500,14 @@ public class ClassGen extends AccessFlag public void setClassNameIndex( int class_name_index ) { this.class_name_index = class_name_index; class_name = cp.getConstantPool().getConstantString(class_name_index, - Constants.CONSTANT_Class).replace('/', '.'); + Const.CONSTANT_Class).replace('/', '.'); } public void setSuperclassNameIndex( int superclass_name_index ) { this.superclass_name_index = superclass_name_index; super_class_name = cp.getConstantPool().getConstantString(superclass_name_index, - Constants.CONSTANT_Class).replace('/', '.'); + Const.CONSTANT_Class).replace('/', '.'); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java Fri Sep 11 00:30:19 2015 @@ -20,7 +20,7 @@ package org.apache.commons.bcel6.generic import java.util.HashMap; import java.util.Map; -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.ConstantCP; import org.apache.commons.bcel6.classfile.ConstantClass; @@ -764,35 +764,35 @@ public class ConstantPoolGen { public int addConstant( Constant c, ConstantPoolGen cp ) { Constant[] constants = cp.getConstantPool().getConstantPool(); switch (c.getTag()) { - case Constants.CONSTANT_String: { + case Const.CONSTANT_String: { ConstantString s = (ConstantString) c; ConstantUtf8 u8 = (ConstantUtf8) constants[s.getStringIndex()]; return addString(u8.getBytes()); } - case Constants.CONSTANT_Class: { + case Const.CONSTANT_Class: { ConstantClass s = (ConstantClass) c; ConstantUtf8 u8 = (ConstantUtf8) constants[s.getNameIndex()]; return addClass(u8.getBytes()); } - case Constants.CONSTANT_NameAndType: { + case Const.CONSTANT_NameAndType: { ConstantNameAndType n = (ConstantNameAndType) c; ConstantUtf8 u8 = (ConstantUtf8) constants[n.getNameIndex()]; ConstantUtf8 u8_2 = (ConstantUtf8) constants[n.getSignatureIndex()]; return addNameAndType(u8.getBytes(), u8_2.getBytes()); } - case Constants.CONSTANT_Utf8: + case Const.CONSTANT_Utf8: return addUtf8(((ConstantUtf8) c).getBytes()); - case Constants.CONSTANT_Double: + case Const.CONSTANT_Double: return addDouble(((ConstantDouble) c).getBytes()); - case Constants.CONSTANT_Float: + case Const.CONSTANT_Float: return addFloat(((ConstantFloat) c).getBytes()); - case Constants.CONSTANT_Long: + case Const.CONSTANT_Long: return addLong(((ConstantLong) c).getBytes()); - case Constants.CONSTANT_Integer: + case Const.CONSTANT_Integer: return addInteger(((ConstantInteger) c).getBytes()); - case Constants.CONSTANT_InterfaceMethodref: - case Constants.CONSTANT_Methodref: - case Constants.CONSTANT_Fieldref: { + case Const.CONSTANT_InterfaceMethodref: + case Const.CONSTANT_Methodref: + case Const.CONSTANT_Fieldref: { ConstantCP m = (ConstantCP) c; ConstantClass clazz = (ConstantClass) constants[m.getClassIndex()]; ConstantNameAndType n = (ConstantNameAndType) constants[m.getNameAndTypeIndex()]; @@ -803,11 +803,11 @@ public class ConstantPoolGen { u8 = (ConstantUtf8) constants[n.getSignatureIndex()]; String signature = u8.getBytes(); switch (c.getTag()) { - case Constants.CONSTANT_InterfaceMethodref: + case Const.CONSTANT_InterfaceMethodref: return addInterfaceMethodref(class_name, name, signature); - case Constants.CONSTANT_Methodref: + case Const.CONSTANT_Methodref: return addMethodref(class_name, name, signature); - case Constants.CONSTANT_Fieldref: + case Const.CONSTANT_Fieldref: return addFieldref(class_name, name, signature); default: // Never reached throw new RuntimeException("Unknown constant type " + c); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConversionInstruction.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConversionInstruction.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConversionInstruction.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConversionInstruction.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; /** * Super class for the x2y family of instructions. @@ -49,27 +49,27 @@ public abstract class ConversionInstruct public Type getType( ConstantPoolGen cp ) { final short _opcode = super.getOpcode(); switch (_opcode) { - case Constants.D2I: - case Constants.F2I: - case Constants.L2I: + case Const.D2I: + case Const.F2I: + case Const.L2I: return Type.INT; - case Constants.D2F: - case Constants.I2F: - case Constants.L2F: + case Const.D2F: + case Const.I2F: + case Const.L2F: return Type.FLOAT; - case Constants.D2L: - case Constants.F2L: - case Constants.I2L: + case Const.D2L: + case Const.F2L: + case Const.I2L: return Type.LONG; - case Constants.F2D: - case Constants.I2D: - case Constants.L2D: + case Const.F2D: + case Const.I2D: + case Const.L2D: return Type.DOUBLE; - case Constants.I2B: + case Const.I2B: return Type.BYTE; - case Constants.I2C: + case Const.I2C: return Type.CHAR; - case Constants.I2S: + case Const.I2S: return Type.SHORT; default: // Never reached throw new ClassGenException("Unknown type " + _opcode); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/D2F.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/D2F.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/D2F.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/D2F.java Fri Sep 11 00:30:19 2015 @@ -28,7 +28,7 @@ public class D2F extends ConversionInstr /** Convert double to float */ public D2F() { - super(org.apache.commons.bcel6.Constants.D2F); + super(org.apache.commons.bcel6.Const.D2F); }
