Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AccessFlags.java Fri Sep 11 00:30:19 2015 @@ -17,7 +17,7 @@ */ package org.apache.commons.bcel6.classfile; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * Super class for all objects that have modifiers like private, final, ... @@ -92,151 +92,151 @@ public abstract class AccessFlags { public final void isPublic( boolean flag ) { - setFlag(Constants.ACC_PUBLIC, flag); + setFlag(Const.ACC_PUBLIC, flag); } public final boolean isPublic() { - return (access_flags & Constants.ACC_PUBLIC) != 0; + return (access_flags & Const.ACC_PUBLIC) != 0; } public final void isPrivate( boolean flag ) { - setFlag(Constants.ACC_PRIVATE, flag); + setFlag(Const.ACC_PRIVATE, flag); } public final boolean isPrivate() { - return (access_flags & Constants.ACC_PRIVATE) != 0; + return (access_flags & Const.ACC_PRIVATE) != 0; } public final void isProtected( boolean flag ) { - setFlag(Constants.ACC_PROTECTED, flag); + setFlag(Const.ACC_PROTECTED, flag); } public final boolean isProtected() { - return (access_flags & Constants.ACC_PROTECTED) != 0; + return (access_flags & Const.ACC_PROTECTED) != 0; } public final void isStatic( boolean flag ) { - setFlag(Constants.ACC_STATIC, flag); + setFlag(Const.ACC_STATIC, flag); } public final boolean isStatic() { - return (access_flags & Constants.ACC_STATIC) != 0; + return (access_flags & Const.ACC_STATIC) != 0; } public final void isFinal( boolean flag ) { - setFlag(Constants.ACC_FINAL, flag); + setFlag(Const.ACC_FINAL, flag); } public final boolean isFinal() { - return (access_flags & Constants.ACC_FINAL) != 0; + return (access_flags & Const.ACC_FINAL) != 0; } public final void isSynchronized( boolean flag ) { - setFlag(Constants.ACC_SYNCHRONIZED, flag); + setFlag(Const.ACC_SYNCHRONIZED, flag); } public final boolean isSynchronized() { - return (access_flags & Constants.ACC_SYNCHRONIZED) != 0; + return (access_flags & Const.ACC_SYNCHRONIZED) != 0; } public final void isVolatile( boolean flag ) { - setFlag(Constants.ACC_VOLATILE, flag); + setFlag(Const.ACC_VOLATILE, flag); } public final boolean isVolatile() { - return (access_flags & Constants.ACC_VOLATILE) != 0; + return (access_flags & Const.ACC_VOLATILE) != 0; } public final void isTransient( boolean flag ) { - setFlag(Constants.ACC_TRANSIENT, flag); + setFlag(Const.ACC_TRANSIENT, flag); } public final boolean isTransient() { - return (access_flags & Constants.ACC_TRANSIENT) != 0; + return (access_flags & Const.ACC_TRANSIENT) != 0; } public final void isNative( boolean flag ) { - setFlag(Constants.ACC_NATIVE, flag); + setFlag(Const.ACC_NATIVE, flag); } public final boolean isNative() { - return (access_flags & Constants.ACC_NATIVE) != 0; + return (access_flags & Const.ACC_NATIVE) != 0; } public final void isInterface( boolean flag ) { - setFlag(Constants.ACC_INTERFACE, flag); + setFlag(Const.ACC_INTERFACE, flag); } public final boolean isInterface() { - return (access_flags & Constants.ACC_INTERFACE) != 0; + return (access_flags & Const.ACC_INTERFACE) != 0; } public final void isAbstract( boolean flag ) { - setFlag(Constants.ACC_ABSTRACT, flag); + setFlag(Const.ACC_ABSTRACT, flag); } public final boolean isAbstract() { - return (access_flags & Constants.ACC_ABSTRACT) != 0; + return (access_flags & Const.ACC_ABSTRACT) != 0; } public final void isStrictfp( boolean flag ) { - setFlag(Constants.ACC_STRICT, flag); + setFlag(Const.ACC_STRICT, flag); } public final boolean isStrictfp() { - return (access_flags & Constants.ACC_STRICT) != 0; + return (access_flags & Const.ACC_STRICT) != 0; } public final void isSynthetic( boolean flag ) { - setFlag(Constants.ACC_SYNTHETIC, flag); + setFlag(Const.ACC_SYNTHETIC, flag); } public final boolean isSynthetic() { - return (access_flags & Constants.ACC_SYNTHETIC) != 0; + return (access_flags & Const.ACC_SYNTHETIC) != 0; } public final void isAnnotation( boolean flag ) { - setFlag(Constants.ACC_ANNOTATION, flag); + setFlag(Const.ACC_ANNOTATION, flag); } public final boolean isAnnotation() { - return (access_flags & Constants.ACC_ANNOTATION) != 0; + return (access_flags & Const.ACC_ANNOTATION) != 0; } public final void isEnum( boolean flag ) { - setFlag(Constants.ACC_ENUM, flag); + setFlag(Const.ACC_ENUM, flag); } public final boolean isEnum() { - return (access_flags & Constants.ACC_ENUM) != 0; + return (access_flags & Const.ACC_ENUM) != 0; } }
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationDefault.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationDefault.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationDefault.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationDefault.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 the default value of a annotation for a method info @@ -51,7 +51,7 @@ public class AnnotationDefault extends A * @param constant_pool Array of constants */ public AnnotationDefault(int name_index, int length, ElementValue defaultValue, ConstantPool constant_pool) { - super(Constants.ATTR_ANNOTATION_DEFAULT, name_index, length, constant_pool); + super(Const.ATTR_ANNOTATION_DEFAULT, name_index, length, constant_pool); this.default_value = defaultValue; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java Fri Sep 11 00:30:19 2015 @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * represents one annotation in the annotation table @@ -95,7 +95,7 @@ public class AnnotationEntry implements * @return the annotation type name */ public String getAnnotationType() { - final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(type_index, Constants.CONSTANT_Utf8); + final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(type_index, Const.CONSTANT_Utf8); return c.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java Fri Sep 11 00:30:19 2015 @@ -24,7 +24,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; /** * Abstract super class for <em>Attribute</em> objects. Currently the @@ -168,19 +168,19 @@ public abstract class Attribute implemen public static Attribute readAttribute(DataInput file, ConstantPool constant_pool) throws IOException, ClassFormatException { - byte tag = Constants.ATTR_UNKNOWN; // Unknown attribute + byte tag = Const.ATTR_UNKNOWN; // Unknown attribute // Get class name from constant pool via `name_index' indirection int name_index = file.readUnsignedShort(); - ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Constants.CONSTANT_Utf8); + ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8); String name = c.getBytes(); // Length of data in bytes int length = file.readInt(); // Compare strings to find known attribute - for (byte i = 0; i < Constants.KNOWN_ATTRIBUTES; i++) + for (byte i = 0; i < Const.KNOWN_ATTRIBUTES; i++) { - if (name.equals(Constants.getAttributeName(i))) + if (name.equals(Const.getAttributeName(i))) { tag = i; // found! break; @@ -190,56 +190,56 @@ public abstract class Attribute implemen // Call proper constructor, depending on `tag' switch (tag) { - case Constants.ATTR_UNKNOWN: + case Const.ATTR_UNKNOWN: Object r = readers.get(name); if (r instanceof UnknownAttributeReader) { return ((UnknownAttributeReader) r).createAttribute(name_index, length, file, constant_pool); } return new Unknown(name_index, length, file, constant_pool); - case Constants.ATTR_CONSTANT_VALUE: + case Const.ATTR_CONSTANT_VALUE: return new ConstantValue(name_index, length, file, constant_pool); - case Constants.ATTR_SOURCE_FILE: + case Const.ATTR_SOURCE_FILE: return new SourceFile(name_index, length, file, constant_pool); - case Constants.ATTR_CODE: + case Const.ATTR_CODE: return new Code(name_index, length, file, constant_pool); - case Constants.ATTR_EXCEPTIONS: + case Const.ATTR_EXCEPTIONS: return new ExceptionTable(name_index, length, file, constant_pool); - case Constants.ATTR_LINE_NUMBER_TABLE: + case Const.ATTR_LINE_NUMBER_TABLE: return new LineNumberTable(name_index, length, file, constant_pool); - case Constants.ATTR_LOCAL_VARIABLE_TABLE: + case Const.ATTR_LOCAL_VARIABLE_TABLE: return new LocalVariableTable(name_index, length, file, constant_pool); - case Constants.ATTR_INNER_CLASSES: + case Const.ATTR_INNER_CLASSES: return new InnerClasses(name_index, length, file, constant_pool); - case Constants.ATTR_SYNTHETIC: + case Const.ATTR_SYNTHETIC: return new Synthetic(name_index, length, file, constant_pool); - case Constants.ATTR_DEPRECATED: + case Const.ATTR_DEPRECATED: return new Deprecated(name_index, length, file, constant_pool); - case Constants.ATTR_PMG: + case Const.ATTR_PMG: return new PMGClass(name_index, length, file, constant_pool); - case Constants.ATTR_SIGNATURE: + case Const.ATTR_SIGNATURE: return new Signature(name_index, length, file, constant_pool); - case Constants.ATTR_STACK_MAP: + case Const.ATTR_STACK_MAP: return new StackMap(name_index, length, file, constant_pool); - case Constants.ATTR_RUNTIME_VISIBLE_ANNOTATIONS: + case Const.ATTR_RUNTIME_VISIBLE_ANNOTATIONS: return new RuntimeVisibleAnnotations(name_index, length, file, constant_pool); - case Constants.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS: + case Const.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS: return new RuntimeInvisibleAnnotations(name_index, length, file, constant_pool); - case Constants.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS: + case Const.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS: return new RuntimeVisibleParameterAnnotations(name_index, length, file, constant_pool); - case Constants.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS: + case Const.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS: return new RuntimeInvisibleParameterAnnotations(name_index, length, file, constant_pool); - case Constants.ATTR_ANNOTATION_DEFAULT: + case Const.ATTR_ANNOTATION_DEFAULT: return new AnnotationDefault(name_index, length, file, constant_pool); - case Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE: + case Const.ATTR_LOCAL_VARIABLE_TYPE_TABLE: return new LocalVariableTypeTable(name_index, length, file, constant_pool); - case Constants.ATTR_ENCLOSING_METHOD: + case Const.ATTR_ENCLOSING_METHOD: return new EnclosingMethod(name_index, length, file, constant_pool); - case Constants.ATTR_STACK_MAP_TABLE: + case Const.ATTR_STACK_MAP_TABLE: return new StackMap(name_index, length, file, constant_pool); - case Constants.ATTR_BOOTSTRAP_METHODS: + case Const.ATTR_BOOTSTRAP_METHODS: return new BootstrapMethods(name_index, length, file, constant_pool); - case Constants.ATTR_METHOD_PARAMETERS: + case Const.ATTR_METHOD_PARAMETERS: return new MethodParameters(name_index, length, file, constant_pool); default: // Never reached @@ -253,7 +253,7 @@ public abstract class Attribute implemen */ public String getName() { - ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Constants.CONSTANT_Utf8); + ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8); return c.getBytes(); } @@ -347,6 +347,6 @@ public abstract class Attribute implemen @Override public String toString() { - return Constants.getAttributeName(tag); + return Const.getAttributeName(tag); } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java Fri Sep 11 00:30:19 2015 @@ -22,7 +22,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class represents a bootstrap method attribute, i.e., the bootstrap @@ -128,7 +128,7 @@ public class BootstrapMethod implements StringBuilder buf = new StringBuilder(); String bootstrap_method_name; bootstrap_method_name = constant_pool.constantToString(bootstrap_method_ref, - Constants.CONSTANT_MethodHandle); + Const.CONSTANT_MethodHandle); buf.append(Utility.compactClassName(bootstrap_method_name)); final int num_bootstrap_arguments = bootstrap_arguments.length; if (num_bootstrap_arguments > 0) { Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.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 BootstrapMethods attribute. @@ -50,7 +50,7 @@ public class BootstrapMethods extends At * @param constant_pool Array of constants */ public BootstrapMethods(int name_index, int length, BootstrapMethod[] bootstrap_methods, ConstantPool constant_pool) { - super(Constants.ATTR_BOOTSTRAP_METHODS, name_index, length, constant_pool); + super(Const.ATTR_BOOTSTRAP_METHODS, name_index, length, constant_pool); this.bootstrap_methods = bootstrap_methods; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassElementValue.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassElementValue.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassElementValue.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassElementValue.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 @@ -46,7 +46,7 @@ public class ClassElementValue extends E public String getClassString() { ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(idx, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return c.getBytes(); } @@ -54,7 +54,7 @@ public class ClassElementValue extends E public String stringifyValue() { ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(idx, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return cu8.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java Fri Sep 11 00:30:19 2015 @@ -25,7 +25,7 @@ import java.io.InputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * Wrapper class that parses a given Java .class file. The method <A @@ -214,11 +214,11 @@ public final class ClassParser { /* Interfaces are implicitely abstract, the flag should be set * according to the JVM specification. */ - if ((access_flags & Constants.ACC_INTERFACE) != 0) { - access_flags |= Constants.ACC_ABSTRACT; + if ((access_flags & Const.ACC_INTERFACE) != 0) { + access_flags |= Const.ACC_ABSTRACT; } - if (((access_flags & Constants.ACC_ABSTRACT) != 0) - && ((access_flags & Constants.ACC_FINAL) != 0)) { + if (((access_flags & Const.ACC_ABSTRACT) != 0) + && ((access_flags & Const.ACC_FINAL) != 0)) { throw new ClassFormatException("Class " + file_name + " can't be both final and abstract"); } class_name_index = dataInputStream.readUnsignedShort(); @@ -258,7 +258,7 @@ public final class ClassParser { * @throws ClassFormatException */ private void readID() throws IOException, ClassFormatException { - if (dataInputStream.readInt() != Constants.JVM_CLASSFILE_MAGIC) { + if (dataInputStream.readInt() != Const.JVM_CLASSFILE_MAGIC) { throw new ClassFormatException(file_name + " is not a Java .class file"); } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.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 chunk of Java byte code contained in a @@ -110,7 +110,7 @@ public final class Code extends Attribut */ public Code(int name_index, int length, int max_stack, int max_locals, byte[] code, CodeException[] exception_table, Attribute[] attributes, ConstantPool constant_pool) { - super(Constants.ATTR_CODE, name_index, length, constant_pool); + super(Const.ATTR_CODE, name_index, length, constant_pool); this.max_stack = max_stack; this.max_locals = max_locals; this.code = code != null ? code : new byte[0]; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/CodeException.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 an entry in the exception table of the <em>Code</em> @@ -191,7 +191,7 @@ public final class CodeException impleme if (catch_type == 0) { str = "<Any exception>(0)"; } else { - str = Utility.compactClassName(cp.getConstantString(catch_type, Constants.CONSTANT_Class), false) + str = Utility.compactClassName(cp.getConstantString(catch_type, Const.CONSTANT_Class), false) + (verbose ? "(" + catch_type + ")" : ""); } return start_pc + "\t" + end_pc + "\t" + handler_pc + "\t" + str; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.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; import org.apache.commons.bcel6.util.BCELComparator; /** @@ -97,7 +97,7 @@ public abstract class Constant implement */ @Override public String toString() { - return Constants.getConstantName(tag) + "[" + tag + "]"; + return Const.getConstantName(tag) + "[" + tag + "]"; } @@ -135,33 +135,33 @@ public abstract class Constant implement ClassFormatException { byte b = input.readByte(); // Read tag byte switch (b) { - case Constants.CONSTANT_Class: + case Const.CONSTANT_Class: return new ConstantClass(input); - case Constants.CONSTANT_Fieldref: + case Const.CONSTANT_Fieldref: return new ConstantFieldref(input); - case Constants.CONSTANT_Methodref: + case Const.CONSTANT_Methodref: return new ConstantMethodref(input); - case Constants.CONSTANT_InterfaceMethodref: + case Const.CONSTANT_InterfaceMethodref: return new ConstantInterfaceMethodref(input); - case Constants.CONSTANT_String: + case Const.CONSTANT_String: return new ConstantString(input); - case Constants.CONSTANT_Integer: + case Const.CONSTANT_Integer: return new ConstantInteger(input); - case Constants.CONSTANT_Float: + case Const.CONSTANT_Float: return new ConstantFloat(input); - case Constants.CONSTANT_Long: + case Const.CONSTANT_Long: return new ConstantLong(input); - case Constants.CONSTANT_Double: + case Const.CONSTANT_Double: return new ConstantDouble(input); - case Constants.CONSTANT_NameAndType: + case Const.CONSTANT_NameAndType: return new ConstantNameAndType(input); - case Constants.CONSTANT_Utf8: + case Const.CONSTANT_Utf8: return ConstantUtf8.getInstance(input); - case Constants.CONSTANT_MethodHandle: + case Const.CONSTANT_MethodHandle: return new ConstantMethodHandle(input); - case Constants.CONSTANT_MethodType: + case Const.CONSTANT_MethodType: return new ConstantMethodType(input); - case Constants.CONSTANT_InvokeDynamic: + case Const.CONSTANT_InvokeDynamic: return new ConstantInvokeDynamic(input); default: throw new ClassFormatException("Invalid byte tag in constant pool: " + b); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.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; /** * Abstract super class for Fieldref, Methodref, InterfaceMethodref and @@ -158,7 +158,7 @@ public abstract class ConstantCP extends * @return Class this field belongs to. */ public String getClass( ConstantPool cp ) { - return cp.constantToString(class_index, Constants.CONSTANT_Class); + return cp.constantToString(class_index, Const.CONSTANT_Class); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantClass.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 the abstract {@link Constant} @@ -59,7 +59,7 @@ public final class ConstantClass extends * ConstantUtf8. */ public ConstantClass(int name_index) { - super(Constants.CONSTANT_Class); + super(Const.CONSTANT_Class); this.name_index = name_index; } @@ -110,7 +110,7 @@ public final class ConstantClass extends */ @Override public Object getConstantValue( ConstantPool cp ) { - Constant c = cp.getConstant(name_index, Constants.CONSTANT_Utf8); + Constant c = cp.getConstant(name_index, Const.CONSTANT_Utf8); return ((ConstantUtf8) c).getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantDouble.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 the abstract {@link Constant} @@ -39,7 +39,7 @@ public final class ConstantDouble extend * @param bytes Data */ public ConstantDouble(double bytes) { - super(Constants.CONSTANT_Double); + super(Const.CONSTANT_Double); this.bytes = bytes; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFieldref.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFieldref.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFieldref.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFieldref.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; /** * This class represents a constant pool reference to a field. @@ -33,7 +33,7 @@ public final class ConstantFieldref exte * Initialize from another object. */ public ConstantFieldref(ConstantFieldref c) { - super(Constants.CONSTANT_Fieldref, c.getClassIndex(), c.getNameAndTypeIndex()); + super(Const.CONSTANT_Fieldref, c.getClassIndex(), c.getNameAndTypeIndex()); } @@ -44,7 +44,7 @@ public final class ConstantFieldref exte * @throws IOException */ ConstantFieldref(DataInput input) throws IOException { - super(Constants.CONSTANT_Fieldref, input); + super(Const.CONSTANT_Fieldref, input); } @@ -53,7 +53,7 @@ public final class ConstantFieldref exte * @param name_and_type_index and the Field signature */ public ConstantFieldref(int class_index, int name_and_type_index) { - super(Constants.CONSTANT_Fieldref, class_index, name_and_type_index); + super(Const.CONSTANT_Fieldref, class_index, name_and_type_index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantFloat.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 the abstract {@link Constant} @@ -39,7 +39,7 @@ public final class ConstantFloat extends * @param bytes Data */ public ConstantFloat(float bytes) { - super(Constants.CONSTANT_Float); + super(Const.CONSTANT_Float); this.bytes = bytes; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInteger.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 the abstract {@link Constant} @@ -39,7 +39,7 @@ public final class ConstantInteger exten * @param bytes Data */ public ConstantInteger(int bytes) { - super(Constants.CONSTANT_Integer); + super(Const.CONSTANT_Integer); this.bytes = bytes; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInterfaceMethodref.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInterfaceMethodref.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInterfaceMethodref.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInterfaceMethodref.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; /** * This class represents a constant pool reference to an interface method. @@ -33,7 +33,7 @@ public final class ConstantInterfaceMeth * Initialize from another object. */ public ConstantInterfaceMethodref(ConstantInterfaceMethodref c) { - super(Constants.CONSTANT_InterfaceMethodref, c.getClassIndex(), c.getNameAndTypeIndex()); + super(Const.CONSTANT_InterfaceMethodref, c.getClassIndex(), c.getNameAndTypeIndex()); } @@ -44,7 +44,7 @@ public final class ConstantInterfaceMeth * @throws IOException */ ConstantInterfaceMethodref(DataInput input) throws IOException { - super(Constants.CONSTANT_InterfaceMethodref, input); + super(Const.CONSTANT_InterfaceMethodref, input); } @@ -53,7 +53,7 @@ public final class ConstantInterfaceMeth * @param name_and_type_index and the method signature */ public ConstantInterfaceMethodref(int class_index, int name_and_type_index) { - super(Constants.CONSTANT_InterfaceMethodref, class_index, name_and_type_index); + super(Const.CONSTANT_InterfaceMethodref, class_index, name_and_type_index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInvokeDynamic.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInvokeDynamic.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInvokeDynamic.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantInvokeDynamic.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; /** * This class is derived from the abstract {@link Constant} @@ -53,7 +53,7 @@ public final class ConstantInvokeDynamic public ConstantInvokeDynamic(int bootstrap_method_attr_index, int name_and_type_index) { - super(Constants.CONSTANT_InvokeDynamic, bootstrap_method_attr_index, name_and_type_index); + super(Const.CONSTANT_InvokeDynamic, bootstrap_method_attr_index, name_and_type_index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantLong.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 the abstract {@link Constant} @@ -39,7 +39,7 @@ public final class ConstantLong extends * @param bytes Data */ public ConstantLong(long bytes) { - super(Constants.CONSTANT_Long); + super(Const.CONSTANT_Long); this.bytes = bytes; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodHandle.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 the abstract {@link Constant} @@ -56,7 +56,7 @@ public final class ConstantMethodHandle public ConstantMethodHandle(int reference_kind, int reference_index) { - super(Constants.CONSTANT_MethodHandle); + super(Const.CONSTANT_MethodHandle); this.reference_kind = reference_kind; this.reference_index = reference_index; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodType.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 the abstract {@link Constant} @@ -55,7 +55,7 @@ public final class ConstantMethodType ex public ConstantMethodType(int descriptor_index) { - super(Constants.CONSTANT_MethodType); + super(Const.CONSTANT_MethodType); this.descriptor_index = descriptor_index; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodref.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodref.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodref.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantMethodref.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; /** * This class represents a constant pool reference to a method. @@ -33,7 +33,7 @@ public final class ConstantMethodref ext * Initialize from another object. */ public ConstantMethodref(ConstantMethodref c) { - super(Constants.CONSTANT_Methodref, c.getClassIndex(), c.getNameAndTypeIndex()); + super(Const.CONSTANT_Methodref, c.getClassIndex(), c.getNameAndTypeIndex()); } @@ -44,7 +44,7 @@ public final class ConstantMethodref ext * @throws IOException */ ConstantMethodref(DataInput input) throws IOException { - super(Constants.CONSTANT_Methodref, input); + super(Const.CONSTANT_Methodref, input); } @@ -53,7 +53,7 @@ public final class ConstantMethodref ext * @param name_and_type_index and the method signature */ public ConstantMethodref(int class_index, int name_and_type_index) { - super(Constants.CONSTANT_Methodref, class_index, name_and_type_index); + super(Const.CONSTANT_Methodref, class_index, name_and_type_index); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantNameAndType.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 the abstract {@link Constant} @@ -61,7 +61,7 @@ public final class ConstantNameAndType e * @param signature_index and its signature */ public ConstantNameAndType(int name_index, int signature_index) { - super(Constants.CONSTANT_NameAndType); + super(Const.CONSTANT_NameAndType); this.name_index = name_index; this.signature_index = signature_index; } @@ -105,7 +105,7 @@ public final class ConstantNameAndType e /** @return name */ public final String getName( ConstantPool cp ) { - return cp.constantToString(getNameIndex(), Constants.CONSTANT_Utf8); + return cp.constantToString(getNameIndex(), Const.CONSTANT_Utf8); } @@ -120,7 +120,7 @@ public final class ConstantNameAndType e /** @return signature */ public final String getSignature( ConstantPool cp ) { - return cp.constantToString(getSignatureIndex(), Constants.CONSTANT_Utf8); + return cp.constantToString(getSignatureIndex(), Const.CONSTANT_Utf8); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.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 constant pool, i.e., a table of constants, of @@ -72,7 +72,7 @@ public class ConstantPool implements Clo * Thus we have to increment the index counter. */ tag = constant_pool[i].getTag(); - if ((tag == Constants.CONSTANT_Double) || (tag == Constants.CONSTANT_Long)) { + if ((tag == Const.CONSTANT_Double) || (tag == Const.CONSTANT_Long)) { i++; } } @@ -103,61 +103,61 @@ public class ConstantPool implements Clo int i; byte tag = c.getTag(); switch (tag) { - case Constants.CONSTANT_Class: + case Const.CONSTANT_Class: i = ((ConstantClass) c).getNameIndex(); - c = getConstant(i, Constants.CONSTANT_Utf8); + c = getConstant(i, Const.CONSTANT_Utf8); str = Utility.compactClassName(((ConstantUtf8) c).getBytes(), false); break; - case Constants.CONSTANT_String: + case Const.CONSTANT_String: i = ((ConstantString) c).getStringIndex(); - c = getConstant(i, Constants.CONSTANT_Utf8); + c = getConstant(i, Const.CONSTANT_Utf8); str = "\"" + escape(((ConstantUtf8) c).getBytes()) + "\""; break; - case Constants.CONSTANT_Utf8: + case Const.CONSTANT_Utf8: str = ((ConstantUtf8) c).getBytes(); break; - case Constants.CONSTANT_Double: + case Const.CONSTANT_Double: str = String.valueOf(((ConstantDouble) c).getBytes()); break; - case Constants.CONSTANT_Float: + case Const.CONSTANT_Float: str = String.valueOf(((ConstantFloat) c).getBytes()); break; - case Constants.CONSTANT_Long: + case Const.CONSTANT_Long: str = String.valueOf(((ConstantLong) c).getBytes()); break; - case Constants.CONSTANT_Integer: + case Const.CONSTANT_Integer: str = String.valueOf(((ConstantInteger) c).getBytes()); break; - case Constants.CONSTANT_NameAndType: + case Const.CONSTANT_NameAndType: str = constantToString(((ConstantNameAndType) c).getNameIndex(), - Constants.CONSTANT_Utf8) + Const.CONSTANT_Utf8) + ":" + constantToString(((ConstantNameAndType) c).getSignatureIndex(), - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); break; - case Constants.CONSTANT_InterfaceMethodref: - case Constants.CONSTANT_Methodref: - case Constants.CONSTANT_Fieldref: - str = constantToString(((ConstantCP) c).getClassIndex(), Constants.CONSTANT_Class) + case Const.CONSTANT_InterfaceMethodref: + case Const.CONSTANT_Methodref: + case Const.CONSTANT_Fieldref: + str = constantToString(((ConstantCP) c).getClassIndex(), Const.CONSTANT_Class) + "." + constantToString(((ConstantCP) c).getNameAndTypeIndex(), - Constants.CONSTANT_NameAndType); + Const.CONSTANT_NameAndType); break; - case Constants.CONSTANT_MethodHandle: + case Const.CONSTANT_MethodHandle: // Note that the ReferenceIndex may point to a Fieldref, Methodref or // InterfaceMethodref - so we need to peek ahead to get the actual type. ConstantMethodHandle cmh = (ConstantMethodHandle) c; - str = Constants.getMethodHandleName(cmh.getReferenceKind()) + str = Const.getMethodHandleName(cmh.getReferenceKind()) + " " + constantToString(cmh.getReferenceIndex(), getConstant(cmh.getReferenceIndex()).getTag()); break; - case Constants.CONSTANT_MethodType: + case Const.CONSTANT_MethodType: ConstantMethodType cmt = (ConstantMethodType) c; - str = constantToString(cmt.getDescriptorIndex(), Constants.CONSTANT_Utf8); + str = constantToString(cmt.getDescriptorIndex(), Const.CONSTANT_Utf8); break; - case Constants.CONSTANT_InvokeDynamic: + case Const.CONSTANT_InvokeDynamic: ConstantInvokeDynamic cid = (ConstantInvokeDynamic) c; str = cid.getBootstrapMethodAttrIndex() + ":" + constantToString(cid.getNameAndTypeIndex(), - Constants.CONSTANT_NameAndType); + Const.CONSTANT_NameAndType); break; default: // Never reached throw new RuntimeException("Unknown constant type " + tag); @@ -258,7 +258,7 @@ public class ConstantPool implements Clo throw new ClassFormatException("Constant pool at index " + index + " is null."); } if (c.getTag() != tag) { - throw new ClassFormatException("Expected class `" + Constants.getConstantName(tag) + throw new ClassFormatException("Expected class `" + Const.getConstantName(tag) + "' at index " + index + " and got " + c); } return c; @@ -299,17 +299,17 @@ public class ConstantPool implements Clo * variable name or by subclassing. */ switch (tag) { - case Constants.CONSTANT_Class: + case Const.CONSTANT_Class: i = ((ConstantClass) c).getNameIndex(); break; - case Constants.CONSTANT_String: + case Const.CONSTANT_String: i = ((ConstantString) c).getStringIndex(); break; default: throw new RuntimeException("getConstantString called with illegal tag " + tag); } // Finally get the string from the constant pool - c = getConstant(i, Constants.CONSTANT_Utf8); + c = getConstant(i, Const.CONSTANT_Utf8); return ((ConstantUtf8) c).getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantString.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 the abstract {@link Constant} @@ -58,7 +58,7 @@ public final class ConstantString extend * @param string_index Index of Constant_Utf8 in constant pool */ public ConstantString(int string_index) { - super(Constants.CONSTANT_String); + super(Const.CONSTANT_String); this.string_index = string_index; } @@ -118,7 +118,7 @@ public final class ConstantString extend */ @Override public Object getConstantValue( ConstantPool cp ) { - Constant c = cp.getConstant(string_index, Constants.CONSTANT_Utf8); + Constant c = cp.getConstant(string_index, Const.CONSTANT_Utf8); return ((ConstantUtf8) c).getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantUtf8.java Fri Sep 11 00:30:19 2015 @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; /** * This class is derived from the abstract {@link Constant} @@ -138,7 +138,7 @@ public final class ConstantUtf8 extends * @throws IOException */ ConstantUtf8(DataInput file) throws IOException { - super(Constants.CONSTANT_Utf8); + super(Const.CONSTANT_Utf8); bytes = file.readUTF(); created++; } @@ -148,7 +148,7 @@ public final class ConstantUtf8 extends * @param bytes Data */ public ConstantUtf8(String bytes) { - super(Constants.CONSTANT_Utf8); + super(Const.CONSTANT_Utf8); if (bytes == null) { throw new IllegalArgumentException("bytes must not be null!"); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantValue.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 constant @@ -67,7 +67,7 @@ public final class ConstantValue extends */ public ConstantValue(int name_index, int length, int constantvalue_index, ConstantPool constant_pool) { - super(Constants.ATTR_CONSTANT_VALUE, name_index, length, constant_pool); + super(Const.ATTR_CONSTANT_VALUE, name_index, length, constant_pool); this.constantvalue_index = constantvalue_index; } @@ -124,21 +124,21 @@ public final class ConstantValue extends int i; // Print constant to string depending on its type switch (c.getTag()) { - case Constants.CONSTANT_Long: + case Const.CONSTANT_Long: buf = String.valueOf(((ConstantLong) c).getBytes()); break; - case Constants.CONSTANT_Float: + case Const.CONSTANT_Float: buf = String.valueOf(((ConstantFloat) c).getBytes()); break; - case Constants.CONSTANT_Double: + case Const.CONSTANT_Double: buf = String.valueOf(((ConstantDouble) c).getBytes()); break; - case Constants.CONSTANT_Integer: + case Const.CONSTANT_Integer: buf = String.valueOf(((ConstantInteger) c).getBytes()); break; - case Constants.CONSTANT_String: + case Const.CONSTANT_String: i = ((ConstantString) c).getStringIndex(); - c = super.getConstantPool().getConstant(i, Constants.CONSTANT_Utf8); + c = super.getConstantPool().getConstant(i, Const.CONSTANT_Utf8); buf = "\"" + Utility.convertString(((ConstantUtf8) c).getBytes()) + "\""; break; default: Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Deprecated.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 denotes that this is a @@ -52,7 +52,7 @@ public final class Deprecated extends At * @param constant_pool Array of constants */ public Deprecated(int name_index, int length, byte[] bytes, ConstantPool constant_pool) { - super(Constants.ATTR_DEPRECATED, name_index, length, constant_pool); + super(Const.ATTR_DEPRECATED, name_index, length, constant_pool); this.bytes = bytes; } @@ -126,7 +126,7 @@ public final class Deprecated extends At */ @Override public final String toString() { - return Constants.getAttributeName(Constants.ATTR_DEPRECATED); + return Const.getAttributeName(Const.ATTR_DEPRECATED); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValuePair.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValuePair.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValuePair.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValuePair.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; /** * an annotation's element value pair @@ -47,7 +47,7 @@ public class ElementValuePair public String getNameString() { ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant( - elementNameIndex, Constants.CONSTANT_Utf8); + elementNameIndex, Const.CONSTANT_Utf8); return c.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnclosingMethod.java Fri Sep 11 00:30:19 2015 @@ -20,7 +20,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 attribute exists for local or @@ -50,7 +50,7 @@ public class EnclosingMethod extends Att } private EnclosingMethod(int nameIndex, int len, int classIdx,int methodIdx, ConstantPool cpool) { - super(Constants.ATTR_ENCLOSING_METHOD, nameIndex, len, cpool); + super(Const.ATTR_ENCLOSING_METHOD, nameIndex, len, cpool); classIndex = classIdx; methodIndex = methodIdx; } @@ -74,7 +74,7 @@ public class EnclosingMethod extends Att public final ConstantClass getEnclosingClass() { ConstantClass c = - (ConstantClass)super.getConstantPool().getConstant(classIndex,Constants.CONSTANT_Class); + (ConstantClass)super.getConstantPool().getConstant(classIndex,Const.CONSTANT_Class); return c; } @@ -83,7 +83,7 @@ public class EnclosingMethod extends Att return null; } ConstantNameAndType nat = - (ConstantNameAndType)super.getConstantPool().getConstant(methodIndex,Constants.CONSTANT_NameAndType); + (ConstantNameAndType)super.getConstantPool().getConstant(methodIndex,Const.CONSTANT_NameAndType); return nat; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnumElementValue.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnumElementValue.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnumElementValue.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EnumElementValue.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 @@ -56,21 +56,21 @@ public class EnumElementValue extends El public String stringifyValue() { ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return cu8.getBytes(); } public String getEnumTypeString() { ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(typeIdx, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return cu8.getBytes();// Utility.signatureToString(cu8.getBytes()); } public String getEnumValueString() { ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return cu8.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ExceptionTable.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 table of exceptions that are thrown by a @@ -56,7 +56,7 @@ public final class ExceptionTable extend */ public ExceptionTable(int name_index, int length, int[] exception_index_table, ConstantPool constant_pool) { - super(Constants.ATTR_EXCEPTIONS, name_index, length, constant_pool); + super(Const.ATTR_EXCEPTIONS, name_index, length, constant_pool); this.exception_index_table = exception_index_table != null ? exception_index_table : new int[0]; } @@ -131,7 +131,7 @@ public final class ExceptionTable extend String[] names = new String[exception_index_table.length]; for (int i = 0; i < exception_index_table.length; i++) { names[i] = super.getConstantPool().getConstantString(exception_index_table[i], - Constants.CONSTANT_Class).replace('/', '.'); + Const.CONSTANT_Class).replace('/', '.'); } return names; } @@ -155,7 +155,7 @@ public final class ExceptionTable extend String str; buf.append("Exceptions: "); for (int i = 0; i < exception_index_table.length; i++) { - str = super.getConstantPool().getConstantString(exception_index_table[i], Constants.CONSTANT_Class); + str = super.getConstantPool().getConstantString(exception_index_table[i], Const.CONSTANT_Class); buf.append(Utility.compactClassName(str, false)); if (i < exception_index_table.length - 1) { buf.append(", "); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.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; import org.apache.commons.bcel6.generic.Type; import org.apache.commons.bcel6.util.BCELComparator; @@ -101,7 +101,7 @@ public final class Field extends FieldOr */ public final ConstantValue getConstantValue() { for (Attribute attribute : super.getAttributes()) { - if (attribute.getTag() == Constants.ATTR_CONSTANT_VALUE) { + if (attribute.getTag() == Const.ATTR_CONSTANT_VALUE) { return (ConstantValue) attribute; } } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.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; /** * Abstract super class for fields and methods. @@ -194,7 +194,7 @@ public abstract class FieldOrMethod exte */ public final String getName() { ConstantUtf8 c; - c = (ConstantUtf8) constant_pool.getConstant(name_index, Constants.CONSTANT_Utf8); + c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8); return c.getBytes(); } @@ -204,7 +204,7 @@ public abstract class FieldOrMethod exte */ public final String getSignature() { ConstantUtf8 c; - c = (ConstantUtf8) constant_pool.getConstant(signature_index, Constants.CONSTANT_Utf8); + c = (ConstantUtf8) constant_pool.getConstant(signature_index, Const.CONSTANT_Utf8); return c.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.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 inner class attribute, i.e., the class @@ -182,18 +182,18 @@ public final class InnerClass implements String outer_class_name; String inner_name; String inner_class_name = constant_pool.getConstantString(inner_class_index, - Constants.CONSTANT_Class); + Const.CONSTANT_Class); inner_class_name = Utility.compactClassName(inner_class_name); if (outer_class_index != 0) { outer_class_name = constant_pool.getConstantString(outer_class_index, - Constants.CONSTANT_Class); + Const.CONSTANT_Class); outer_class_name = " of class " + Utility.compactClassName(outer_class_name); } else { outer_class_name = ""; } if (inner_name_index != 0) { inner_name = ((ConstantUtf8) constant_pool.getConstant(inner_name_index, - Constants.CONSTANT_Utf8)).getBytes(); + Const.CONSTANT_Utf8)).getBytes(); } else { inner_name = "(anonymous)"; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClasses.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 denotes that this class @@ -54,7 +54,7 @@ public final class InnerClasses extends */ public InnerClasses(int name_index, int length, InnerClass[] inner_classes, ConstantPool constant_pool) { - super(Constants.ATTR_INNER_CLASSES, name_index, length, constant_pool); + super(Const.ATTR_INNER_CLASSES, name_index, length, constant_pool); this.inner_classes = inner_classes != null ? inner_classes : new InnerClass[0]; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java Fri Sep 11 00:30:19 2015 @@ -29,7 +29,7 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; -import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.Const; import org.apache.commons.bcel6.generic.Type; import org.apache.commons.bcel6.util.BCELComparator; import org.apache.commons.bcel6.util.ClassQueue; @@ -154,7 +154,7 @@ public class JavaClass extends AccessFla * `ConstantClass' but we check that anyway via the * `ConstPool.getConstant' method. */ - class_name = constant_pool.getConstantString(class_name_index, Constants.CONSTANT_Class); + class_name = constant_pool.getConstantString(class_name_index, Const.CONSTANT_Class); class_name = Utility.compactClassName(class_name, false); int index = class_name.lastIndexOf('.'); if (index < 0) { @@ -165,14 +165,14 @@ public class JavaClass extends AccessFla if (superclass_name_index > 0) { // May be zero -> class is java.lang.Object superclass_name = constant_pool.getConstantString(superclass_name_index, - Constants.CONSTANT_Class); + Const.CONSTANT_Class); superclass_name = Utility.compactClassName(superclass_name, false); } else { superclass_name = "java.lang.Object"; } interface_names = new String[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { - String str = constant_pool.getConstantString(interfaces[i], Constants.CONSTANT_Class); + String str = constant_pool.getConstantString(interfaces[i], Const.CONSTANT_Class); interface_names[i] = Utility.compactClassName(str, false); } } @@ -301,7 +301,7 @@ public class JavaClass extends AccessFla * @exception IOException */ public void dump( DataOutputStream file ) throws IOException { - file.writeInt(Constants.JVM_CLASSFILE_MAGIC); + file.writeInt(Const.JVM_CLASSFILE_MAGIC); file.writeShort(minor); file.writeShort(major); constant_pool.dump(file); @@ -692,12 +692,12 @@ public class JavaClass extends AccessFla public final boolean isSuper() { - return (super.getAccessFlags() & Constants.ACC_SUPER) != 0; + return (super.getAccessFlags() & Const.ACC_SUPER) != 0; } public final boolean isClass() { - return (super.getAccessFlags() & Constants.ACC_INTERFACE) == 0; + return (super.getAccessFlags() & Const.ACC_INTERFACE) == 0; } /** @@ -726,7 +726,7 @@ public class JavaClass extends AccessFla for (InnerClass innerClasse : innerClasses) { boolean innerClassAttributeRefersToMe = false; String inner_class_name = constant_pool.getConstantString(innerClasse.getInnerClassIndex(), - Constants.CONSTANT_Class); + Const.CONSTANT_Class); inner_class_name = Utility.compactClassName(inner_class_name); if (inner_class_name.equals(getClassName())) { innerClassAttributeRefersToMe = true; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.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 table of line numbers for debugging @@ -55,7 +55,7 @@ public final class LineNumberTable exten */ public LineNumberTable(int name_index, int length, LineNumber[] line_number_table, ConstantPool constant_pool) { - super(Constants.ATTR_LINE_NUMBER_TABLE, name_index, length, constant_pool); + super(Const.ATTR_LINE_NUMBER_TABLE, name_index, length, constant_pool); this.line_number_table = line_number_table; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.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 local variable within a method. It contains its @@ -131,7 +131,7 @@ public final class LocalVariable impleme */ public final String getName() { ConstantUtf8 c; - c = (ConstantUtf8) constant_pool.getConstant(name_index, Constants.CONSTANT_Utf8); + c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8); return c.getBytes(); } @@ -149,7 +149,7 @@ public final class LocalVariable impleme */ public final String getSignature() { ConstantUtf8 c; - c = (ConstantUtf8) constant_pool.getConstant(signature_index, Constants.CONSTANT_Utf8); + c = (ConstantUtf8) constant_pool.getConstant(signature_index, Const.CONSTANT_Utf8); return c.getBytes(); } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.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 colection of local variables in a @@ -53,7 +53,7 @@ public class LocalVariableTable extends */ public LocalVariableTable(int name_index, int length, LocalVariable[] local_variable_table, ConstantPool constant_pool) { - super(Constants.ATTR_LOCAL_VARIABLE_TABLE, name_index, length, constant_pool); + super(Const.ATTR_LOCAL_VARIABLE_TABLE, name_index, length, constant_pool); this.local_variable_table = local_variable_table; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.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; // The new table is used when generic types are about... @@ -63,7 +63,7 @@ public class LocalVariableTypeTable exte } public LocalVariableTypeTable(int name_index, int length, LocalVariable[] local_variable_table, ConstantPool constant_pool) { - super(Constants.ATTR_LOCAL_VARIABLE_TYPE_TABLE, name_index, length, constant_pool); + super(Const.ATTR_LOCAL_VARIABLE_TYPE_TABLE, name_index, length, constant_pool); this.local_variable_type_table = local_variable_table; } Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.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; import org.apache.commons.bcel6.generic.Type; import org.apache.commons.bcel6.util.BCELComparator; @@ -170,9 +170,9 @@ public final class Method extends FieldO public final String toString() { String access = Utility.accessToString(super.getAccessFlags()); // Get name and signature from constant pool - ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(super.getSignatureIndex(), Constants.CONSTANT_Utf8); + ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(super.getSignatureIndex(), Const.CONSTANT_Utf8); String signature = c.getBytes(); - c = (ConstantUtf8) super.getConstantPool().getConstant(super.getNameIndex(), Constants.CONSTANT_Utf8); + c = (ConstantUtf8) super.getConstantPool().getConstant(super.getNameIndex(), Const.CONSTANT_Utf8); String name = c.getBytes(); signature = Utility.methodSignatureToString(signature, name, access, true, getLocalVariableTable()); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.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; /** * Entry of the parameters table. @@ -68,7 +68,7 @@ public class MethodParameter implements if (name_index == 0) { return null; } - return ((ConstantUtf8) constant_pool.getConstant(name_index, Constants.CONSTANT_Utf8)).getBytes(); + return ((ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8)).getBytes(); } public int getAccessFlags() { @@ -80,15 +80,15 @@ public class MethodParameter implements } public boolean isFinal() { - return (access_flags & Constants.ACC_FINAL) != 0; + return (access_flags & Const.ACC_FINAL) != 0; } public boolean isSynthetic() { - return (access_flags & Constants.ACC_SYNTHETIC) != 0; + return (access_flags & Const.ACC_SYNTHETIC) != 0; } public boolean isMandated() { - return (access_flags & Constants.ACC_MANDATED) != 0; + return (access_flags & Const.ACC_MANDATED) != 0; } /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.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 MethodParameters attribute. @@ -35,7 +35,7 @@ public class MethodParameters extends At private MethodParameter[] parameters = new MethodParameter[0]; MethodParameters(int name_index, int length, DataInput input, ConstantPool constant_pool) throws IOException { - super(Constants.ATTR_METHOD_PARAMETERS, name_index, length, constant_pool); + super(Const.ATTR_METHOD_PARAMETERS, name_index, length, constant_pool); int parameters_count = input.readUnsignedByte(); parameters = new MethodParameter[parameters_count]; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java?rev=1702355&r1=1702354&r2=1702355&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.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 @@ -69,7 +69,7 @@ public final class PMGClass extends Attr */ public PMGClass(int name_index, int length, int pmg_index, int pmg_class_index, ConstantPool constant_pool) { - super(Constants.ATTR_PMG, name_index, length, constant_pool); + super(Const.ATTR_PMG, name_index, length, constant_pool); this.pmg_index = pmg_index; this.pmg_class_index = pmg_class_index; } @@ -139,7 +139,7 @@ public final class PMGClass extends Attr */ public final String getPMGName() { ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(pmg_index, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return c.getBytes(); } @@ -149,7 +149,7 @@ public final class PMGClass extends Attr */ public final String getPMGClassName() { ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(pmg_class_index, - Constants.CONSTANT_Utf8); + Const.CONSTANT_Utf8); return c.getBytes(); }
