You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/08/16 16:39:36 UTC
[commons-bcel] 06/06: Use camel-case for local and private names
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit 242252bebc1f40d4e03a3ff691c2f19a7d20dd7d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Aug 16 12:39:17 2022 -0400
Use camel-case for local and private names
---
src/examples/ClassDumper.java | 60 +++++++-------
src/examples/JasminVisitor.java | 20 ++---
src/examples/Mini/ASTExpr.java | 18 ++--
src/examples/Mini/ASTFunAppl.java | 8 +-
src/examples/Mini/ASTFunDecl.java | 16 ++--
src/examples/Mini/ASTIfExpr.java | 32 ++++----
src/examples/Mini/ASTProgram.java | 26 +++---
src/examples/ProxyCreator.java | 4 +-
src/examples/TransitiveHull.java | 16 ++--
src/examples/helloify.java | 8 +-
src/examples/maxstack.java | 8 +-
src/main/java/org/apache/bcel/Repository.java | 17 ++--
.../apache/bcel/classfile/AnnotationDefault.java | 2 +-
.../org/apache/bcel/classfile/Annotations.java | 12 +--
.../java/org/apache/bcel/classfile/Attribute.java | 2 +-
.../apache/bcel/classfile/BootstrapMethods.java | 4 +-
src/main/java/org/apache/bcel/classfile/Code.java | 8 +-
.../java/org/apache/bcel/classfile/ConstantCP.java | 16 ++--
.../org/apache/bcel/classfile/ConstantDynamic.java | 4 +-
.../apache/bcel/classfile/ConstantFieldref.java | 8 +-
.../bcel/classfile/ConstantInterfaceMethodref.java | 8 +-
.../bcel/classfile/ConstantInvokeDynamic.java | 4 +-
.../apache/bcel/classfile/ConstantMethodref.java | 8 +-
.../org/apache/bcel/classfile/ConstantValue.java | 4 +-
.../java/org/apache/bcel/classfile/Deprecated.java | 4 +-
.../apache/bcel/classfile/DescendingVisitor.java | 14 ++--
.../org/apache/bcel/classfile/ExceptionTable.java | 4 +-
src/main/java/org/apache/bcel/classfile/Field.java | 4 +-
.../java/org/apache/bcel/classfile/InnerClass.java | 20 ++---
.../org/apache/bcel/classfile/InnerClasses.java | 4 +-
.../java/org/apache/bcel/classfile/JavaClass.java | 26 +++---
.../org/apache/bcel/classfile/LineNumberTable.java | 4 +-
.../apache/bcel/classfile/LocalVariableTable.java | 4 +-
.../bcel/classfile/LocalVariableTypeTable.java | 6 +-
.../java/org/apache/bcel/classfile/Method.java | 4 +-
.../apache/bcel/classfile/MethodParameters.java | 4 +-
.../java/org/apache/bcel/classfile/Module.java | 8 +-
.../org/apache/bcel/classfile/ModuleMainClass.java | 8 +-
.../org/apache/bcel/classfile/ModulePackages.java | 4 +-
.../org/apache/bcel/classfile/ModuleProvides.java | 8 +-
.../java/org/apache/bcel/classfile/NestHost.java | 8 +-
.../org/apache/bcel/classfile/NestMembers.java | 8 +-
.../java/org/apache/bcel/classfile/PMGClass.java | 2 +-
.../bcel/classfile/ParameterAnnotations.java | 6 +-
.../java/org/apache/bcel/classfile/Signature.java | 2 +-
.../apache/bcel/classfile/SimpleElementValue.java | 14 ++--
.../java/org/apache/bcel/classfile/SourceFile.java | 2 +-
.../java/org/apache/bcel/classfile/StackMap.java | 4 +-
.../java/org/apache/bcel/classfile/Synthetic.java | 4 +-
.../java/org/apache/bcel/classfile/Unknown.java | 4 +-
.../java/org/apache/bcel/classfile/Utility.java | 10 +--
.../apache/bcel/generic/ArithmeticInstruction.java | 6 +-
.../org/apache/bcel/generic/ArrayInstruction.java | 6 +-
.../java/org/apache/bcel/generic/ArrayType.java | 12 +--
.../java/org/apache/bcel/generic/BasicType.java | 4 +-
.../org/apache/bcel/generic/BranchInstruction.java | 10 +--
.../java/org/apache/bcel/generic/ClassGen.java | 26 +++---
.../org/apache/bcel/generic/ConstantPoolGen.java | 96 +++++++++++-----------
.../apache/bcel/generic/ConversionInstruction.java | 6 +-
src/main/java/org/apache/bcel/generic/GOTO.java | 6 +-
.../apache/bcel/generic/InstructionFactory.java | 92 ++++++++++-----------
.../java/org/apache/bcel/generic/LOOKUPSWITCH.java | 32 ++++----
.../bcel/generic/LocalVariableInstruction.java | 14 ++--
.../java/org/apache/bcel/generic/MethodGen.java | 96 +++++++++++-----------
.../org/apache/bcel/generic/ReturnInstruction.java | 6 +-
.../java/org/apache/bcel/generic/TABLESWITCH.java | 32 ++++----
src/main/java/org/apache/bcel/generic/Type.java | 18 ++--
.../java/org/apache/bcel/util/AttributeHTML.java | 16 ++--
.../java/org/apache/bcel/util/BCELFactory.java | 4 +-
src/main/java/org/apache/bcel/util/BCELifier.java | 24 +++---
.../java/org/apache/bcel/util/ClassLoader.java | 32 ++++----
src/main/java/org/apache/bcel/util/CodeHTML.java | 10 +--
.../java/org/apache/bcel/util/ConstantHTML.java | 90 ++++++++++----------
.../java/org/apache/bcel/util/JavaWrapper.java | 16 ++--
.../org/apache/bcel/verifier/VerifyDialog.java | 28 +++----
.../bcel/verifier/statics/Pass2Verifier.java | 72 ++++++++--------
.../bcel/verifier/statics/Pass3aVerifier.java | 12 +--
.../verifier/structurals/ExceptionHandler.java | 6 +-
.../structurals/InstConstraintVisitor.java | 38 ++++-----
79 files changed, 656 insertions(+), 657 deletions(-)
diff --git a/src/examples/ClassDumper.java b/src/examples/ClassDumper.java
index 0d188b74..e4fc5a0e 100644
--- a/src/examples/ClassDumper.java
+++ b/src/examples/ClassDumper.java
@@ -38,14 +38,14 @@ class ClassDumper {
private final FileImageInputStream file;
private final String file_name;
- private int class_name_index;
- private int superclass_name_index;
+ private int classNameIndex;
+ private int superclassNameIndex;
private int major;
private int minor; // Compiler version
- private int access_flags; // Access rights of parsed class
+ private int accessFlags; // Access rights of parsed class
private int[] interfaces; // Names of implemented interfaces
- private ConstantPool constant_pool; // collection of constants
- private Constant[] constant_items; // collection of constants
+ private ConstantPool constantPool; // collection of constants
+ private Constant[] constantItems; // collection of constants
private Field[] fields; // class fields, i.e., its variables
private Method[] methods; // methods defined in the class
private Attribute[] attributes; // attributes defined in the class
@@ -62,8 +62,8 @@ class ClassDumper {
}
private final String constantToString(final int index) {
- final Constant c = constant_items[index];
- return constant_pool.constantToString(c);
+ final Constant c = constantItems[index];
+ return constantPool.constantToString(c);
}
/**
@@ -118,7 +118,7 @@ class ClassDumper {
System.out.printf("%nAttributes(%d):%n", attributes_count);
for (int i = 0; i < attributes_count; i++) {
- attributes[i] = Attribute.readAttribute(file, constant_pool);
+ attributes[i] = Attribute.readAttribute(file, constantPool);
// indent all lines by two spaces
final String[] lines = attributes[i].toString().split("\\r?\\n");
for (final String line : lines) {
@@ -134,27 +134,27 @@ class ClassDumper {
* @throws ClassFormatException
*/
private final void processClassInfo() throws IOException, ClassFormatException {
- access_flags = file.readUnsignedShort();
+ accessFlags = file.readUnsignedShort();
/*
* Interfaces are implicitely abstract, the flag should be set according to the JVM specification.
*/
- if ((access_flags & Const.ACC_INTERFACE) != 0) {
- access_flags |= Const.ACC_ABSTRACT;
+ if ((accessFlags & Const.ACC_INTERFACE) != 0) {
+ accessFlags |= Const.ACC_ABSTRACT;
}
- if ((access_flags & Const.ACC_ABSTRACT) != 0 && (access_flags & Const.ACC_FINAL) != 0) {
+ if ((accessFlags & Const.ACC_ABSTRACT) != 0 && (accessFlags & Const.ACC_FINAL) != 0) {
throw new ClassFormatException("Class " + file_name + " can't be both final and abstract");
}
System.out.printf("%nClass info:%n");
- System.out.println(" flags: " + BCELifier.printFlags(access_flags, BCELifier.FLAGS.CLASS));
- class_name_index = file.readUnsignedShort();
- System.out.printf(" this_class: %d (", class_name_index);
- System.out.println(constantToString(class_name_index) + ")");
-
- superclass_name_index = file.readUnsignedShort();
- System.out.printf(" super_class: %d (", superclass_name_index);
- if (superclass_name_index > 0) {
- System.out.printf("%s", constantToString(superclass_name_index));
+ System.out.println(" flags: " + BCELifier.printFlags(accessFlags, BCELifier.FLAGS.CLASS));
+ classNameIndex = file.readUnsignedShort();
+ System.out.printf(" this_class: %d (", classNameIndex);
+ System.out.println(constantToString(classNameIndex) + ")");
+
+ superclassNameIndex = file.readUnsignedShort();
+ System.out.printf(" super_class: %d (", superclassNameIndex);
+ if (superclassNameIndex > 0) {
+ System.out.printf("%s", constantToString(superclassNameIndex));
}
System.out.println(")");
}
@@ -168,14 +168,14 @@ class ClassDumper {
private final void processConstantPool() throws IOException, ClassFormatException {
byte tag;
final int constant_pool_count = file.readUnsignedShort();
- constant_items = new Constant[constant_pool_count];
- constant_pool = new ConstantPool(constant_items);
+ constantItems = new Constant[constant_pool_count];
+ constantPool = new ConstantPool(constantItems);
- // constant_pool[0] is unused by the compiler
+ // constantPool[0] is unused by the compiler
System.out.printf("%nConstant pool(%d):%n", constant_pool_count - 1);
for (int i = 1; i < constant_pool_count; i++) {
- constant_items[i] = Constant.readConstant(file);
+ constantItems[i] = Constant.readConstant(file);
// i'm sure there is a better way to do this
if (i < 10) {
System.out.printf(" #%1d = ", i);
@@ -184,10 +184,10 @@ class ClassDumper {
} else {
System.out.printf(" #%d = ", i);
}
- System.out.println(constant_items[i]);
+ System.out.println(constantItems[i]);
// All eight byte constants take up two spots in the constant pool
- tag = constant_items[i].getTag();
+ tag = constantItems[i].getTag();
if (tag == Const.CONSTANT_Double || tag == Const.CONSTANT_Long) {
i++;
}
@@ -206,7 +206,7 @@ class ClassDumper {
final int name_index = file.readUnsignedShort();
System.out.printf(" name_index: %d (", name_index);
System.out.println(constantToString(name_index) + ")");
- System.out.println(" access_flags: " + BCELifier.printFlags(access_flags, BCELifier.FLAGS.METHOD));
+ System.out.println(" accessFlags: " + BCELifier.printFlags(access_flags, BCELifier.FLAGS.METHOD));
final int descriptor_index = file.readUnsignedShort();
System.out.printf(" descriptor_index: %d (", descriptor_index);
System.out.println(constantToString(descriptor_index) + ")");
@@ -233,7 +233,7 @@ class ClassDumper {
// verify we're at EOF of the buffer on return.
final long pos1 = file.getStreamPosition();
- attributes[i] = Attribute.readAttribute(file, constant_pool);
+ attributes[i] = Attribute.readAttribute(file, constantPool);
final long pos2 = file.getStreamPosition();
if (pos2 - pos1 != attribute_length + 6) {
System.out.printf("%nattribute_length: %d pos2-pos1-6: %d pos1: %x(%d) pos2: %x(%d)%n", attribute_length, pos2 - pos1 - 6, pos1, pos1, pos2,
@@ -306,7 +306,7 @@ class ClassDumper {
} else {
System.out.printf(" #%d = ", i);
}
- System.out.println(interfaces[i] + " (" + constant_pool.getConstantString(interfaces[i], Const.CONSTANT_Class) + ")");
+ System.out.println(interfaces[i] + " (" + constantPool.getConstantString(interfaces[i], Const.CONSTANT_Class) + ")");
}
}
diff --git a/src/examples/JasminVisitor.java b/src/examples/JasminVisitor.java
index d1a013ba..898b24ed 100644
--- a/src/examples/JasminVisitor.java
+++ b/src/examples/JasminVisitor.java
@@ -69,17 +69,17 @@ public class JasminVisitor extends org.apache.bcel.classfile.EmptyVisitor {
java_class = new ClassParser(arg).parse();
}
- String class_name = java_class.getClassName();
- final int index = class_name.lastIndexOf('.');
- final String path = class_name.substring(0, index + 1).replace('.', File.separatorChar);
- class_name = class_name.substring(index + 1);
+ String className = java_class.getClassName();
+ final int index = className.lastIndexOf('.');
+ final String path = className.substring(0, index + 1).replace('.', File.separatorChar);
+ className = className.substring(index + 1);
if (!path.equals("")) {
final File f = new File(path);
f.mkdirs();
}
- final String name = path + class_name + ".j";
+ final String name = path + className + ".j";
final FileOutputStream out = new FileOutputStream(name);
new JasminVisitor(java_class, out).disassemble();
System.out.println("File dumped to: " + name);
@@ -88,7 +88,7 @@ public class JasminVisitor extends org.apache.bcel.classfile.EmptyVisitor {
private final JavaClass clazz;
private final PrintWriter out;
- private final String class_name;
+ private final String className;
private final ConstantPoolGen cp;
@@ -99,7 +99,7 @@ public class JasminVisitor extends org.apache.bcel.classfile.EmptyVisitor {
public JasminVisitor(final JavaClass clazz, final OutputStream out) {
this.clazz = clazz;
this.out = new PrintWriter(out);
- this.class_name = clazz.getClassName();
+ this.className = clazz.getClassName();
this.cp = new ConstantPoolGen(clazz.getConstantPool());
}
@@ -149,7 +149,7 @@ public class JasminVisitor extends org.apache.bcel.classfile.EmptyVisitor {
out.println(".limit stack " + code.getMaxStack());
out.println(".limit locals " + code.getMaxLocals());
- final MethodGen mg = new MethodGen(_method, class_name, cp);
+ final MethodGen mg = new MethodGen(_method, className, cp);
final InstructionList il = mg.getInstructionList();
final InstructionHandle[] ihs = il.getInstructionHandles();
@@ -251,10 +251,10 @@ public class JasminVisitor extends org.apache.bcel.classfile.EmptyVisitor {
for (final CodeExceptionGen c : ehs) {
final ObjectType caught = c.getCatchType();
- final String class_name = caught == null ? // catch any exception, used when compiling finally
+ final String className = caught == null ? // catch any exception, used when compiling finally
"all" : caught.getClassName().replace('.', '/');
- out.println(".catch " + class_name + " from " + get(c.getStartPC()) + " to " + get(c.getEndPC()) + " using " + get(c.getHandlerPC()));
+ out.println(".catch " + className + " from " + get(c.getStartPC()) + " to " + get(c.getEndPC()) + " using " + get(c.getHandlerPC()));
}
printEndMethod(code);
diff --git a/src/examples/Mini/ASTExpr.java b/src/examples/Mini/ASTExpr.java
index 3f5df060..748d8658 100644
--- a/src/examples/Mini/ASTExpr.java
+++ b/src/examples/Mini/ASTExpr.java
@@ -295,33 +295,33 @@ public class ASTExpr extends SimpleNode implements MiniParserConstants, MiniPars
* @param expected type
*/
public int eval(final int expected) {
- int child_type = T_UNKNOWN, t;
+ int childType = T_UNKNOWN, t;
is_simple = true;
// Determine expected node type depending on used operator.
if (unop != -1) {
if (unop == MINUS) {
- child_type = type = T_INT; // -
+ childType = type = T_INT; // -
} else {
- child_type = type = T_BOOLEAN; // !
+ childType = type = T_BOOLEAN; // !
}
} else // Compute expected type
if (kind == PLUS || kind == MINUS || kind == MULT || kind == MOD || kind == DIV) {
- child_type = type = T_INT;
+ childType = type = T_INT;
} else if (kind == AND || kind == OR) {
- child_type = type = T_BOOLEAN;
+ childType = type = T_BOOLEAN;
} else { // LEQ, GT, etc.
- child_type = T_INT;
+ childType = T_INT;
type = T_BOOLEAN;
}
// Get type of subexpressions
for (final ASTExpr expr : exprs) {
- t = expr.eval(child_type);
+ t = expr.eval(childType);
- if (t != child_type) {
- MiniC.addError(expr.getLine(), expr.getColumn(), "Expression has not expected type " + TYPE_NAMES[child_type] + " but " + TYPE_NAMES[t] + ".");
+ if (t != childType) {
+ MiniC.addError(expr.getLine(), expr.getColumn(), "Expression has not expected type " + TYPE_NAMES[childType] + " but " + TYPE_NAMES[t] + ".");
}
is_simple = is_simple && expr.isSimple();
diff --git a/src/examples/Mini/ASTFunAppl.java b/src/examples/Mini/ASTFunAppl.java
index 07fdf344..a8ff073e 100644
--- a/src/examples/Mini/ASTFunAppl.java
+++ b/src/examples/Mini/ASTFunAppl.java
@@ -64,14 +64,14 @@ public class ASTFunAppl extends ASTExpr implements MiniParserTreeConstants, org.
// Function f = function;
// ASTIdent fun = f.getName();
// ASTIdent[] args = f.getArgs();
- final String class_name = method.getClassName();
+ final String className = method.getClassName();
if (fname.equals("READ")) {
- il.append(new INVOKESTATIC(cp.addMethodref(class_name, "_readInt", "()I")));
+ il.append(new INVOKESTATIC(cp.addMethodref(className, "_readInt", "()I")));
} else if (fname.equals("WRITE")) {
exprs[0].byte_code(il, method, cp);
ASTFunDecl.pop();
- il.append(new INVOKESTATIC(cp.addMethodref(class_name, "_writeInt", "(I)I")));
+ il.append(new INVOKESTATIC(cp.addMethodref(className, "_writeInt", "(I)I")));
} else { // Normal function
final int size = exprs.length;
Type[] argv = null;
@@ -90,7 +90,7 @@ public class ASTFunAppl extends ASTExpr implements MiniParserTreeConstants, org.
ASTFunDecl.pop(size);
// Function call
- il.append(new INVOKESTATIC(cp.addMethodref(class_name, fname, Type.getMethodSignature(Type.INT, argv))));
+ il.append(new INVOKESTATIC(cp.addMethodref(className, fname, Type.getMethodSignature(Type.INT, argv))));
}
ASTFunDecl.push();
diff --git a/src/examples/Mini/ASTFunDecl.java b/src/examples/Mini/ASTFunDecl.java
index ddbd90ec..7e6f7c8d 100644
--- a/src/examples/Mini/ASTFunDecl.java
+++ b/src/examples/Mini/ASTFunDecl.java
@@ -194,10 +194,10 @@ public class ASTFunDecl extends SimpleNode implements MiniParserTreeConstants, o
/**
* Fifth pass, produce Java byte code.
*/
- public void byte_code(final ClassGen class_gen, final ConstantPoolGen cp) {
+ public void byte_code(final ClassGen classGen, final ConstantPoolGen cp) {
MethodGen method = null;
boolean main = false, ignore = false;
- final String class_name = class_gen.getClassName();
+ final String className = classGen.getClassName();
final String fname = name.getName();
final InstructionList il = new InstructionList();
@@ -205,7 +205,7 @@ public class ASTFunDecl extends SimpleNode implements MiniParserTreeConstants, o
String[] arg_names = {"$argv"};
if (fname.equals("main")) {
- method = new MethodGen(ACC_STATIC | ACC_PUBLIC, Type.VOID, args, arg_names, "main", class_name, il, cp);
+ method = new MethodGen(ACC_STATIC | ACC_PUBLIC, Type.VOID, args, arg_names, "main", className, il, cp);
main = true;
} else if (fname.equals("READ") || fname.equals("WRITE")) { // Do nothing
@@ -221,7 +221,7 @@ public class ASTFunDecl extends SimpleNode implements MiniParserTreeConstants, o
arg_names[i] = argv[i].getName();
}
- method = new MethodGen(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, Type.INT, args, arg_names, fname, class_name, il, cp);
+ method = new MethodGen(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, Type.INT, args, arg_names, fname, className, il, cp);
final LocalVariableGen[] lv = method.getLocalVariables();
for (int i = 0; i < size; i++) {
@@ -236,10 +236,10 @@ public class ASTFunDecl extends SimpleNode implements MiniParserTreeConstants, o
body.byte_code(il, method, cp);
if (main) {
- final ObjectType e_type = new ObjectType("java.lang.Exception");
+ final ObjectType eType = new ObjectType("java.lang.Exception");
final InstructionHandle start = il.getStart();
InstructionHandle end, handler, end_handler;
- final LocalVariableGen exc = method.addLocalVariable("$e", e_type, null, null);
+ final LocalVariableGen exc = method.addLocalVariable("$e", eType, null, null);
final int slot = exc.getIndex();
il.append(InstructionConstants.POP);
@@ -254,7 +254,7 @@ public class ASTFunDecl extends SimpleNode implements MiniParserTreeConstants, o
il.append(new INVOKEVIRTUAL(cp.addMethodref("java.io.PrintStream", "println", "(Ljava/lang/Object;)V")));
pop(2);
end_handler = il.append(InstructionConstants.RETURN);
- method.addExceptionHandler(start, end, handler, e_type);
+ method.addExceptionHandler(start, end, handler, eType);
exc.setStart(handler);
exc.setEnd(end_handler);
} else {
@@ -264,7 +264,7 @@ public class ASTFunDecl extends SimpleNode implements MiniParserTreeConstants, o
method.removeNOPs(); // First optimization pass, provided by MethodGen
optimizeIFs(il); // Second optimization pass, application-specific
method.setMaxStack(max_size);
- class_gen.addMethod(method.getMethod());
+ classGen.addMethod(method.getMethod());
}
il.dispose(); // Dispose instruction handles for better memory utilization
diff --git a/src/examples/Mini/ASTIfExpr.java b/src/examples/Mini/ASTIfExpr.java
index b61f3845..f5674f34 100644
--- a/src/examples/Mini/ASTIfExpr.java
+++ b/src/examples/Mini/ASTIfExpr.java
@@ -122,39 +122,39 @@ public class ASTIfExpr extends ASTExpr implements org.apache.bcel.Constants {
*/
@Override
public int eval(final int expected) {
- int then_type, else_type, if_type;
+ int thenType, elseType, ifType;
- if ((if_type = if_expr.eval(T_BOOLEAN)) != T_BOOLEAN) {
- MiniC.addError(if_expr.getLine(), if_expr.getColumn(), "IF expression is not of type boolean, but " + TYPE_NAMES[if_type] + ".");
+ if ((ifType = if_expr.eval(T_BOOLEAN)) != T_BOOLEAN) {
+ MiniC.addError(if_expr.getLine(), if_expr.getColumn(), "IF expression is not of type boolean, but " + TYPE_NAMES[ifType] + ".");
}
- then_type = then_expr.eval(expected);
+ thenType = then_expr.eval(expected);
- if (expected != T_UNKNOWN && then_type != expected) {
+ if (expected != T_UNKNOWN && thenType != expected) {
MiniC.addError(then_expr.getLine(), then_expr.getColumn(),
- "THEN expression is not of expected type " + TYPE_NAMES[expected] + " but " + TYPE_NAMES[then_type] + ".");
+ "THEN expression is not of expected type " + TYPE_NAMES[expected] + " but " + TYPE_NAMES[thenType] + ".");
}
if (else_expr != null) {
- else_type = else_expr.eval(expected);
+ elseType = else_expr.eval(expected);
- if (expected != T_UNKNOWN && else_type != expected) {
+ if (expected != T_UNKNOWN && elseType != expected) {
MiniC.addError(else_expr.getLine(), else_expr.getColumn(),
- "ELSE expression is not of expected type " + TYPE_NAMES[expected] + " but " + TYPE_NAMES[else_type] + ".");
- } else if (then_type == T_UNKNOWN) {
- then_type = else_type;
- then_expr.setType(else_type);
+ "ELSE expression is not of expected type " + TYPE_NAMES[expected] + " but " + TYPE_NAMES[elseType] + ".");
+ } else if (thenType == T_UNKNOWN) {
+ thenType = elseType;
+ then_expr.setType(elseType);
}
} else {
- else_type = then_type;
+ elseType = thenType;
else_expr = then_expr;
}
- if (then_type != else_type) {
- MiniC.addError(line, column, "Type mismatch in THEN-ELSE: " + TYPE_NAMES[then_type] + " vs. " + TYPE_NAMES[else_type] + ".");
+ if (thenType != elseType) {
+ MiniC.addError(line, column, "Type mismatch in THEN-ELSE: " + TYPE_NAMES[thenType] + " vs. " + TYPE_NAMES[elseType] + ".");
}
- type = then_type;
+ type = thenType;
is_simple = if_expr.isSimple() && then_expr.isSimple() && else_expr.isSimple();
diff --git a/src/examples/Mini/ASTProgram.java b/src/examples/Mini/ASTProgram.java
index e505bd0d..652dc32c 100644
--- a/src/examples/Mini/ASTProgram.java
+++ b/src/examples/Mini/ASTProgram.java
@@ -90,20 +90,20 @@ public class ASTProgram extends SimpleNode implements MiniParserConstants, MiniP
/**
* Fifth pass, produce Java byte code.
*/
- public void byte_code(final ClassGen class_gen, final ConstantPoolGen cp) {
+ public void byte_code(final ClassGen classGen, final ConstantPoolGen cp) {
/*
* private static BufferedReader _in;
*/
- class_gen.addField(new Field(ACC_PRIVATE | ACC_STATIC, cp.addUtf8("_in"), cp.addUtf8("Ljava/io/BufferedReader;"), null, cp.getConstantPool()));
+ classGen.addField(new Field(ACC_PRIVATE | ACC_STATIC, cp.addUtf8("_in"), cp.addUtf8("Ljava/io/BufferedReader;"), null, cp.getConstantPool()));
MethodGen method;
InstructionList il = new InstructionList();
- final String class_name = class_gen.getClassName();
+ final String className = classGen.getClassName();
/*
* Often used constant pool entries
*/
- final int _in = cp.addFieldref(class_name, "_in", "Ljava/io/BufferedReader;");
+ final int _in = cp.addFieldref(className, "_in", "Ljava/io/BufferedReader;");
final int out = cp.addFieldref("java.lang.System", "out", "Ljava/io/PrintStream;");
@@ -118,12 +118,12 @@ public class ASTProgram extends SimpleNode implements MiniParserConstants, MiniP
/*
* private static int _readInt() throws IOException
*/
- method = new MethodGen(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, Type.INT, Type.NO_ARGS, null, "_readInt", class_name, il, cp);
+ method = new MethodGen(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, Type.INT, Type.NO_ARGS, null, "_readInt", className, il, cp);
method.addException("java.io.IOException");
method.setMaxStack(2);
- class_gen.addMethod(method.getMethod());
+ classGen.addMethod(method.getMethod());
/*
* private static int _writeInt(int i) throws IOException
@@ -146,10 +146,10 @@ public class ASTProgram extends SimpleNode implements MiniParserConstants, MiniP
il.append(new PUSH(cp, 0));
il.append(InstructionConstants.IRETURN); // Reuse objects, if possible
- method = new MethodGen(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, Type.INT, args, argv, "_writeInt", class_name, il, cp);
+ method = new MethodGen(ACC_STATIC | ACC_PRIVATE | ACC_FINAL, Type.INT, args, argv, "_writeInt", className, il, cp);
method.setMaxStack(4);
- class_gen.addMethod(method.getMethod());
+ classGen.addMethod(method.getMethod());
/*
* public <init> -- constructor
@@ -161,10 +161,10 @@ public class ASTProgram extends SimpleNode implements MiniParserConstants, MiniP
il.append(new INVOKESPECIAL(cp.addMethodref("java.lang.Object", "<init>", "()V")));
il.append(new RETURN());
- method = new MethodGen(ACC_PUBLIC, Type.VOID, Type.NO_ARGS, null, "<init>", class_name, il, cp);
+ method = new MethodGen(ACC_PUBLIC, Type.VOID, Type.NO_ARGS, null, "<init>", className, il, cp);
method.setMaxStack(1);
- class_gen.addMethod(method.getMethod());
+ classGen.addMethod(method.getMethod());
/*
* class initializer
@@ -181,13 +181,13 @@ public class ASTProgram extends SimpleNode implements MiniParserConstants, MiniP
il.append(new PUTSTATIC(_in));
il.append(InstructionConstants.RETURN); // Reuse instruction constants
- method = new MethodGen(ACC_STATIC, Type.VOID, Type.NO_ARGS, null, "<clinit>", class_name, il, cp);
+ method = new MethodGen(ACC_STATIC, Type.VOID, Type.NO_ARGS, null, "<clinit>", className, il, cp);
method.setMaxStack(5);
- class_gen.addMethod(method.getMethod());
+ classGen.addMethod(method.getMethod());
for (final ASTFunDecl fun_decl : fun_decls) {
- fun_decl.byte_code(class_gen, cp);
+ fun_decl.byte_code(classGen, cp);
}
}
diff --git a/src/examples/ProxyCreator.java b/src/examples/ProxyCreator.java
index 940c670d..d6705784 100644
--- a/src/examples/ProxyCreator.java
+++ b/src/examples/ProxyCreator.java
@@ -57,9 +57,9 @@ public class ProxyCreator {
/**
* Load class and create instance
*/
- public static Object createProxy(final String pack, final String class_name) {
+ public static Object createProxy(final String pack, final String className) {
try {
- final Class<?> cl = Class.forName(pack + "$$BCEL$$" + class_name);
+ final Class<?> cl = Class.forName(pack + "$$BCEL$$" + className);
return cl.newInstance();
} catch (final Exception e) {
e.printStackTrace();
diff --git a/src/examples/TransitiveHull.java b/src/examples/TransitiveHull.java
index 4e8e5f9e..d2bec348 100644
--- a/src/examples/TransitiveHull.java
+++ b/src/examples/TransitiveHull.java
@@ -90,17 +90,17 @@ public class TransitiveHull extends org.apache.bcel.classfile.EmptyVisitor {
set.add(clazz);
}
- private void add(String class_name) {
- class_name = class_name.replace('/', '.');
+ private void add(String className) {
+ className = className.replace('/', '.');
for (final String anIgnored : ignored) {
- if (Pattern.matches(anIgnored, class_name)) {
+ if (Pattern.matches(anIgnored, className)) {
return;
}
}
try {
- final JavaClass clazz = Repository.lookupClass(class_name);
+ final JavaClass clazz = Repository.lookupClass(className);
if (set.add(clazz)) {
queue.enqueue(clazz);
@@ -155,8 +155,8 @@ public class TransitiveHull extends org.apache.bcel.classfile.EmptyVisitor {
@Override
public void visitConstantClass(final ConstantClass cc) {
- final String class_name = (String) cc.getConstantValue(cp);
- add(class_name);
+ final String className = (String) cc.getConstantValue(cp);
+ add(className);
}
@Override
@@ -175,8 +175,8 @@ public class TransitiveHull extends org.apache.bcel.classfile.EmptyVisitor {
}
private void visitRef(final ConstantCP ccp, final boolean method) {
- final String class_name = ccp.getClass(cp);
- add(class_name);
+ final String className = ccp.getClass(cp);
+ add(className);
final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(ccp.getNameAndTypeIndex(), Constants.CONSTANT_NameAndType);
diff --git a/src/examples/helloify.java b/src/examples/helloify.java
index c2f1f40c..c8aba59f 100644
--- a/src/examples/helloify.java
+++ b/src/examples/helloify.java
@@ -41,7 +41,7 @@ import org.apache.bcel.generic.PUSH;
*/
public final class helloify implements Constants {
- private static String class_name;
+ private static String className;
private static ConstantPoolGen cp;
private static int out; // reference to System.out
private static int println; // reference to PrintStream.println
@@ -50,11 +50,11 @@ public final class helloify implements Constants {
* Change class name to <old_name>_hello
*/
private static void helloifyClassName(final JavaClass java_class) {
- class_name = java_class.getClassName() + "_hello";
+ className = java_class.getClassName() + "_hello";
int index = java_class.getClassNameIndex();
index = ((ConstantClass) cp.getConstant(index)).getNameIndex();
- cp.setConstant(index, new ConstantUtf8(class_name.replace('.', '/')));
+ cp.setConstant(index, new ConstantUtf8(className.replace('.', '/')));
}
/**
@@ -77,7 +77,7 @@ public final class helloify implements Constants {
patch.append(new PUSH(cp, mesg));
patch.append(new INVOKEVIRTUAL(println));
- final MethodGen mg = new MethodGen(m, class_name, cp);
+ final MethodGen mg = new MethodGen(m, className, cp);
final InstructionList il = mg.getInstructionList();
final InstructionHandle[] ihs = il.getInstructionHandles();
diff --git a/src/examples/maxstack.java b/src/examples/maxstack.java
index 6546c50c..44a854e1 100644
--- a/src/examples/maxstack.java
+++ b/src/examples/maxstack.java
@@ -31,18 +31,18 @@ import org.apache.bcel.generic.MethodGen;
public final class maxstack {
public static void main(final String[] argv) throws Exception {
- for (final String class_name : argv) {
- JavaClass java_class = Repository.lookupClass(class_name);
+ for (final String className : argv) {
+ JavaClass java_class = Repository.lookupClass(className);
if (java_class == null) {
- java_class = new ClassParser(class_name).parse();
+ java_class = new ClassParser(className).parse();
}
final ConstantPoolGen cp = new ConstantPoolGen(java_class.getConstantPool());
for (final Method m : java_class.getMethods()) {
if (!(m.isAbstract() || m.isNative())) {
- final MethodGen mg = new MethodGen(m, class_name, cp);
+ final MethodGen mg = new MethodGen(m, className, cp);
final int compiled_stack = mg.getMaxStack();
final int compiled_locals = mg.getMaxLocals();
diff --git a/src/main/java/org/apache/bcel/Repository.java b/src/main/java/org/apache/bcel/Repository.java
index 02d93507..201d7236 100644
--- a/src/main/java/org/apache/bcel/Repository.java
+++ b/src/main/java/org/apache/bcel/Repository.java
@@ -68,8 +68,8 @@ public abstract class Repository {
* @throws ClassNotFoundException if the named class can't be found, or if any of its superclasses or superinterfaces
* can't be found
*/
- public static JavaClass[] getInterfaces(final String class_name) throws ClassNotFoundException {
- return getInterfaces(lookupClass(class_name));
+ public static JavaClass[] getInterfaces(final String className) throws ClassNotFoundException {
+ return getInterfaces(lookupClass(className));
}
/**
@@ -91,9 +91,8 @@ public abstract class Repository {
* @return list of super classes of clazz in ascending order, i.e., Object is always the last element.
* @throws ClassNotFoundException if the named class or any of its superclasses can't be found
*/
- public static JavaClass[] getSuperClasses(final String class_name) throws ClassNotFoundException {
- final JavaClass jc = lookupClass(class_name);
- return getSuperClasses(jc);
+ public static JavaClass[] getSuperClasses(final String className) throws ClassNotFoundException {
+ return getSuperClasses(lookupClass(className));
}
/**
@@ -179,20 +178,20 @@ public abstract class Repository {
* @return class object for given fully qualified class name
* @throws ClassNotFoundException if the class could not be found or parsed correctly
*/
- public static JavaClass lookupClass(final String class_name) throws ClassNotFoundException {
- return repository.loadClass(class_name);
+ public static JavaClass lookupClass(final String className) throws ClassNotFoundException {
+ return repository.loadClass(className);
}
/**
* @return class file object for given Java class by looking on the system class path; returns null if the class file
* can't be found
*/
- public static ClassPath.ClassFile lookupClassFile(final String class_name) {
+ public static ClassPath.ClassFile lookupClassFile(final String className) {
try (final ClassPath path = repository.getClassPath()) {
if (path == null) {
return null;
}
- return path.getClassFile(class_name);
+ return path.getClassFile(className);
} catch (final IOException e) {
return null;
}
diff --git a/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java b/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
index 0e289e32..d67eb5e5 100644
--- a/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
+++ b/src/main/java/org/apache/bcel/classfile/AnnotationDefault.java
@@ -66,7 +66,7 @@ public class AnnotationDefault extends Attribute {
}
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
return (Attribute) clone();
}
diff --git a/src/main/java/org/apache/bcel/classfile/Annotations.java b/src/main/java/org/apache/bcel/classfile/Annotations.java
index d2106196..f279963e 100644
--- a/src/main/java/org/apache/bcel/classfile/Annotations.java
+++ b/src/main/java/org/apache/bcel/classfile/Annotations.java
@@ -49,21 +49,21 @@ public abstract class Annotations extends Attribute {
}
/**
- * @param annotation_type the subclass type of the annotation
- * @param name_index Index pointing to the name <em>Code</em>
+ * @param annotationType the subclass type of the annotation
+ * @param nameIndex Index pointing to the name <em>Code</em>
* @param length Content length in bytes
* @param input Input stream
- * @param constant_pool Array of constants
+ * @param constantPool Array of constants
* @param isRuntimeVisible whether this Annotation visible at runtime
* @throws IOException if an I/O error occurs.
*/
- Annotations(final byte annotation_type, final int name_index, final int length, final DataInput input, final ConstantPool constant_pool,
+ Annotations(final byte annotationType, final int nameIndex, final int length, final DataInput input, final ConstantPool constantPool,
final boolean isRuntimeVisible) throws IOException {
- this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool, isRuntimeVisible);
+ this(annotationType, nameIndex, length, (AnnotationEntry[]) null, constantPool, isRuntimeVisible);
final int annotation_table_length = input.readUnsignedShort();
annotationTable = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
- annotationTable[i] = AnnotationEntry.read(input, constant_pool, isRuntimeVisible);
+ annotationTable[i] = AnnotationEntry.read(input, constantPool, isRuntimeVisible);
}
}
diff --git a/src/main/java/org/apache/bcel/classfile/Attribute.java b/src/main/java/org/apache/bcel/classfile/Attribute.java
index 88b1e0fa..1ecfc9b0 100644
--- a/src/main/java/org/apache/bcel/classfile/Attribute.java
+++ b/src/main/java/org/apache/bcel/classfile/Attribute.java
@@ -274,7 +274,7 @@ public abstract class Attribute implements Cloneable, Node {
/**
* @return deep copy of this attribute
*/
- public abstract Attribute copy(ConstantPool _constant_pool);
+ public abstract Attribute copy(ConstantPool constantPool);
/**
* Dump attribute to file stream in binary format.
diff --git a/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java b/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
index e0e8ccce..087c83c6 100644
--- a/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
+++ b/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
@@ -84,14 +84,14 @@ public class BootstrapMethods extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public BootstrapMethods copy(final ConstantPool _constant_pool) {
+ public BootstrapMethods copy(final ConstantPool constantPool) {
final BootstrapMethods c = (BootstrapMethods) clone();
c.bootstrapMethods = new BootstrapMethod[bootstrapMethods.length];
for (int i = 0; i < bootstrapMethods.length; i++) {
c.bootstrapMethods[i] = bootstrapMethods[i].copy();
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/Code.java b/src/main/java/org/apache/bcel/classfile/Code.java
index fc3debbf..e0cba492 100644
--- a/src/main/java/org/apache/bcel/classfile/Code.java
+++ b/src/main/java/org/apache/bcel/classfile/Code.java
@@ -138,23 +138,23 @@ public final class Code extends Attribute {
/**
* @return deep copy of this attribute
*
- * @param _constant_pool the constant pool to duplicate
+ * @param constantPool the constant pool to duplicate
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final Code c = (Code) clone();
if (code != null) {
c.code = new byte[code.length];
System.arraycopy(code, 0, c.code, 0, code.length);
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
c.exceptionTable = new CodeException[exceptionTable.length];
for (int i = 0; i < exceptionTable.length; i++) {
c.exceptionTable[i] = exceptionTable[i].copy();
}
c.attributes = new Attribute[attributes.length];
for (int i = 0; i < attributes.length; i++) {
- c.attributes[i] = attributes[i].copy(_constant_pool);
+ c.attributes[i] = attributes[i].copy(constantPool);
}
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantCP.java b/src/main/java/org/apache/bcel/classfile/ConstantCP.java
index f094a794..bc90dc62 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantCP.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantCP.java
@@ -63,13 +63,13 @@ public abstract class ConstantCP extends Constant {
}
/**
- * @param class_index Reference to the class containing the field
- * @param name_and_type_index and the field signature
+ * @param classIndex Reference to the class containing the field
+ * @param nameAndTypeIndex and the field signature
*/
- protected ConstantCP(final byte tag, final int class_index, final int name_and_type_index) {
+ protected ConstantCP(final byte tag, final int classIndex, final int nameAndTypeIndex) {
super(tag);
- this.class_index = class_index;
- this.name_and_type_index = name_and_type_index;
+ this.class_index = classIndex;
+ this.name_and_type_index = nameAndTypeIndex;
}
/**
@@ -121,10 +121,10 @@ public abstract class ConstantCP extends Constant {
}
/**
- * @param name_and_type_index points to Constant_NameAndType
+ * @param nameAndTypeIndex points to Constant_NameAndType
*/
- public final void setNameAndTypeIndex(final int name_and_type_index) {
- this.name_and_type_index = name_and_type_index;
+ public final void setNameAndTypeIndex(final int nameAndTypeIndex) {
+ this.name_and_type_index = nameAndTypeIndex;
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantDynamic.java b/src/main/java/org/apache/bcel/classfile/ConstantDynamic.java
index ea4392d9..730d6bc5 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantDynamic.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantDynamic.java
@@ -50,8 +50,8 @@ public final class ConstantDynamic extends ConstantCP {
this(file.readShort(), file.readShort());
}
- public ConstantDynamic(final int bootstrap_method_attr_index, final int name_and_type_index) {
- super(Const.CONSTANT_Dynamic, bootstrap_method_attr_index, name_and_type_index);
+ public ConstantDynamic(final int bootstrapMethodAttrIndex, final int nameAndTypeIndex) {
+ super(Const.CONSTANT_Dynamic, bootstrapMethodAttrIndex, nameAndTypeIndex);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java b/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java
index ec24bf01..9ac3626b 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantFieldref.java
@@ -46,11 +46,11 @@ public final class ConstantFieldref extends ConstantCP {
}
/**
- * @param class_index Reference to the class containing the Field
- * @param name_and_type_index and the Field signature
+ * @param classIndex Reference to the class containing the Field
+ * @param nameAndTypeIndex and the Field signature
*/
- public ConstantFieldref(final int class_index, final int name_and_type_index) {
- super(Const.CONSTANT_Fieldref, class_index, name_and_type_index);
+ public ConstantFieldref(final int classIndex, final int nameAndTypeIndex) {
+ super(Const.CONSTANT_Fieldref, classIndex, nameAndTypeIndex);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java b/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
index e343f927..a4cee3bc 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
@@ -46,11 +46,11 @@ public final class ConstantInterfaceMethodref extends ConstantCP {
}
/**
- * @param class_index Reference to the class containing the method
- * @param name_and_type_index and the method signature
+ * @param classIndex Reference to the class containing the method
+ * @param nameAndTypeIndex and the method signature
*/
- public ConstantInterfaceMethodref(final int class_index, final int name_and_type_index) {
- super(Const.CONSTANT_InterfaceMethodref, class_index, name_and_type_index);
+ public ConstantInterfaceMethodref(final int classIndex, final int nameAndTypeIndex) {
+ super(Const.CONSTANT_InterfaceMethodref, classIndex, nameAndTypeIndex);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.java b/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.java
index 19b756c3..d0699d4e 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantInvokeDynamic.java
@@ -49,8 +49,8 @@ public final class ConstantInvokeDynamic extends ConstantCP {
this(file.readShort(), file.readShort());
}
- public ConstantInvokeDynamic(final int bootstrap_method_attr_index, final int name_and_type_index) {
- super(Const.CONSTANT_InvokeDynamic, bootstrap_method_attr_index, name_and_type_index);
+ public ConstantInvokeDynamic(final int bootstrapMethodAttrIndex, final int nameAndTypeIndex) {
+ super(Const.CONSTANT_InvokeDynamic, bootstrapMethodAttrIndex, nameAndTypeIndex);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java b/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java
index 829fc409..836e481a 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantMethodref.java
@@ -46,11 +46,11 @@ public final class ConstantMethodref extends ConstantCP {
}
/**
- * @param class_index Reference to the class containing the method
- * @param name_and_type_index and the method signature
+ * @param classIndex Reference to the class containing the method
+ * @param nameAndTypeIndex and the method signature
*/
- public ConstantMethodref(final int class_index, final int name_and_type_index) {
- super(Const.CONSTANT_Methodref, class_index, name_and_type_index);
+ public ConstantMethodref(final int classIndex, final int nameAndTypeIndex) {
+ super(Const.CONSTANT_Methodref, classIndex, nameAndTypeIndex);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantValue.java b/src/main/java/org/apache/bcel/classfile/ConstantValue.java
index f027680b..001bb196 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantValue.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantValue.java
@@ -80,9 +80,9 @@ public final class ConstantValue extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final ConstantValue c = (ConstantValue) clone();
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/Deprecated.java b/src/main/java/org/apache/bcel/classfile/Deprecated.java
index 6f324416..0c445395 100644
--- a/src/main/java/org/apache/bcel/classfile/Deprecated.java
+++ b/src/main/java/org/apache/bcel/classfile/Deprecated.java
@@ -85,13 +85,13 @@ public final class Deprecated extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final Deprecated c = (Deprecated) clone();
if (bytes != null) {
c.bytes = new byte[bytes.length];
System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java b/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java
index c87a1759..e579d89b 100644
--- a/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java
+++ b/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java
@@ -331,13 +331,13 @@ public class DescendingVisitor implements Visitor {
}
@Override
- public void visitJavaClass(final JavaClass _clazz) {
- stack.push(_clazz);
- _clazz.accept(visitor);
- accept(_clazz.getFields());
- accept(_clazz.getMethods());
- accept(_clazz.getAttributes());
- _clazz.getConstantPool().accept(this);
+ public void visitJavaClass(final JavaClass clazz) {
+ stack.push(clazz);
+ clazz.accept(visitor);
+ accept(clazz.getFields());
+ accept(clazz.getMethods());
+ accept(clazz.getAttributes());
+ clazz.getConstantPool().accept(this);
stack.pop();
}
diff --git a/src/main/java/org/apache/bcel/classfile/ExceptionTable.java b/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
index ea4533e9..1bd66028 100644
--- a/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
+++ b/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
@@ -88,13 +88,13 @@ public final class ExceptionTable extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final ExceptionTable c = (ExceptionTable) clone();
if (exceptionIndexTable != null) {
c.exceptionIndexTable = new int[exceptionIndexTable.length];
System.arraycopy(exceptionIndexTable, 0, c.exceptionIndexTable, 0, exceptionIndexTable.length);
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/Field.java b/src/main/java/org/apache/bcel/classfile/Field.java
index 4159dbb9..a890c59a 100644
--- a/src/main/java/org/apache/bcel/classfile/Field.java
+++ b/src/main/java/org/apache/bcel/classfile/Field.java
@@ -116,8 +116,8 @@ public final class Field extends FieldOrMethod {
/**
* @return deep copy of this field
*/
- public Field copy(final ConstantPool _constant_pool) {
- return (Field) copy_(_constant_pool);
+ public Field copy(final ConstantPool constantPool) {
+ return (Field) copy_(constantPool);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/InnerClass.java b/src/main/java/org/apache/bcel/classfile/InnerClass.java
index bb3dca2c..7f705574 100644
--- a/src/main/java/org/apache/bcel/classfile/InnerClass.java
+++ b/src/main/java/org/apache/bcel/classfile/InnerClass.java
@@ -170,23 +170,23 @@ public final class InnerClass implements Cloneable, Node {
* @return Resolved string representation
*/
public String toString(final ConstantPool constantPool) {
- String outer_class_name;
- String inner_name;
- String inner_class_name = constantPool.getConstantString(innerClassIndex, Const.CONSTANT_Class);
- inner_class_name = Utility.compactClassName(inner_class_name, false);
+ String outerClassName;
+ String innerName;
+ String innerClassName = constantPool.getConstantString(innerClassIndex, Const.CONSTANT_Class);
+ innerClassName = Utility.compactClassName(innerClassName, false);
if (outerClassIndex != 0) {
- outer_class_name = constantPool.getConstantString(outerClassIndex, Const.CONSTANT_Class);
- outer_class_name = " of class " + Utility.compactClassName(outer_class_name, false);
+ outerClassName = constantPool.getConstantString(outerClassIndex, Const.CONSTANT_Class);
+ outerClassName = " of class " + Utility.compactClassName(outerClassName, false);
} else {
- outer_class_name = "";
+ outerClassName = "";
}
if (innerNameIndex != 0) {
- inner_name = ((ConstantUtf8) constantPool.getConstant(innerNameIndex, Const.CONSTANT_Utf8)).getBytes();
+ innerName = ((ConstantUtf8) constantPool.getConstant(innerNameIndex, Const.CONSTANT_Utf8)).getBytes();
} else {
- inner_name = "(anonymous)";
+ innerName = "(anonymous)";
}
String access = Utility.accessToString(innerAccessFlags, true);
access = access.isEmpty() ? "" : access + " ";
- return " " + access + inner_name + "=class " + inner_class_name + outer_class_name;
+ return " " + access + innerName + "=class " + innerClassName + outerClassName;
}
}
diff --git a/src/main/java/org/apache/bcel/classfile/InnerClasses.java b/src/main/java/org/apache/bcel/classfile/InnerClasses.java
index d3d92700..300feca7 100644
--- a/src/main/java/org/apache/bcel/classfile/InnerClasses.java
+++ b/src/main/java/org/apache/bcel/classfile/InnerClasses.java
@@ -90,14 +90,14 @@ public final class InnerClasses extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
// TODO this could be recoded to use a lower level constructor after creating a copy of the inner classes
final InnerClasses c = (InnerClasses) clone();
c.innerClasses = new InnerClass[innerClasses.length];
for (int i = 0; i < innerClasses.length; i++) {
c.innerClasses[i] = innerClasses[i].copy();
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java b/src/main/java/org/apache/bcel/classfile/JavaClass.java
index 676c329c..b5eefd5c 100644
--- a/src/main/java/org/apache/bcel/classfile/JavaClass.java
+++ b/src/main/java/org/apache/bcel/classfile/JavaClass.java
@@ -258,9 +258,9 @@ public class JavaClass extends AccessFlags implements Cloneable, Node, Comparabl
final InnerClass[] innerClasses = ((InnerClasses) attribute).getInnerClasses();
for (final InnerClass innerClasse : innerClasses) {
boolean innerClassAttributeRefersToMe = false;
- String inner_class_name = constantPool.getConstantString(innerClasse.getInnerClassIndex(), Const.CONSTANT_Class);
- inner_class_name = Utility.compactClassName(inner_class_name, false);
- if (inner_class_name.equals(getClassName())) {
+ String innerClassName = constantPool.getConstantString(innerClasse.getInnerClassIndex(), Const.CONSTANT_Class);
+ innerClassName = Utility.compactClassName(innerClassName, false);
+ if (innerClassName.equals(getClassName())) {
innerClassAttributeRefersToMe = true;
}
if (innerClassAttributeRefersToMe) {
@@ -372,11 +372,11 @@ public class JavaClass extends AccessFlags implements Cloneable, Node, Comparabl
/**
* Dump class to a file named fileName.
*
- * @param _file_name Output file name
+ * @param fileName Output file name
* @throws IOException if an I/O error occurs.
*/
- public void dump(final String _file_name) throws IOException {
- dump(new File(_file_name));
+ public void dump(final String fileName) throws IOException {
+ dump(new File(fileName));
}
/**
@@ -400,14 +400,14 @@ public class JavaClass extends AccessFlags implements Cloneable, Node, Comparabl
while (!queue.empty()) {
final JavaClass clazz = queue.dequeue();
final JavaClass souper = clazz.getSuperClass();
- final JavaClass[] _interfaces = clazz.getInterfaces();
+ final JavaClass[] interfaces = clazz.getInterfaces();
if (clazz.isInterface()) {
allInterfaces.add(clazz);
} else if (souper != null) {
queue.enqueue(souper);
}
- for (final JavaClass _interface : _interfaces) {
- queue.enqueue(_interface);
+ for (final JavaClass iface : interfaces) {
+ queue.enqueue(iface);
}
}
return allInterfaces.toArray(JavaClass.EMPTY_ARRAY);
@@ -506,10 +506,10 @@ public class JavaClass extends AccessFlags implements Cloneable, Node, Comparabl
* Get interfaces directly implemented by this JavaClass.
*/
public JavaClass[] getInterfaces() throws ClassNotFoundException {
- final String[] _interfaces = getInterfaceNames();
- final JavaClass[] classes = new JavaClass[_interfaces.length];
- for (int i = 0; i < _interfaces.length; i++) {
- classes[i] = repository.loadClass(_interfaces[i]);
+ final String[] interfaces = getInterfaceNames();
+ final JavaClass[] classes = new JavaClass[interfaces.length];
+ for (int i = 0; i < interfaces.length; i++) {
+ classes[i] = repository.loadClass(interfaces[i]);
}
return classes;
}
diff --git a/src/main/java/org/apache/bcel/classfile/LineNumberTable.java b/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
index edb803f3..87109d69 100644
--- a/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
+++ b/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
@@ -90,7 +90,7 @@ public final class LineNumberTable extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
// TODO could use the lower level constructor and thereby allow
// lineNumberTable to be made final
final LineNumberTable c = (LineNumberTable) clone();
@@ -98,7 +98,7 @@ public final class LineNumberTable extends Attribute {
for (int i = 0; i < lineNumberTable.length; i++) {
c.lineNumberTable[i] = lineNumberTable[i].copy();
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java b/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
index 071de082..14667ee1 100644
--- a/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
+++ b/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
@@ -86,13 +86,13 @@ public class LocalVariableTable extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final LocalVariableTable c = (LocalVariableTable) clone();
c.localVariableTable = new LocalVariable[localVariableTable.length];
for (int i = 0; i < localVariableTable.length; i++) {
c.localVariableTable[i] = localVariableTable[i].copy();
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java b/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
index e01685a7..c3def9a3 100644
--- a/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
+++ b/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
@@ -61,10 +61,10 @@ public class LocalVariableTypeTable extends Attribute {
LocalVariableTypeTable(final int nameIdx, final int len, final DataInput input, final ConstantPool cpool) throws IOException {
this(nameIdx, len, (LocalVariable[]) null, cpool);
- final int local_variable_type_table_length = input.readUnsignedShort();
- localVariableTypeTable = new LocalVariable[local_variable_type_table_length];
+ final int localVariableTypeTableLength = input.readUnsignedShort();
+ localVariableTypeTable = new LocalVariable[localVariableTypeTableLength];
- for (int i = 0; i < local_variable_type_table_length; i++) {
+ for (int i = 0; i < localVariableTypeTableLength; i++) {
localVariableTypeTable[i] = new LocalVariable(input, cpool);
}
}
diff --git a/src/main/java/org/apache/bcel/classfile/Method.java b/src/main/java/org/apache/bcel/classfile/Method.java
index efd8798c..7250cb7b 100644
--- a/src/main/java/org/apache/bcel/classfile/Method.java
+++ b/src/main/java/org/apache/bcel/classfile/Method.java
@@ -127,8 +127,8 @@ public final class Method extends FieldOrMethod {
/**
* @return deep copy of this method
*/
- public Method copy(final ConstantPool _constant_pool) {
- return (Method) copy_(_constant_pool);
+ public Method copy(final ConstantPool constantPool) {
+ return (Method) copy_(constantPool);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/MethodParameters.java b/src/main/java/org/apache/bcel/classfile/MethodParameters.java
index f7f4c95f..37c412b4 100644
--- a/src/main/java/org/apache/bcel/classfile/MethodParameters.java
+++ b/src/main/java/org/apache/bcel/classfile/MethodParameters.java
@@ -55,14 +55,14 @@ public class MethodParameters extends Attribute {
}
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final MethodParameters c = (MethodParameters) clone();
c.parameters = new MethodParameter[parameters.length];
for (int i = 0; i < parameters.length; i++) {
c.parameters[i] = parameters[i].copy();
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/Module.java b/src/main/java/org/apache/bcel/classfile/Module.java
index af348709..1d1eb746 100644
--- a/src/main/java/org/apache/bcel/classfile/Module.java
+++ b/src/main/java/org/apache/bcel/classfile/Module.java
@@ -107,7 +107,7 @@ public final class Module extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final Module c = (Module) clone();
c.requiresTable = new ModuleRequires[requiresTable.length];
@@ -130,7 +130,7 @@ public final class Module extends Attribute {
c.providesTable[i] = providesTable[i].copy();
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
@@ -236,8 +236,8 @@ public final class Module extends Attribute {
buf.append(" uses(").append(usesIndex.length).append("):\n");
for (final int index : usesIndex) {
- final String class_name = cp.getConstantString(index, Const.CONSTANT_Class);
- buf.append(" ").append(Utility.compactClassName(class_name, false)).append("\n");
+ final String className = cp.getConstantString(index, Const.CONSTANT_Class);
+ buf.append(" ").append(Utility.compactClassName(className, false)).append("\n");
}
buf.append(" provides(").append(providesTable.length).append("):\n");
diff --git a/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java b/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java
index 114e0295..14d8da42 100644
--- a/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java
+++ b/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java
@@ -81,9 +81,9 @@ public final class ModuleMainClass extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final ModuleMainClass c = (ModuleMainClass) clone();
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
@@ -120,8 +120,8 @@ public final class ModuleMainClass extends Attribute {
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("ModuleMainClass: ");
- final String class_name = super.getConstantPool().getConstantString(mainClassIndex, Const.CONSTANT_Class);
- buf.append(Utility.compactClassName(class_name, false));
+ final String className = super.getConstantPool().getConstantString(mainClassIndex, Const.CONSTANT_Class);
+ buf.append(Utility.compactClassName(className, false));
return buf.toString();
}
}
diff --git a/src/main/java/org/apache/bcel/classfile/ModulePackages.java b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
index cdd8ec3e..f14295f1 100644
--- a/src/main/java/org/apache/bcel/classfile/ModulePackages.java
+++ b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
@@ -86,13 +86,13 @@ public final class ModulePackages extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final ModulePackages c = (ModulePackages) clone();
if (packageIndexTable != null) {
c.packageIndexTable = new int[packageIndexTable.length];
System.arraycopy(packageIndexTable, 0, c.packageIndexTable, 0, packageIndexTable.length);
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/ModuleProvides.java b/src/main/java/org/apache/bcel/classfile/ModuleProvides.java
index 6ae4c589..0179dcc0 100644
--- a/src/main/java/org/apache/bcel/classfile/ModuleProvides.java
+++ b/src/main/java/org/apache/bcel/classfile/ModuleProvides.java
@@ -101,14 +101,14 @@ public final class ModuleProvides implements Cloneable, Node {
/**
* @return Resolved string representation
*/
- public String toString(final ConstantPool constant_pool) {
+ public String toString(final ConstantPool constantPool) {
final StringBuilder buf = new StringBuilder();
- final String interface_name = constant_pool.constantToString(providesIndex, Const.CONSTANT_Class);
+ final String interface_name = constantPool.constantToString(providesIndex, Const.CONSTANT_Class);
buf.append(Utility.compactClassName(interface_name, false));
buf.append(", with(").append(providesWithCount).append("):\n");
for (final int index : providesWithIndex) {
- final String class_name = constant_pool.getConstantString(index, Const.CONSTANT_Class);
- buf.append(" ").append(Utility.compactClassName(class_name, false)).append("\n");
+ final String className = constantPool.getConstantString(index, Const.CONSTANT_Class);
+ buf.append(" ").append(Utility.compactClassName(className, false)).append("\n");
}
return buf.substring(0, buf.length() - 1); // remove the last newline
}
diff --git a/src/main/java/org/apache/bcel/classfile/NestHost.java b/src/main/java/org/apache/bcel/classfile/NestHost.java
index 30e825ec..561b3fea 100644
--- a/src/main/java/org/apache/bcel/classfile/NestHost.java
+++ b/src/main/java/org/apache/bcel/classfile/NestHost.java
@@ -81,9 +81,9 @@ public final class NestHost extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final NestHost c = (NestHost) clone();
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
@@ -120,8 +120,8 @@ public final class NestHost extends Attribute {
public String toString() {
final StringBuilder buf = new StringBuilder();
buf.append("NestHost: ");
- final String class_name = super.getConstantPool().getConstantString(hostClassIndex, Const.CONSTANT_Class);
- buf.append(Utility.compactClassName(class_name, false));
+ final String className = super.getConstantPool().getConstantString(hostClassIndex, Const.CONSTANT_Class);
+ buf.append(Utility.compactClassName(className, false));
return buf.toString();
}
}
diff --git a/src/main/java/org/apache/bcel/classfile/NestMembers.java b/src/main/java/org/apache/bcel/classfile/NestMembers.java
index 83b706d6..66367b17 100644
--- a/src/main/java/org/apache/bcel/classfile/NestMembers.java
+++ b/src/main/java/org/apache/bcel/classfile/NestMembers.java
@@ -87,13 +87,13 @@ public final class NestMembers extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final NestMembers c = (NestMembers) clone();
if (classes != null) {
c.classes = new int[classes.length];
System.arraycopy(classes, 0, c.classes, 0, classes.length);
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
@@ -154,8 +154,8 @@ public final class NestMembers extends Attribute {
buf.append(classes.length);
buf.append("):\n");
for (final int index : classes) {
- final String class_name = super.getConstantPool().getConstantString(index, Const.CONSTANT_Class);
- buf.append(" ").append(Utility.compactClassName(class_name, false)).append("\n");
+ final String className = super.getConstantPool().getConstantString(index, Const.CONSTANT_Class);
+ buf.append(" ").append(Utility.compactClassName(className, false)).append("\n");
}
return buf.substring(0, buf.length() - 1); // remove the last newline
}
diff --git a/src/main/java/org/apache/bcel/classfile/PMGClass.java b/src/main/java/org/apache/bcel/classfile/PMGClass.java
index 70394fb2..1c2c200b 100644
--- a/src/main/java/org/apache/bcel/classfile/PMGClass.java
+++ b/src/main/java/org/apache/bcel/classfile/PMGClass.java
@@ -82,7 +82,7 @@ public final class PMGClass extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
return (Attribute) clone();
}
diff --git a/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java b/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
index 19dc3d6a..76f58946 100644
--- a/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
+++ b/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
@@ -32,15 +32,15 @@ public abstract class ParameterAnnotations extends Attribute {
private ParameterAnnotationEntry[] parameterAnnotationTable;
/**
- * @param parameter_annotation_type the subclass type of the parameter annotation
+ * @param parameterAnnotationType the subclass type of the parameter annotation
* @param name_index Index pointing to the name <em>Code</em>
* @param length Content length in bytes
* @param input Input stream
* @param constant_pool Array of constants
*/
- ParameterAnnotations(final byte parameter_annotation_type, final int name_index, final int length, final DataInput input, final ConstantPool constant_pool)
+ ParameterAnnotations(final byte parameterAnnotationType, final int name_index, final int length, final DataInput input, final ConstantPool constant_pool)
throws IOException {
- this(parameter_annotation_type, name_index, length, (ParameterAnnotationEntry[]) null, constant_pool);
+ this(parameterAnnotationType, name_index, length, (ParameterAnnotationEntry[]) null, constant_pool);
final int num_parameters = input.readUnsignedByte();
parameterAnnotationTable = new ParameterAnnotationEntry[num_parameters];
for (int i = 0; i < num_parameters; i++) {
diff --git a/src/main/java/org/apache/bcel/classfile/Signature.java b/src/main/java/org/apache/bcel/classfile/Signature.java
index aa3c22c7..96cb0ddf 100644
--- a/src/main/java/org/apache/bcel/classfile/Signature.java
+++ b/src/main/java/org/apache/bcel/classfile/Signature.java
@@ -197,7 +197,7 @@ public final class Signature extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
return (Attribute) clone();
}
diff --git a/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java b/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java
index fa75f757..30b2eb1a 100644
--- a/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java
+++ b/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java
@@ -35,9 +35,9 @@ public class SimpleElementValue extends ElementValue {
@Override
public void dump(final DataOutputStream dos) throws IOException {
- final int _type = super.getType();
- dos.writeByte(_type); // u1 kind of value
- switch (_type) {
+ final int type = super.getType();
+ dos.writeByte(type); // u1 kind of value
+ switch (type) {
case PRIMITIVE_INT:
case PRIMITIVE_BYTE:
case PRIMITIVE_CHAR:
@@ -50,7 +50,7 @@ public class SimpleElementValue extends ElementValue {
dos.writeShort(getIndex());
break;
default:
- throw new IllegalStateException("SimpleElementValue doesnt know how to write out type " + _type);
+ throw new IllegalStateException("SimpleElementValue doesnt know how to write out type " + type);
}
}
@@ -141,8 +141,8 @@ public class SimpleElementValue extends ElementValue {
@Override
public String stringifyValue() {
final ConstantPool cpool = super.getConstantPool();
- final int _type = super.getType();
- switch (_type) {
+ final int type = super.getType();
+ switch (type) {
case PRIMITIVE_INT:
final ConstantInteger c = (ConstantInteger) cpool.getConstant(getIndex(), Const.CONSTANT_Integer);
return Integer.toString(c.getBytes());
@@ -174,7 +174,7 @@ public class SimpleElementValue extends ElementValue {
final ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(getIndex(), Const.CONSTANT_Utf8);
return cu8.getBytes();
default:
- throw new IllegalStateException("SimpleElementValue class does not know how to stringify type " + _type);
+ throw new IllegalStateException("SimpleElementValue class does not know how to stringify type " + type);
}
}
diff --git a/src/main/java/org/apache/bcel/classfile/SourceFile.java b/src/main/java/org/apache/bcel/classfile/SourceFile.java
index 83288233..1587915f 100644
--- a/src/main/java/org/apache/bcel/classfile/SourceFile.java
+++ b/src/main/java/org/apache/bcel/classfile/SourceFile.java
@@ -84,7 +84,7 @@ public final class SourceFile extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
return (Attribute) clone();
}
diff --git a/src/main/java/org/apache/bcel/classfile/StackMap.java b/src/main/java/org/apache/bcel/classfile/StackMap.java
index a80044c4..b6632aef 100644
--- a/src/main/java/org/apache/bcel/classfile/StackMap.java
+++ b/src/main/java/org/apache/bcel/classfile/StackMap.java
@@ -84,13 +84,13 @@ public final class StackMap extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final StackMap c = (StackMap) clone();
c.map = new StackMapEntry[map.length];
for (int i = 0; i < map.length; i++) {
c.map[i] = map[i].copy();
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/Synthetic.java b/src/main/java/org/apache/bcel/classfile/Synthetic.java
index 24186818..9a626ee8 100644
--- a/src/main/java/org/apache/bcel/classfile/Synthetic.java
+++ b/src/main/java/org/apache/bcel/classfile/Synthetic.java
@@ -87,13 +87,13 @@ public final class Synthetic extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final Synthetic c = (Synthetic) clone();
if (bytes != null) {
c.bytes = new byte[bytes.length];
System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/Unknown.java b/src/main/java/org/apache/bcel/classfile/Unknown.java
index 35c52468..c2affe40 100644
--- a/src/main/java/org/apache/bcel/classfile/Unknown.java
+++ b/src/main/java/org/apache/bcel/classfile/Unknown.java
@@ -108,13 +108,13 @@ public final class Unknown extends Attribute {
* @return deep copy of this attribute
*/
@Override
- public Attribute copy(final ConstantPool _constant_pool) {
+ public Attribute copy(final ConstantPool constantPool) {
final Unknown c = (Unknown) clone();
if (bytes != null) {
c.bytes = new byte[bytes.length];
System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
}
- c.setConstantPool(_constant_pool);
+ c.setConstantPool(constantPool);
return c;
}
diff --git a/src/main/java/org/apache/bcel/classfile/Utility.java b/src/main/java/org/apache/bcel/classfile/Utility.java
index a7a70625..96a478f9 100644
--- a/src/main/java/org/apache/bcel/classfile/Utility.java
+++ b/src/main/java/org/apache/bcel/classfile/Utility.java
@@ -972,8 +972,8 @@ public abstract class Utility {
throw new ClassFormatException("Invalid method signature: " + signature);
}
while (signature.charAt(index) != ')') {
- final String param_type = typeSignatureToString(signature.substring(index), chopit);
- buf.append(param_type);
+ final String paramType = typeSignatureToString(signature.substring(index), chopit);
+ buf.append(paramType);
if (vars != null) {
final LocalVariable l = vars.getLocalVariable(var_index, 0);
if (l != null) {
@@ -982,7 +982,7 @@ public abstract class Utility {
} else {
buf.append(" arg").append(var_index);
}
- if ("double".equals(param_type) || "long".equals(param_type)) {
+ if ("double".equals(paramType) || "long".equals(paramType)) {
var_index += 2;
} else {
var_index++;
@@ -1525,8 +1525,8 @@ public abstract class Utility {
type = typeSignatureToString(signature.substring(n), chopit);
// corrected concurrent private static field acess
// Utility.consumed_chars += consumed_chars; is replaced by:
- final int _temp = unwrap(Utility.CONSUMER_CHARS) + consumed_chars;
- wrap(Utility.CONSUMER_CHARS, _temp);
+ final int temp = unwrap(Utility.CONSUMER_CHARS) + consumed_chars;
+ wrap(Utility.CONSUMER_CHARS, temp);
return type + brackets.toString();
}
case 'V':
diff --git a/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java b/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java
index 0548a243..d593a297 100644
--- a/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/ArithmeticInstruction.java
@@ -43,8 +43,8 @@ public abstract class ArithmeticInstruction extends Instruction implements Typed
*/
@Override
public Type getType(final ConstantPoolGen cp) {
- final short _opcode = super.getOpcode();
- switch (_opcode) {
+ final short opcode = super.getOpcode();
+ switch (opcode) {
case Const.DADD:
case Const.DDIV:
case Const.DMUL:
@@ -86,7 +86,7 @@ public abstract class ArithmeticInstruction extends Instruction implements Typed
case Const.LXOR:
return Type.LONG;
default: // Never reached
- throw new ClassGenException("Unknown type " + _opcode);
+ throw new ClassGenException("Unknown type " + opcode);
}
}
}
diff --git a/src/main/java/org/apache/bcel/generic/ArrayInstruction.java b/src/main/java/org/apache/bcel/generic/ArrayInstruction.java
index b8b9bbd4..106944f5 100644
--- a/src/main/java/org/apache/bcel/generic/ArrayInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/ArrayInstruction.java
@@ -48,8 +48,8 @@ public abstract class ArrayInstruction extends Instruction implements ExceptionT
*/
@Override
public Type getType(final ConstantPoolGen cp) {
- final short _opcode = super.getOpcode();
- switch (_opcode) {
+ final short opcode = super.getOpcode();
+ switch (opcode) {
case org.apache.bcel.Const.IALOAD:
case org.apache.bcel.Const.IASTORE:
return Type.INT;
@@ -75,7 +75,7 @@ public abstract class ArrayInstruction extends Instruction implements ExceptionT
case org.apache.bcel.Const.AASTORE:
return Type.OBJECT;
default:
- throw new ClassGenException("Unknown case in switch" + _opcode);
+ throw new ClassGenException("Unknown case in switch" + opcode);
}
}
}
diff --git a/src/main/java/org/apache/bcel/generic/ArrayType.java b/src/main/java/org/apache/bcel/generic/ArrayType.java
index 2f75ae8a..ab551b3a 100644
--- a/src/main/java/org/apache/bcel/generic/ArrayType.java
+++ b/src/main/java/org/apache/bcel/generic/ArrayType.java
@@ -40,10 +40,10 @@ public final class ArrayType extends ReferenceType {
/**
* Convenience constructor for reference array type, e.g. Object[]
*
- * @param class_name complete name of class (java.lang.String, e.g.)
+ * @param className complete name of class (java.lang.String, e.g.)
*/
- public ArrayType(final String class_name, final int dimensions) {
- this(ObjectType.getInstance(class_name), dimensions);
+ public ArrayType(final String className, final int dimensions) {
+ this(ObjectType.getInstance(className), dimensions);
}
/**
@@ -81,9 +81,9 @@ public final class ArrayType extends ReferenceType {
* @return true if both type objects refer to the same array type.
*/
@Override
- public boolean equals(final Object _type) {
- if (_type instanceof ArrayType) {
- final ArrayType array = (ArrayType) _type;
+ public boolean equals(final Object type) {
+ if (type instanceof ArrayType) {
+ final ArrayType array = (ArrayType) type;
return array.dimensions == dimensions && array.basicType.equals(basicType);
}
return false;
diff --git a/src/main/java/org/apache/bcel/generic/BasicType.java b/src/main/java/org/apache/bcel/generic/BasicType.java
index 28366233..37cd9357 100644
--- a/src/main/java/org/apache/bcel/generic/BasicType.java
+++ b/src/main/java/org/apache/bcel/generic/BasicType.java
@@ -68,8 +68,8 @@ public final class BasicType extends Type {
* @return true if both type objects refer to the same type
*/
@Override
- public boolean equals(final Object _type) {
- return _type instanceof BasicType ? ((BasicType) _type).getType() == this.getType() : false;
+ public boolean equals(final Object type) {
+ return type instanceof BasicType ? ((BasicType) type).getType() == this.getType() : false;
}
/**
diff --git a/src/main/java/org/apache/bcel/generic/BranchInstruction.java b/src/main/java/org/apache/bcel/generic/BranchInstruction.java
index 1f18f8d1..3e05aeb0 100644
--- a/src/main/java/org/apache/bcel/generic/BranchInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/BranchInstruction.java
@@ -140,16 +140,16 @@ public abstract class BranchInstruction extends Instruction implements Instructi
}
/**
- * @param _target branch target
+ * @param target branch target
* @return the offset to `target' relative to this instruction
*/
- protected int getTargetOffset(final InstructionHandle _target) {
- if (_target == null) {
+ protected int getTargetOffset(final InstructionHandle target) {
+ if (target == null) {
throw new ClassGenException("Target of " + super.toString(true) + " is invalid null handle");
}
- final int t = _target.getPosition();
+ final int t = target.getPosition();
if (t < 0) {
- throw new ClassGenException("Invalid branch target position offset for " + super.toString(true) + ":" + t + ":" + _target);
+ throw new ClassGenException("Invalid branch target position offset for " + super.toString(true) + ":" + t + ":" + target);
}
return t - position;
}
diff --git a/src/main/java/org/apache/bcel/generic/ClassGen.java b/src/main/java/org/apache/bcel/generic/ClassGen.java
index e51cee44..2eeb1131 100644
--- a/src/main/java/org/apache/bcel/generic/ClassGen.java
+++ b/src/main/java/org/apache/bcel/generic/ClassGen.java
@@ -79,7 +79,7 @@ public class ClassGen extends AccessFlags implements Cloneable {
private String superClassName;
private final String fileName;
private int classNameIndex = -1;
- private int superclass_name_index = -1;
+ private int superclassNameIndex = -1;
private int major = Const.MAJOR_1_1;
private int minor = Const.MINOR_1_1;
private ConstantPoolGen cp; // Template for building up constant pool
@@ -103,7 +103,7 @@ public class ClassGen extends AccessFlags implements Cloneable {
public ClassGen(final JavaClass clazz) {
super(clazz.getAccessFlags());
classNameIndex = clazz.getClassNameIndex();
- superclass_name_index = clazz.getSuperclassNameIndex();
+ superclassNameIndex = clazz.getSuperclassNameIndex();
className = clazz.getClassName();
superClassName = clazz.getSuperclassName();
fileName = clazz.getSourceFileName();
@@ -170,7 +170,7 @@ public class ClassGen extends AccessFlags implements Cloneable {
addAttribute(new SourceFile(cp.addUtf8("SourceFile"), 2, cp.addUtf8(fileName), cp.getConstantPool()));
}
classNameIndex = cp.addClass(className);
- superclass_name_index = cp.addClass(superClassName);
+ superclassNameIndex = cp.addClass(superClassName);
if (interfaces != null) {
for (final String interface1 : interfaces) {
addInterface(interface1);
@@ -356,8 +356,8 @@ public class ClassGen extends AccessFlags implements Cloneable {
System.arraycopy(annAttributes, 0, attributes, attributeList.size(), annAttributes.length);
}
// Must be last since the above calls may still add something to it
- final ConstantPool _cp = this.cp.getFinalConstantPool();
- return new JavaClass(classNameIndex, superclass_name_index, fileName, major, minor, super.getAccessFlags(), _cp, interfaces, fields, methods,
+ final ConstantPool cp = this.cp.getFinalConstantPool();
+ return new JavaClass(classNameIndex, superclassNameIndex, fileName, major, minor, super.getAccessFlags(), cp, interfaces, fields, methods,
attributes);
}
@@ -388,7 +388,7 @@ public class ClassGen extends AccessFlags implements Cloneable {
}
public int getSuperclassNameIndex() {
- return superclass_name_index;
+ return superclassNameIndex;
}
/**
@@ -481,9 +481,9 @@ public class ClassGen extends AccessFlags implements Cloneable {
classNameIndex = cp.addClass(name);
}
- public void setClassNameIndex(final int class_name_index) {
- this.classNameIndex = class_name_index;
- className = cp.getConstantPool().getConstantString(class_name_index, Const.CONSTANT_Class).replace('/', '.');
+ public void setClassNameIndex(final int classNameIndex) {
+ this.classNameIndex = classNameIndex;
+ this.className = cp.getConstantPool().getConstantString(classNameIndex, Const.CONSTANT_Class).replace('/', '.');
}
public void setConstantPool(final ConstantPoolGen constant_pool) {
@@ -521,12 +521,12 @@ public class ClassGen extends AccessFlags implements Cloneable {
public void setSuperclassName(final String name) {
superClassName = name.replace('/', '.');
- superclass_name_index = cp.addClass(name);
+ superclassNameIndex = cp.addClass(name);
}
- public void setSuperclassNameIndex(final int superclass_name_index) {
- this.superclass_name_index = superclass_name_index;
- superClassName = cp.getConstantPool().getConstantString(superclass_name_index, Const.CONSTANT_Class).replace('/', '.');
+ public void setSuperclassNameIndex(final int superclassNameIndex) {
+ this.superclassNameIndex = superclassNameIndex;
+ superClassName = cp.getConstantPool().getConstantString(superclassNameIndex, Const.CONSTANT_Class).replace('/', '.');
}
/**
diff --git a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
index af8013b3..3d91b416 100644
--- a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
+++ b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
@@ -155,17 +155,17 @@ public class ConstantPoolGen {
}
} else if (c instanceof ConstantCP) {
final ConstantCP m = (ConstantCP) c;
- String class_name;
+ String className;
ConstantUtf8 u8;
if (c instanceof ConstantInvokeDynamic) {
- class_name = Integer.toString(((ConstantInvokeDynamic) m).getBootstrapMethodAttrIndex());
+ className = Integer.toString(((ConstantInvokeDynamic) m).getBootstrapMethodAttrIndex());
} else if (c instanceof ConstantDynamic) {
- class_name = Integer.toString(((ConstantDynamic) m).getBootstrapMethodAttrIndex());
+ className = Integer.toString(((ConstantDynamic) m).getBootstrapMethodAttrIndex());
} else {
final ConstantClass clazz = (ConstantClass) constants[m.getClassIndex()];
u8 = (ConstantUtf8) constants[clazz.getNameIndex()];
- class_name = u8.getBytes().replace('/', '.');
+ className = u8.getBytes().replace('/', '.');
}
final ConstantNameAndType n = (ConstantNameAndType) constants[m.getNameAndTypeIndex()];
@@ -182,7 +182,7 @@ public class ConstantPoolGen {
delim = FIELDREF_DELIM;
}
- sb.append(class_name);
+ sb.append(className);
sb.append(delim);
sb.append(method_name);
sb.append(delim);
@@ -309,18 +309,18 @@ public class ConstantPoolGen {
final ConstantClass clazz = (ConstantClass) constants[m.getClassIndex()];
final ConstantNameAndType n = (ConstantNameAndType) constants[m.getNameAndTypeIndex()];
ConstantUtf8 u8 = (ConstantUtf8) constants[clazz.getNameIndex()];
- final String class_name = u8.getBytes().replace('/', '.');
+ final String className = u8.getBytes().replace('/', '.');
u8 = (ConstantUtf8) constants[n.getNameIndex()];
final String name = u8.getBytes();
u8 = (ConstantUtf8) constants[n.getSignatureIndex()];
final String signature = u8.getBytes();
switch (c.getTag()) {
case Const.CONSTANT_InterfaceMethodref:
- return addInterfaceMethodref(class_name, name, signature);
+ return addInterfaceMethodref(className, name, signature);
case Const.CONSTANT_Methodref:
- return addMethodref(class_name, name, signature);
+ return addMethodref(className, name, signature);
case Const.CONSTANT_Fieldref:
- return addFieldref(class_name, name, signature);
+ return addFieldref(className, name, signature);
default: // Never reached
throw new IllegalArgumentException("Unknown constant type " + c);
}
@@ -351,24 +351,24 @@ public class ConstantPoolGen {
/**
* Add a new Fieldref constant to the ConstantPool, if it is not already in there.
*
- * @param class_name class name string to add
+ * @param className class name string to add
* @param field_name field name string to add
* @param signature signature string to add
* @return index of entry
*/
- public int addFieldref(final String class_name, final String field_name, final String signature) {
+ public int addFieldref(final String className, final String field_name, final String signature) {
int ret;
- int class_index;
- int name_and_type_index;
- if ((ret = lookupFieldref(class_name, field_name, signature)) != -1) {
+ int classIndex;
+ int nameAndTypeIndex;
+ if ((ret = lookupFieldref(className, field_name, signature)) != -1) {
return ret; // Already in CP
}
adjustSize();
- class_index = addClass(class_name);
- name_and_type_index = addNameAndType(field_name, signature);
+ classIndex = addClass(className);
+ nameAndTypeIndex = addNameAndType(field_name, signature);
ret = index;
- constants[index++] = new ConstantFieldref(class_index, name_and_type_index);
- final String key = class_name + FIELDREF_DELIM + field_name + FIELDREF_DELIM + signature;
+ constants[index++] = new ConstantFieldref(classIndex, nameAndTypeIndex);
+ final String key = className + FIELDREF_DELIM + field_name + FIELDREF_DELIM + signature;
if (!cpTable.containsKey(key)) {
cpTable.put(key, new Index(ret));
}
@@ -416,24 +416,24 @@ public class ConstantPoolGen {
/**
* Add a new InterfaceMethodref constant to the ConstantPool, if it is not already in there.
*
- * @param class_name class name string to add
+ * @param className class name string to add
* @param method_name method name string to add
* @param signature signature string to add
* @return index of entry
*/
- public int addInterfaceMethodref(final String class_name, final String method_name, final String signature) {
+ public int addInterfaceMethodref(final String className, final String method_name, final String signature) {
int ret;
- int class_index;
- int name_and_type_index;
- if ((ret = lookupInterfaceMethodref(class_name, method_name, signature)) != -1) {
+ int classIndex;
+ int nameAndTypeIndex;
+ if ((ret = lookupInterfaceMethodref(className, method_name, signature)) != -1) {
return ret; // Already in CP
}
adjustSize();
- class_index = addClass(class_name);
- name_and_type_index = addNameAndType(method_name, signature);
+ classIndex = addClass(className);
+ nameAndTypeIndex = addNameAndType(method_name, signature);
ret = index;
- constants[index++] = new ConstantInterfaceMethodref(class_index, name_and_type_index);
- final String key = class_name + IMETHODREF_DELIM + method_name + IMETHODREF_DELIM + signature;
+ constants[index++] = new ConstantInterfaceMethodref(classIndex, nameAndTypeIndex);
+ final String key = className + IMETHODREF_DELIM + method_name + IMETHODREF_DELIM + signature;
if (!cpTable.containsKey(key)) {
cpTable.put(key, new Index(ret));
}
@@ -465,24 +465,24 @@ public class ConstantPoolGen {
/**
* Add a new Methodref constant to the ConstantPool, if it is not already in there.
*
- * @param class_name class name string to add
+ * @param className class name string to add
* @param method_name method name string to add
* @param signature method signature string to add
* @return index of entry
*/
- public int addMethodref(final String class_name, final String method_name, final String signature) {
+ public int addMethodref(final String className, final String method_name, final String signature) {
int ret;
- int class_index;
- int name_and_type_index;
- if ((ret = lookupMethodref(class_name, method_name, signature)) != -1) {
+ int classIndex;
+ int nameAndTypeIndex;
+ if ((ret = lookupMethodref(className, method_name, signature)) != -1) {
return ret; // Already in CP
}
adjustSize();
- name_and_type_index = addNameAndType(method_name, signature);
- class_index = addClass(class_name);
+ nameAndTypeIndex = addNameAndType(method_name, signature);
+ classIndex = addClass(className);
ret = index;
- constants[index++] = new ConstantMethodref(class_index, name_and_type_index);
- final String key = class_name + METHODREF_DELIM + method_name + METHODREF_DELIM + signature;
+ constants[index++] = new ConstantMethodref(classIndex, nameAndTypeIndex);
+ final String key = className + METHODREF_DELIM + method_name + METHODREF_DELIM + signature;
if (!cpTable.containsKey(key)) {
cpTable.put(key, new Index(ret));
}
@@ -633,13 +633,13 @@ public class ConstantPoolGen {
/**
* Look for ConstantFieldref in ConstantPool.
*
- * @param class_name Where to find method
- * @param field_name Guess what
+ * @param className Where to find method
+ * @param fieldName Guess what
* @param signature return and argument types
* @return index on success, -1 otherwise
*/
- public int lookupFieldref(final String class_name, final String field_name, final String signature) {
- final Index index = cpTable.get(class_name + FIELDREF_DELIM + field_name + FIELDREF_DELIM + signature);
+ public int lookupFieldref(final String className, final String fieldName, final String signature) {
+ final Index index = cpTable.get(className + FIELDREF_DELIM + fieldName + FIELDREF_DELIM + signature);
return index != null ? index.index : -1;
}
@@ -687,13 +687,13 @@ public class ConstantPoolGen {
/**
* Look for ConstantInterfaceMethodref in ConstantPool.
*
- * @param class_name Where to find method
+ * @param className Where to find method
* @param method_name Guess what
* @param signature return and argument types
* @return index on success, -1 otherwise
*/
- public int lookupInterfaceMethodref(final String class_name, final String method_name, final String signature) {
- final Index index = cpTable.get(class_name + IMETHODREF_DELIM + method_name + IMETHODREF_DELIM + signature);
+ public int lookupInterfaceMethodref(final String className, final String method_name, final String signature) {
+ final Index index = cpTable.get(className + IMETHODREF_DELIM + method_name + IMETHODREF_DELIM + signature);
return index != null ? index.index : -1;
}
@@ -722,13 +722,13 @@ public class ConstantPoolGen {
/**
* Look for ConstantMethodref in ConstantPool.
*
- * @param class_name Where to find method
+ * @param className Where to find method
* @param method_name Guess what
* @param signature return and argument types
* @return index on success, -1 otherwise
*/
- public int lookupMethodref(final String class_name, final String method_name, final String signature) {
- final Index index = cpTable.get(class_name + METHODREF_DELIM + method_name + METHODREF_DELIM + signature);
+ public int lookupMethodref(final String className, final String method_name, final String signature) {
+ final Index index = cpTable.get(className + METHODREF_DELIM + method_name + METHODREF_DELIM + signature);
return index != null ? index.index : -1;
}
@@ -740,8 +740,8 @@ public class ConstantPoolGen {
* @return index on success, -1 otherwise
*/
public int lookupNameAndType(final String name, final String signature) {
- final Index _index = natTable.get(name + NAT_DELIM + signature);
- return _index != null ? _index.index : -1;
+ final Index index = natTable.get(name + NAT_DELIM + signature);
+ return index != null ? index.index : -1;
}
/**
diff --git a/src/main/java/org/apache/bcel/generic/ConversionInstruction.java b/src/main/java/org/apache/bcel/generic/ConversionInstruction.java
index e405959d..8188d335 100644
--- a/src/main/java/org/apache/bcel/generic/ConversionInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/ConversionInstruction.java
@@ -43,8 +43,8 @@ public abstract class ConversionInstruction extends Instruction implements Typed
*/
@Override
public Type getType(final ConstantPoolGen cp) {
- final short _opcode = super.getOpcode();
- switch (_opcode) {
+ final short opcode = super.getOpcode();
+ switch (opcode) {
case Const.D2I:
case Const.F2I:
case Const.L2I:
@@ -68,7 +68,7 @@ public abstract class ConversionInstruction extends Instruction implements Typed
case Const.I2S:
return Type.SHORT;
default: // Never reached
- throw new ClassGenException("Unknown type " + _opcode);
+ throw new ClassGenException("Unknown type " + opcode);
}
}
}
diff --git a/src/main/java/org/apache/bcel/generic/GOTO.java b/src/main/java/org/apache/bcel/generic/GOTO.java
index bcd02927..39f8eeef 100644
--- a/src/main/java/org/apache/bcel/generic/GOTO.java
+++ b/src/main/java/org/apache/bcel/generic/GOTO.java
@@ -59,12 +59,12 @@ public class GOTO extends GotoInstruction implements VariableLengthInstruction {
@Override
public void dump(final DataOutputStream out) throws IOException {
super.setIndex(getTargetOffset());
- final short _opcode = getOpcode();
- if (_opcode == org.apache.bcel.Const.GOTO) {
+ final short opcode = getOpcode();
+ if (opcode == org.apache.bcel.Const.GOTO) {
super.dump(out);
} else { // GOTO_W
super.setIndex(getTargetOffset());
- out.writeByte(_opcode);
+ out.writeByte(opcode);
out.writeInt(super.getIndex());
}
}
diff --git a/src/main/java/org/apache/bcel/generic/InstructionFactory.java b/src/main/java/org/apache/bcel/generic/InstructionFactory.java
index 60fda058..8f03c507 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionFactory.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionFactory.java
@@ -32,16 +32,16 @@ public class InstructionFactory implements InstructionConstants {
private static class MethodObject {
- final Type[] arg_types;
- final Type result_type;
- final String class_name;
+ final Type[] argTypes;
+ final Type resultType;
+ final String className;
final String name;
MethodObject(final String c, final String n, final Type r, final Type[] a) {
- class_name = c;
- name = n;
- result_type = r;
- arg_types = a;
+ this.className = c;
+ this.name = n;
+ this.resultType = r;
+ this.argTypes = a;
}
}
@@ -185,16 +185,16 @@ public class InstructionFactory implements InstructionConstants {
* @param bootstrap_index index into the bootstrap_methods array
* @param name name of the called method
* @param ret_type return type of method
- * @param arg_types argument types of method
+ * @param argTypes argument types of method
* @see Constants
*/
/*
* createInvokeDynamic only needed if instrumention code wants to generate a new invokedynamic instruction. I don't
* think we need. (markro)
*
- * public InvokeInstruction createInvokeDynamic( int bootstrap_index, String name, Type ret_type, Type[] arg_types) {
- * int index; int nargs = 0; String signature = Type.getMethodSignature(ret_type, arg_types); for (int i = 0; i <
- * arg_types.length; i++) { nargs += arg_types[i].getSize(); } // UNDONE - needs to be added to ConstantPoolGen //index
+ * public InvokeInstruction createInvokeDynamic( int bootstrap_index, String name, Type ret_type, Type[] argTypes) {
+ * int index; int nargs = 0; String signature = Type.getMethodSignature(ret_type, argTypes); for (int i = 0; i <
+ * argTypes.length; i++) { nargs += argTypes[i].getSize(); } // UNDONE - needs to be added to ConstantPoolGen //index
* = cp.addInvokeDynamic(bootstrap_index, name, signature); index = 0; return new INVOKEDYNAMIC(index); }
*/
@@ -501,10 +501,10 @@ public class InstructionFactory implements InstructionConstants {
* Create conversion operation for two stack operands, this may be an I2C, instruction, e.g., if the operands are basic
* types and CHECKCAST if they are reference types.
*/
- public Instruction createCast(final Type src_type, final Type dest_type) {
- if (src_type instanceof BasicType && dest_type instanceof BasicType) {
- final byte dest = dest_type.getType();
- byte src = src_type.getType();
+ public Instruction createCast(final Type srcType, final Type destType) {
+ if (srcType instanceof BasicType && destType instanceof BasicType) {
+ final byte dest = destType.getType();
+ byte src = srcType.getType();
if (dest == Const.T_LONG && (src == Const.T_CHAR || src == Const.T_BYTE || src == Const.T_SHORT)) {
src = Const.T_INT;
}
@@ -517,13 +517,13 @@ public class InstructionFactory implements InstructionConstants {
}
return i;
}
- if (!(src_type instanceof ReferenceType) || !(dest_type instanceof ReferenceType)) {
- throw new IllegalArgumentException("Cannot cast " + src_type + " to " + dest_type);
+ if (!(srcType instanceof ReferenceType) || !(destType instanceof ReferenceType)) {
+ throw new IllegalArgumentException("Cannot cast " + srcType + " to " + destType);
}
- if (dest_type instanceof ArrayType) {
- return new CHECKCAST(cp.addArrayClass((ArrayType) dest_type));
+ if (destType instanceof ArrayType) {
+ return new CHECKCAST(cp.addArrayClass((ArrayType) destType));
}
- return new CHECKCAST(cp.addClass(((ObjectType) dest_type).getClassName()));
+ return new CHECKCAST(cp.addClass(((ObjectType) destType).getClassName()));
}
public CHECKCAST createCheckCast(final ReferenceType t) {
@@ -557,16 +557,16 @@ public class InstructionFactory implements InstructionConstants {
/**
* Create a field instruction.
*
- * @param class_name name of the accessed class
+ * @param className name of the accessed class
* @param name name of the referenced field
* @param type type of field
* @param kind how to access, i.e., GETFIELD, PUTFIELD, GETSTATIC, PUTSTATIC
* @see Const
*/
- public FieldInstruction createFieldAccess(final String class_name, final String name, final Type type, final short kind) {
+ public FieldInstruction createFieldAccess(final String className, final String name, final Type type, final short kind) {
int index;
final String signature = type.getSignature();
- index = cp.addFieldref(class_name, name, signature);
+ index = cp.addFieldref(className, name, signature);
switch (kind) {
case Const.GETFIELD:
return new GETFIELD(index);
@@ -581,12 +581,12 @@ public class InstructionFactory implements InstructionConstants {
}
}
- public GETFIELD createGetField(final String class_name, final String name, final Type t) {
- return new GETFIELD(cp.addFieldref(class_name, name, t.getSignature()));
+ public GETFIELD createGetField(final String className, final String name, final Type t) {
+ return new GETFIELD(cp.addFieldref(className, name, t.getSignature()));
}
- public GETSTATIC createGetStatic(final String class_name, final String name, final Type t) {
- return new GETSTATIC(cp.addFieldref(class_name, name, t.getSignature()));
+ public GETSTATIC createGetStatic(final String className, final String name, final Type t) {
+ return new GETSTATIC(cp.addFieldref(className, name, t.getSignature()));
}
public INSTANCEOF createInstanceOf(final ReferenceType t) {
@@ -597,36 +597,36 @@ public class InstructionFactory implements InstructionConstants {
}
private InvokeInstruction createInvoke(final MethodObject m, final short kind) {
- return createInvoke(m.class_name, m.name, m.result_type, m.arg_types, kind);
+ return createInvoke(m.className, m.name, m.resultType, m.argTypes, kind);
}
/**
* Create an invoke instruction. (Except for invokedynamic.)
*
- * @param class_name name of the called class
+ * @param className name of the called class
* @param name name of the called method
- * @param ret_type return type of method
- * @param arg_types argument types of method
+ * @param retType return type of method
+ * @param argTypes argument types of method
* @param kind how to invoke, i.e., INVOKEINTERFACE, INVOKESTATIC, INVOKEVIRTUAL, or INVOKESPECIAL
* @see Const
*/
- public InvokeInstruction createInvoke(final String class_name, final String name, final Type ret_type, final Type[] arg_types, final short kind) {
- return createInvoke(class_name, name, ret_type, arg_types, kind, kind == Const.INVOKEINTERFACE);
+ public InvokeInstruction createInvoke(final String className, final String name, final Type retType, final Type[] argTypes, final short kind) {
+ return createInvoke(className, name, retType, argTypes, kind, kind == Const.INVOKEINTERFACE);
}
/**
* Create an invoke instruction. (Except for invokedynamic.)
*
- * @param class_name name of the called class
+ * @param className name of the called class
* @param name name of the called method
- * @param ret_type return type of method
- * @param arg_types argument types of method
+ * @param retType return type of method
+ * @param argTypes argument types of method
* @param kind how to invoke: INVOKEINTERFACE, INVOKESTATIC, INVOKEVIRTUAL, or INVOKESPECIAL
* @param use_interface force use of InterfaceMethodref
* @return A new InvokeInstruction.
* @since 6.5.0
*/
- public InvokeInstruction createInvoke(final String class_name, final String name, final Type ret_type, final Type[] arg_types, final short kind,
+ public InvokeInstruction createInvoke(final String className, final String name, final Type retType, final Type[] argTypes, final short kind,
final boolean use_interface) {
if (kind != Const.INVOKESPECIAL && kind != Const.INVOKEVIRTUAL && kind != Const.INVOKESTATIC && kind != Const.INVOKEINTERFACE
&& kind != Const.INVOKEDYNAMIC) {
@@ -634,14 +634,14 @@ public class InstructionFactory implements InstructionConstants {
}
int index;
int nargs = 0;
- final String signature = Type.getMethodSignature(ret_type, arg_types);
- for (final Type arg_type : arg_types) {
- nargs += arg_type.getSize();
+ final String signature = Type.getMethodSignature(retType, argTypes);
+ for (final Type argType : argTypes) {
+ nargs += argType.getSize();
}
if (use_interface) {
- index = cp.addInterfaceMethodref(class_name, name, signature);
+ index = cp.addInterfaceMethodref(className, name, signature);
} else {
- index = cp.addMethodref(class_name, name, signature);
+ index = cp.addMethodref(className, name, signature);
}
switch (kind) {
case Const.INVOKESPECIAL:
@@ -707,12 +707,12 @@ public class InstructionFactory implements InstructionConstants {
return il;
}
- public PUTFIELD createPutField(final String class_name, final String name, final Type t) {
- return new PUTFIELD(cp.addFieldref(class_name, name, t.getSignature()));
+ public PUTFIELD createPutField(final String className, final String name, final Type t) {
+ return new PUTFIELD(cp.addFieldref(className, name, t.getSignature()));
}
- public PUTSTATIC createPutStatic(final String class_name, final String name, final Type t) {
- return new PUTSTATIC(cp.addFieldref(class_name, name, t.getSignature()));
+ public PUTSTATIC createPutStatic(final String className, final String name, final Type t) {
+ return new PUTSTATIC(cp.addFieldref(className, name, t.getSignature()));
}
public ClassGen getClassGen() {
diff --git a/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java b/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java
index 6cbb3683..34c1e0e1 100644
--- a/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java
+++ b/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java
@@ -38,9 +38,9 @@ public class LOOKUPSWITCH extends Select {
public LOOKUPSWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) {
super(org.apache.bcel.Const.LOOKUPSWITCH, match, targets, defaultTarget);
/* alignment remainder assumed 0 here, until dump time. */
- final short _length = (short) (9 + getMatch_length() * 8);
- super.setLength(_length);
- setFixed_length(_length);
+ final short length = (short) (9 + getMatch_length() * 8);
+ super.setLength(length);
+ setFixed_length(length);
}
/**
@@ -66,9 +66,9 @@ public class LOOKUPSWITCH extends Select {
@Override
public void dump(final DataOutputStream out) throws IOException {
super.dump(out);
- final int _match_length = getMatch_length();
- out.writeInt(_match_length); // npairs
- for (int i = 0; i < _match_length; i++) {
+ final int matchLength = getMatch_length();
+ out.writeInt(matchLength); // npairs
+ for (int i = 0; i < matchLength; i++) {
out.writeInt(super.getMatch(i)); // match-offset pairs
out.writeInt(setIndices(i, getTargetOffset(super.getTarget(i))));
}
@@ -80,16 +80,16 @@ public class LOOKUPSWITCH extends Select {
@Override
protected void initFromFile(final ByteSequence bytes, final boolean wide) throws IOException {
super.initFromFile(bytes, wide); // reads padding
- final int _match_length = bytes.readInt();
- setMatch_length(_match_length);
- final short _fixed_length = (short) (9 + _match_length * 8);
- setFixed_length(_fixed_length);
- final short _length = (short) (_match_length + super.getPadding());
- super.setLength(_length);
- super.setMatches(new int[_match_length]);
- super.setIndices(new int[_match_length]);
- super.setTargets(new InstructionHandle[_match_length]);
- for (int i = 0; i < _match_length; i++) {
+ final int matchLength = bytes.readInt();
+ setMatch_length(matchLength);
+ final short fixedLength = (short) (9 + matchLength * 8);
+ setFixed_length(fixedLength);
+ final short length = (short) (matchLength + super.getPadding());
+ super.setLength(length);
+ super.setMatches(new int[matchLength]);
+ super.setIndices(new int[matchLength]);
+ super.setTargets(new InstructionHandle[matchLength]);
+ for (int i = 0; i < matchLength; i++) {
super.setMatch(i, bytes.readInt());
super.setIndices(i, bytes.readInt());
}
diff --git a/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java b/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java
index db1e75ca..b2622452 100644
--- a/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java
@@ -143,15 +143,15 @@ public abstract class LocalVariableInstruction extends Instruction implements Ty
n = bytes.readUnsignedShort();
super.setLength(4);
} else {
- final short _opcode = super.getOpcode();
- if (_opcode >= Const.ILOAD && _opcode <= Const.ALOAD || _opcode >= Const.ISTORE && _opcode <= Const.ASTORE) {
+ final short opcode = super.getOpcode();
+ if (opcode >= Const.ILOAD && opcode <= Const.ALOAD || opcode >= Const.ISTORE && opcode <= Const.ASTORE) {
n = bytes.readUnsignedByte();
super.setLength(2);
} else {
- if (_opcode <= Const.ALOAD_3) { // compact load instruction such as ILOAD_2
- n = (_opcode - Const.ILOAD_0) % 4;
+ if (opcode <= Const.ALOAD_3) { // compact load instruction such as ILOAD_2
+ n = (opcode - Const.ILOAD_0) % 4;
} else { // Assert ISTORE_0 <= tag <= ASTORE_3
- n = (_opcode - Const.ISTORE_0) % 4;
+ n = (opcode - Const.ISTORE_0) % 4;
}
super.setLength(1);
}
@@ -204,8 +204,8 @@ public abstract class LocalVariableInstruction extends Instruction implements Ty
*/
@Override
public String toString(final boolean verbose) {
- final short _opcode = super.getOpcode();
- if (_opcode >= Const.ILOAD_0 && _opcode <= Const.ALOAD_3 || _opcode >= Const.ISTORE_0 && _opcode <= Const.ASTORE_3) {
+ final short opcode = super.getOpcode();
+ if (opcode >= Const.ILOAD_0 && opcode <= Const.ALOAD_3 || opcode >= Const.ISTORE_0 && opcode <= Const.ASTORE_3) {
return super.toString(verbose);
}
return super.toString(verbose) + " " + n;
diff --git a/src/main/java/org/apache/bcel/generic/MethodGen.java b/src/main/java/org/apache/bcel/generic/MethodGen.java
index 5e78608c..55d4d9b3 100644
--- a/src/main/java/org/apache/bcel/generic/MethodGen.java
+++ b/src/main/java/org/apache/bcel/generic/MethodGen.java
@@ -243,22 +243,22 @@ public class MethodGen extends FieldGenOrMethodGen {
* For example one may not add a local variable and later remove the instructions it refers to without causing havoc. It
* is safe however if you remove that local variable, too.
*
- * @param access_flags access qualifiers
- * @param return_type method type
+ * @param accessFlags access qualifiers
+ * @param returnType method type
* @param argTypes argument types
* @param argNames argument names (if this is null, default names will be provided for them)
- * @param method_name name of method
+ * @param methodName name of method
* @param className class name containing this method (may be null, if you don't care)
* @param il instruction list associated with this method, may be null only for abstract or native methods
* @param cp constant pool
*/
- public MethodGen(final int access_flags, final Type return_type, final Type[] argTypes, String[] argNames, final String method_name, final String className,
+ public MethodGen(final int accessFlags, final Type returnType, final Type[] argTypes, String[] argNames, final String methodName, final String className,
final InstructionList il, final ConstantPoolGen cp) {
- super(access_flags);
- setType(return_type);
+ super(accessFlags);
+ setType(returnType);
setArgumentTypes(argTypes);
setArgumentNames(argNames);
- setName(method_name);
+ setName(methodName);
setClassName(className);
setInstructionList(il);
setConstantPool(cp);
@@ -277,8 +277,8 @@ public class MethodGen extends FieldGenOrMethodGen {
}
if (argTypes != null) {
final int size = argTypes.length;
- for (final Type arg_type : argTypes) {
- if (Type.VOID == arg_type) {
+ for (final Type argType : argTypes) {
+ if (Type.VOID == argType) {
throw new ClassGenException("'void' is an illegal argument type for a method");
}
}
@@ -324,10 +324,10 @@ public class MethodGen extends FieldGenOrMethodGen {
if (ces != null) {
for (final CodeException ce : ces) {
final int type = ce.getCatchType();
- ObjectType c_type = null;
+ ObjectType cType = null;
if (type > 0) {
final String cen = method.getConstantPool().getConstantString(type, Const.CONSTANT_Class);
- c_type = ObjectType.getInstance(cen);
+ cType = ObjectType.getInstance(cen);
}
final int end_pc = ce.getEndPC();
final int length = getByteCodes(method).length;
@@ -338,7 +338,7 @@ public class MethodGen extends FieldGenOrMethodGen {
end = il.findHandle(end_pc);
end = end.getPrev(); // Make it inclusive
}
- addExceptionHandler(il.findHandle(ce.getStartPC()), end, il.findHandle(ce.getHandlerPC()), c_type);
+ addExceptionHandler(il.findHandle(ce.getStartPC()), end, il.findHandle(ce.getHandlerPC()), cType);
}
}
final Attribute[] c_attributes = c.getAttributes();
@@ -411,18 +411,18 @@ public class MethodGen extends FieldGenOrMethodGen {
* Add an exception handler, i.e., specify region where a handler is active and an instruction where the actual handling
* is done.
*
- * @param start_pc Start of region (inclusive)
- * @param end_pc End of region (inclusive)
- * @param handler_pc Where handling is done
- * @param catch_type class type of handled exception or null if any exception is handled
+ * @param startPc Start of region (inclusive)
+ * @param endPc End of region (inclusive)
+ * @param handlerPc Where handling is done
+ * @param catchType class type of handled exception or null if any exception is handled
* @return new exception handler object
*/
- public CodeExceptionGen addExceptionHandler(final InstructionHandle start_pc, final InstructionHandle end_pc, final InstructionHandle handler_pc,
- final ObjectType catch_type) {
- if (start_pc == null || end_pc == null || handler_pc == null) {
+ public CodeExceptionGen addExceptionHandler(final InstructionHandle startPc, final InstructionHandle endPc, final InstructionHandle handlerPc,
+ final ObjectType catchType) {
+ if (startPc == null || endPc == null || handlerPc == null) {
throw new ClassGenException("Exception handler target is null instruction");
}
- final CodeExceptionGen c = new CodeExceptionGen(start_pc, end_pc, handler_pc, catch_type);
+ final CodeExceptionGen c = new CodeExceptionGen(startPc, endPc, handlerPc, catchType);
exceptionList.add(c);
return c;
}
@@ -830,15 +830,15 @@ public class MethodGen extends FieldGenOrMethodGen {
*/
public Method getMethod() {
final String signature = getSignature();
- final ConstantPoolGen _cp = super.getConstantPool();
- final int name_index = _cp.addUtf8(super.getName());
- final int signature_index = _cp.addUtf8(signature);
+ final ConstantPoolGen cp = super.getConstantPool();
+ final int name_index = cp.addUtf8(super.getName());
+ final int signature_index = cp.addUtf8(signature);
/*
* Also updates positions of instructions, i.e., their indices
*/
- byte[] byte_code = null;
+ byte[] byteCode = null;
if (il != null) {
- byte_code = il.getByteCode();
+ byteCode = il.getByteCode();
}
LineNumberTable lnt = null;
LocalVariableTable lvt = null;
@@ -846,8 +846,8 @@ public class MethodGen extends FieldGenOrMethodGen {
* Create LocalVariableTable and LineNumberTable attributes (for debuggers, e.g.)
*/
if (!variableList.isEmpty() && !stripAttributes) {
- updateLocalVariableTable(getLocalVariableTable(_cp));
- addCodeAttribute(lvt = getLocalVariableTable(_cp));
+ updateLocalVariableTable(getLocalVariableTable(cp));
+ addCodeAttribute(lvt = getLocalVariableTable(cp));
}
if (localVariableTypeTable != null) {
// LocalVariable length in LocalVariableTypeTable is not updated automatically. It's a difference with
@@ -858,18 +858,18 @@ public class MethodGen extends FieldGenOrMethodGen {
addCodeAttribute(localVariableTypeTable);
}
if (!lineNumberList.isEmpty() && !stripAttributes) {
- addCodeAttribute(lnt = getLineNumberTable(_cp));
+ addCodeAttribute(lnt = getLineNumberTable(cp));
}
- final Attribute[] code_attrs = getCodeAttributes();
+ final Attribute[] codeAttrs = getCodeAttributes();
/*
* Each attribute causes 6 additional header bytes
*/
int attrs_len = 0;
- for (final Attribute code_attr : code_attrs) {
+ for (final Attribute code_attr : codeAttrs) {
attrs_len += code_attr.getLength() + 6;
}
- final CodeException[] c_exc = getCodeExceptions();
- final int exc_len = c_exc.length * 8; // Every entry takes 8 bytes
+ final CodeException[] cExc = getCodeExceptions();
+ final int exc_len = cExc.length * 8; // Every entry takes 8 bytes
Code code = null;
if (il != null && !isAbstract() && !isNative()) {
// Remove any stale code attribute
@@ -879,20 +879,20 @@ public class MethodGen extends FieldGenOrMethodGen {
removeAttribute(a);
}
}
- code = new Code(_cp.addUtf8("Code"), 8 + byte_code.length + // prologue byte code
+ code = new Code(cp.addUtf8("Code"), 8 + byteCode.length + // prologue byte code
2 + exc_len + // exceptions
2 + attrs_len, // attributes
- maxStack, maxLocals, byte_code, c_exc, code_attrs, _cp.getConstantPool());
+ maxStack, maxLocals, byteCode, cExc, codeAttrs, cp.getConstantPool());
addAttribute(code);
}
- final Attribute[] annotations = addRuntimeAnnotationsAsAttribute(_cp);
- final Attribute[] parameterAnnotations = addRuntimeParameterAnnotationsAsAttribute(_cp);
+ final Attribute[] annotations = addRuntimeAnnotationsAsAttribute(cp);
+ final Attribute[] parameterAnnotations = addRuntimeParameterAnnotationsAsAttribute(cp);
ExceptionTable et = null;
if (!throwsList.isEmpty()) {
- addAttribute(et = getExceptionTable(_cp));
+ addAttribute(et = getExceptionTable(cp));
// Add `Exceptions' if there are "throws" clauses
}
- final Method m = new Method(super.getAccessFlags(), name_index, signature_index, getAttributes(), _cp.getConstantPool());
+ final Method m = new Method(super.getAccessFlags(), name_index, signature_index, getAttributes(), cp.getConstantPool());
// Undo effects of adding attributes
if (lvt != null) {
removeCodeAttribute(lvt);
@@ -1077,20 +1077,20 @@ public class MethodGen extends FieldGenOrMethodGen {
argNames[i] = name;
}
- public void setArgumentNames(final String[] arg_names) {
- this.argNames = arg_names;
+ public void setArgumentNames(final String[] argNames) {
+ this.argNames = argNames;
}
public void setArgumentType(final int i, final Type type) {
argTypes[i] = type;
}
- public void setArgumentTypes(final Type[] arg_types) {
- this.argTypes = arg_types;
+ public void setArgumentTypes(final Type[] argTypes) {
+ this.argTypes = argTypes;
}
- public void setClassName(final String class_name) { // TODO could be package-protected?
- this.className = class_name;
+ public void setClassName(final String className) { // TODO could be package-protected?
+ this.className = className;
}
public void setInstructionList(final InstructionList il) { // TODO could be package-protected?
@@ -1104,8 +1104,8 @@ public class MethodGen extends FieldGenOrMethodGen {
if (il != null) {
int max = isStatic() ? 0 : 1;
if (argTypes != null) {
- for (final Type arg_type : argTypes) {
- max += arg_type.getSize();
+ for (final Type argType : argTypes) {
+ max += argType.getSize();
}
}
for (InstructionHandle ih = il.getStart(); ih != null; ih = ih.getNext()) {
@@ -1148,8 +1148,8 @@ public class MethodGen extends FieldGenOrMethodGen {
maxStack = m;
}
- public void setReturnType(final Type return_type) {
- setType(return_type);
+ public void setReturnType(final Type returnType) {
+ setType(returnType);
}
/**
diff --git a/src/main/java/org/apache/bcel/generic/ReturnInstruction.java b/src/main/java/org/apache/bcel/generic/ReturnInstruction.java
index 66e59fd8..92cebe95 100644
--- a/src/main/java/org/apache/bcel/generic/ReturnInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/ReturnInstruction.java
@@ -45,8 +45,8 @@ public abstract class ReturnInstruction extends Instruction implements Exception
}
public Type getType() {
- final short _opcode = super.getOpcode();
- switch (_opcode) {
+ final short opcode = super.getOpcode();
+ switch (opcode) {
case Const.IRETURN:
return Type.INT;
case Const.LRETURN:
@@ -60,7 +60,7 @@ public abstract class ReturnInstruction extends Instruction implements Exception
case Const.RETURN:
return Type.VOID;
default: // Never reached
- throw new ClassGenException("Unknown type " + _opcode);
+ throw new ClassGenException("Unknown type " + opcode);
}
}
diff --git a/src/main/java/org/apache/bcel/generic/TABLESWITCH.java b/src/main/java/org/apache/bcel/generic/TABLESWITCH.java
index fd3a9e0b..b8c730fa 100644
--- a/src/main/java/org/apache/bcel/generic/TABLESWITCH.java
+++ b/src/main/java/org/apache/bcel/generic/TABLESWITCH.java
@@ -43,9 +43,9 @@ public class TABLESWITCH extends Select {
public TABLESWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) {
super(org.apache.bcel.Const.TABLESWITCH, match, targets, defaultTarget);
/* Alignment remainder assumed 0 here, until dump time */
- final short _length = (short) (13 + getMatch_length() * 4);
- super.setLength(_length);
- setFixed_length(_length);
+ final short length = (short) (13 + getMatch_length() * 4);
+ super.setLength(length);
+ setFixed_length(length);
}
/**
@@ -71,12 +71,12 @@ public class TABLESWITCH extends Select {
@Override
public void dump(final DataOutputStream out) throws IOException {
super.dump(out);
- final int _match_length = getMatch_length();
- final int low = _match_length > 0 ? super.getMatch(0) : 0;
+ final int match_length = getMatch_length();
+ final int low = match_length > 0 ? super.getMatch(0) : 0;
out.writeInt(low);
- final int high = _match_length > 0 ? super.getMatch(_match_length - 1) : 0;
+ final int high = match_length > 0 ? super.getMatch(match_length - 1) : 0;
out.writeInt(high);
- for (int i = 0; i < _match_length; i++) {
+ for (int i = 0; i < match_length; i++) {
out.writeInt(setIndices(i, getTargetOffset(super.getTarget(i))));
}
}
@@ -89,15 +89,15 @@ public class TABLESWITCH extends Select {
super.initFromFile(bytes, wide);
final int low = bytes.readInt();
final int high = bytes.readInt();
- final int _match_length = high - low + 1;
- setMatch_length(_match_length);
- final short _fixed_length = (short) (13 + _match_length * 4);
- setFixed_length(_fixed_length);
- super.setLength((short) (_fixed_length + super.getPadding()));
- super.setMatches(new int[_match_length]);
- super.setIndices(new int[_match_length]);
- super.setTargets(new InstructionHandle[_match_length]);
- for (int i = 0; i < _match_length; i++) {
+ final int matchLength = high - low + 1;
+ setMatch_length(matchLength);
+ final short fixedLength = (short) (13 + matchLength * 4);
+ setFixed_length(fixedLength);
+ super.setLength((short) (fixedLength + super.getPadding()));
+ super.setMatches(new int[matchLength]);
+ super.setIndices(new int[matchLength]);
+ super.setTargets(new InstructionHandle[matchLength]);
+ for (int i = 0; i < matchLength; i++) {
super.setMatch(i, low + i);
super.setIndices(i, bytes.readInt());
}
diff --git a/src/main/java/org/apache/bcel/generic/Type.java b/src/main/java/org/apache/bcel/generic/Type.java
index 842510d8..a3ecafc7 100644
--- a/src/main/java/org/apache/bcel/generic/Type.java
+++ b/src/main/java/org/apache/bcel/generic/Type.java
@@ -122,19 +122,19 @@ public abstract class Type {
/**
* Convert type to Java method signature, e.g. int[] f(java.lang.String x) becomes (Ljava/lang/String;)[I
*
- * @param return_type what the method returns
- * @param arg_types what are the argument types
+ * @param returnType what the method returns
+ * @param argTypes what are the argument types
* @return method signature for given type(s).
*/
- public static String getMethodSignature(final Type return_type, final Type[] arg_types) {
+ public static String getMethodSignature(final Type returnType, final Type[] argTypes) {
final StringBuilder buf = new StringBuilder("(");
- if (arg_types != null) {
- for (final Type arg_type : arg_types) {
- buf.append(arg_type.getSignature());
+ if (argTypes != null) {
+ for (final Type argType : argTypes) {
+ buf.append(argType.getSignature());
}
}
buf.append(')');
- buf.append(return_type.getSignature());
+ buf.append(returnType.getSignature());
return buf.toString();
}
@@ -245,8 +245,8 @@ public abstract class Type {
final Type t = getType(signature.substring(dim));
// corrected concurrent private static field acess
// consumed_chars += dim; // update counter - is replaced by
- final int _temp = unwrap(CONSUMED_CHARS) + dim;
- wrap(CONSUMED_CHARS, _temp);
+ final int temp = unwrap(CONSUMED_CHARS) + dim;
+ wrap(CONSUMED_CHARS, temp);
return new ArrayType(t, dim);
}
diff --git a/src/main/java/org/apache/bcel/util/AttributeHTML.java b/src/main/java/org/apache/bcel/util/AttributeHTML.java
index c943462b..53f56ec0 100644
--- a/src/main/java/org/apache/bcel/util/AttributeHTML.java
+++ b/src/main/java/org/apache/bcel/util/AttributeHTML.java
@@ -50,12 +50,12 @@ final class AttributeHTML implements Closeable {
private final ConstantHTML constantHtml;
private final ConstantPool constantPool;
- AttributeHTML(final String dir, final String class_name, final ConstantPool constant_pool, final ConstantHTML constant_html, final Charset charset)
+ AttributeHTML(final String dir, final String className, final ConstantPool constantPool, final ConstantHTML constantHtml, final Charset charset)
throws IOException {
- this.className = class_name;
- this.constantPool = constant_pool;
- this.constantHtml = constant_html;
- printWriter = new PrintWriter(dir + class_name + "_attributes.html", charset.name());
+ this.className = className;
+ this.constantPool = constantPool;
+ this.constantHtml = constantHtml;
+ printWriter = new PrintWriter(dir + className + "_attributes.html", charset.name());
printWriter.print("<HTML><head><meta charset=\"");
printWriter.print(charset.name());
printWriter.println("\"></head>");
@@ -104,10 +104,10 @@ final class AttributeHTML implements Closeable {
if (len > 0) {
printWriter.print("<P><B>Exceptions handled</B><UL>");
for (final CodeException cex : ce) {
- final int catch_type = cex.getCatchType(); // Index in constant pool
+ final int catchType = cex.getCatchType(); // Index in constant pool
printWriter.print("<LI>");
- if (catch_type != 0) {
- printWriter.print(constantHtml.referenceConstant(catch_type)); // Create Link to _cp.html
+ if (catchType != 0) {
+ printWriter.print(constantHtml.referenceConstant(catchType)); // Create Link to _cp.html
} else {
printWriter.print("Any Exception");
}
diff --git a/src/main/java/org/apache/bcel/util/BCELFactory.java b/src/main/java/org/apache/bcel/util/BCELFactory.java
index 7445cbec..6e0c88ec 100644
--- a/src/main/java/org/apache/bcel/util/BCELFactory.java
+++ b/src/main/java/org/apache/bcel/util/BCELFactory.java
@@ -271,9 +271,9 @@ class BCELFactory extends EmptyVisitor {
final String className = i.getClassName(constantPoolGen);
final String methodName = i.getMethodName(constantPoolGen);
final Type type = i.getReturnType(constantPoolGen);
- final Type[] arg_types = i.getArgumentTypes(constantPoolGen);
+ final Type[] argTypes = i.getArgumentTypes(constantPoolGen);
printWriter.println("il.append(_factory.createInvoke(\"" + className + "\", \"" + methodName + "\", " + BCELifier.printType(type) + ", "
- + BCELifier.printArgumentTypes(arg_types) + ", " + CONSTANT_PREFIX + Const.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));");
+ + BCELifier.printArgumentTypes(argTypes) + ", " + CONSTANT_PREFIX + Const.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));");
}
@Override
diff --git a/src/main/java/org/apache/bcel/util/BCELifier.java b/src/main/java/org/apache/bcel/util/BCELifier.java
index d0b4c9fd..86af6a66 100644
--- a/src/main/java/org/apache/bcel/util/BCELifier.java
+++ b/src/main/java/org/apache/bcel/util/BCELifier.java
@@ -186,10 +186,10 @@ public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor {
}
private void printMain() {
- final String class_name = clazz.getClassName();
+ final String className = clazz.getClassName();
printWriter.println(" public static void main(String[] args) throws Exception {");
- printWriter.println(" " + class_name + "Creator creator = new " + class_name + "Creator();");
- printWriter.println(" creator.create(new FileOutputStream(\"" + class_name + ".class\"));");
+ printWriter.println(" " + className + "Creator creator = new " + className + "Creator();");
+ printWriter.println(" creator.create(new FileOutputStream(\"" + className + ".class\"));");
printWriter.println(" }");
}
@@ -216,13 +216,13 @@ public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor {
@Override
public void visitJavaClass(final JavaClass clazz) {
- String class_name = clazz.getClassName();
- final String super_name = clazz.getSuperclassName();
- final String package_name = clazz.getPackageName();
+ String className = clazz.getClassName();
+ final String superName = clazz.getSuperclassName();
+ final String packageName = clazz.getPackageName();
final String inter = Utility.printArray(clazz.getInterfaceNames(), false, true);
- if (!"".equals(package_name)) {
- class_name = class_name.substring(package_name.length() + 1);
- printWriter.println("package " + package_name + ";");
+ if (!"".equals(packageName)) {
+ className = className.substring(packageName.length() + 1);
+ printWriter.println("package " + packageName + ";");
printWriter.println();
}
printWriter.println("import " + BASE_PACKAGE + ".generic.*;");
@@ -230,13 +230,13 @@ public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor {
printWriter.println("import " + BASE_PACKAGE + ".*;");
printWriter.println("import java.io.*;");
printWriter.println();
- printWriter.println("public class " + class_name + "Creator {");
+ printWriter.println("public class " + className + "Creator {");
printWriter.println(" private InstructionFactory _factory;");
printWriter.println(" private ConstantPoolGen _cp;");
printWriter.println(" private ClassGen _cg;");
printWriter.println();
- printWriter.println(" public " + class_name + "Creator() {");
- printWriter.println(" _cg = new ClassGen(\"" + ("".equals(package_name) ? class_name : package_name + "." + class_name) + "\", \"" + super_name
+ printWriter.println(" public " + className + "Creator() {");
+ printWriter.println(" _cg = new ClassGen(\"" + ("".equals(packageName) ? className : packageName + "." + className) + "\", \"" + superName
+ "\", " + "\"" + clazz.getSourceFileName() + "\", " + printFlags(clazz.getAccessFlags(), FLAGS.CLASS) + ", " + "new String[] { " + inter + " });");
printWriter.println(" _cg.setMajor(" + clazz.getMajor() + ");");
printWriter.println(" _cg.setMinor(" + clazz.getMinor() + ");");
diff --git a/src/main/java/org/apache/bcel/util/ClassLoader.java b/src/main/java/org/apache/bcel/util/ClassLoader.java
index d66be885..2fe31eb9 100644
--- a/src/main/java/org/apache/bcel/util/ClassLoader.java
+++ b/src/main/java/org/apache/bcel/util/ClassLoader.java
@@ -106,11 +106,11 @@ public class ClassLoader extends java.lang.ClassLoader {
* Utility.decode() method, and parses the resulting byte array and returns the resulting JavaClass object.
* </p>
*
- * @param class_name compressed byte code with "$$BCEL$$" in it
+ * @param className compressed byte code with "$$BCEL$$" in it
*/
- protected JavaClass createClass(final String class_name) {
- final int index = class_name.indexOf(BCEL_TOKEN);
- final String real_name = class_name.substring(index + BCEL_TOKEN.length());
+ protected JavaClass createClass(final String className) {
+ final int index = className.indexOf(BCEL_TOKEN);
+ final String real_name = className.substring(index + BCEL_TOKEN.length());
JavaClass clazz = null;
try {
final byte[] bytes = Utility.decode(real_name, true);
@@ -124,23 +124,23 @@ public class ClassLoader extends java.lang.ClassLoader {
final ConstantPool cp = clazz.getConstantPool();
final ConstantClass cl = (ConstantClass) cp.getConstant(clazz.getClassNameIndex(), Const.CONSTANT_Class);
final ConstantUtf8 name = (ConstantUtf8) cp.getConstant(cl.getNameIndex(), Const.CONSTANT_Utf8);
- name.setBytes(class_name.replace('.', '/'));
+ name.setBytes(className.replace('.', '/'));
return clazz;
}
@Override
- protected Class<?> loadClass(final String class_name, final boolean resolve) throws ClassNotFoundException {
+ protected Class<?> loadClass(final String className, final boolean resolve) throws ClassNotFoundException {
Class<?> cl = null;
/*
* First try: lookup hash table.
*/
- if ((cl = classes.get(class_name)) == null) {
+ if ((cl = classes.get(className)) == null) {
/*
* Second try: Load system class using system class loader. You better don't mess around with them.
*/
for (final String ignored_package : ignoredPackages) {
- if (class_name.startsWith(ignored_package)) {
- cl = getParent().loadClass(class_name);
+ if (className.startsWith(ignored_package)) {
+ cl = getParent().loadClass(className);
break;
}
}
@@ -149,26 +149,26 @@ public class ClassLoader extends java.lang.ClassLoader {
/*
* Third try: Special request?
*/
- if (class_name.contains(BCEL_TOKEN)) {
- clazz = createClass(class_name);
+ if (className.contains(BCEL_TOKEN)) {
+ clazz = createClass(className);
} else { // Fourth try: Load classes via repository
- if ((clazz = repository.loadClass(class_name)) == null) {
- throw new ClassNotFoundException(class_name);
+ if ((clazz = repository.loadClass(className)) == null) {
+ throw new ClassNotFoundException(className);
}
clazz = modifyClass(clazz);
}
if (clazz != null) {
final byte[] bytes = clazz.getBytes();
- cl = defineClass(class_name, bytes, 0, bytes.length);
+ cl = defineClass(className, bytes, 0, bytes.length);
} else {
- cl = Class.forName(class_name);
+ cl = Class.forName(className);
}
}
if (resolve) {
resolveClass(cl);
}
}
- classes.put(class_name, cl);
+ classes.put(className, cl);
return cl;
}
diff --git a/src/main/java/org/apache/bcel/util/CodeHTML.java b/src/main/java/org/apache/bcel/util/CodeHTML.java
index 20385979..2bf93608 100644
--- a/src/main/java/org/apache/bcel/util/CodeHTML.java
+++ b/src/main/java/org/apache/bcel/util/CodeHTML.java
@@ -50,13 +50,13 @@ final class CodeHTML {
private final ConstantPool constantPool;
private final ConstantHTML constantHtml;
- CodeHTML(final String dir, final String class_name, final Method[] methods, final ConstantPool constant_pool, final ConstantHTML constant_html,
+ CodeHTML(final String dir, final String className, final Method[] methods, final ConstantPool constantPool, final ConstantHTML constantHtml,
final Charset charset) throws IOException {
- this.className = class_name;
+ this.className = className;
// this.methods = methods;
- this.constantPool = constant_pool;
- this.constantHtml = constant_html;
- try (PrintWriter newPrintWriter = new PrintWriter(dir + class_name + "_code.html", charset.name())) {
+ this.constantPool = constantPool;
+ this.constantHtml = constantHtml;
+ try (PrintWriter newPrintWriter = new PrintWriter(dir + className + "_code.html", charset.name())) {
printWriter = newPrintWriter;
printWriter.print("<HTML><head><meta charset=\"");
printWriter.print(charset.name());
diff --git a/src/main/java/org/apache/bcel/util/ConstantHTML.java b/src/main/java/org/apache/bcel/util/ConstantHTML.java
index 6e88facf..732bf49a 100644
--- a/src/main/java/org/apache/bcel/util/ConstantHTML.java
+++ b/src/main/java/org/apache/bcel/util/ConstantHTML.java
@@ -46,14 +46,14 @@ final class ConstantHTML {
private final Constant[] constants; // The constants in the cp
private final Method[] methods;
- ConstantHTML(final String dir, final String class_name, final String class_package, final Method[] methods, final ConstantPool constant_pool,
+ ConstantHTML(final String dir, final String className, final String class_package, final Method[] methods, final ConstantPool constantPool,
final Charset charset) throws IOException {
- this.className = class_name;
+ this.className = className;
this.classPackage = class_package;
- this.constantPool = constant_pool;
+ this.constantPool = constantPool;
this.methods = methods;
- constants = constant_pool.getConstantPool();
- try (PrintWriter newPrintWriter = new PrintWriter(dir + class_name + "_cp.html", charset.name())) {
+ constants = constantPool.getConstantPool();
+ try (PrintWriter newPrintWriter = new PrintWriter(dir + className + "_cp.html", charset.name())) {
printWriter = newPrintWriter;
constantRef = new String[constants.length];
constantRef[0] = "<unknown>";
@@ -93,8 +93,8 @@ final class ConstantHTML {
private void writeConstant(final int index) {
final byte tag = constants[index].getTag();
- int class_index;
- int name_index;
+ int classIndex;
+ int nameIndex;
String ref;
// The header is always the same
printWriter.println("<H4> <A NAME=cp" + index + ">" + index + "</A> " + Const.getConstantName(tag) + "</H4>");
@@ -107,28 +107,28 @@ final class ConstantHTML {
// Get class_index and name_and_type_index, depending on type
if (tag == Const.CONSTANT_Methodref) {
final ConstantMethodref c = (ConstantMethodref) constantPool.getConstant(index, Const.CONSTANT_Methodref);
- class_index = c.getClassIndex();
- name_index = c.getNameAndTypeIndex();
+ classIndex = c.getClassIndex();
+ nameIndex = c.getNameAndTypeIndex();
} else {
final ConstantInterfaceMethodref c1 = (ConstantInterfaceMethodref) constantPool.getConstant(index, Const.CONSTANT_InterfaceMethodref);
- class_index = c1.getClassIndex();
- name_index = c1.getNameAndTypeIndex();
+ classIndex = c1.getClassIndex();
+ nameIndex = c1.getNameAndTypeIndex();
}
// Get method name and its class
- final String method_name = constantPool.constantToString(name_index, Const.CONSTANT_NameAndType);
- final String html_method_name = Class2HTML.toHTML(method_name);
+ final String methodName = constantPool.constantToString(nameIndex, Const.CONSTANT_NameAndType);
+ final String htmlMethodName = Class2HTML.toHTML(methodName);
// Partially compacted class name, i.e., / -> .
- final String method_class = constantPool.constantToString(class_index, Const.CONSTANT_Class);
- String short_method_class = Utility.compactClassName(method_class); // I.e., remove java.lang.
- short_method_class = Utility.compactClassName(short_method_class, classPackage + ".", true); // Remove class package prefix
+ final String methodClass = constantPool.constantToString(classIndex, Const.CONSTANT_Class);
+ String shortMethodClass = Utility.compactClassName(methodClass); // I.e., remove java.lang.
+ shortMethodClass = Utility.compactClassName(shortMethodClass, classPackage + ".", true); // Remove class package prefix
// Get method signature
- final ConstantNameAndType c2 = (ConstantNameAndType) constantPool.getConstant(name_index, Const.CONSTANT_NameAndType);
+ final ConstantNameAndType c2 = (ConstantNameAndType) constantPool.getConstant(nameIndex, Const.CONSTANT_NameAndType);
final String signature = constantPool.constantToString(c2.getSignatureIndex(), Const.CONSTANT_Utf8);
// Get array of strings containing the argument types
final String[] args = Utility.methodSignatureArgumentTypes(signature, false);
// Get return type string
final String type = Utility.methodSignatureReturnType(signature, false);
- final String ret_type = Class2HTML.referenceType(type);
+ final String retType = Class2HTML.referenceType(type);
final StringBuilder buf = new StringBuilder("(");
for (int i = 0; i < args.length; i++) {
buf.append(Class2HTML.referenceType(args[i]));
@@ -137,59 +137,59 @@ final class ConstantHTML {
}
}
buf.append(")");
- final String arg_types = buf.toString();
- if (method_class.equals(className)) {
- ref = "<A HREF=\"" + className + "_code.html#method" + getMethodNumber(method_name + signature) + "\" TARGET=Code>" + html_method_name + "</A>";
+ final String argTypes = buf.toString();
+ if (methodClass.equals(className)) {
+ ref = "<A HREF=\"" + className + "_code.html#method" + getMethodNumber(methodName + signature) + "\" TARGET=Code>" + htmlMethodName + "</A>";
} else {
- ref = "<A HREF=\"" + method_class + ".html" + "\" TARGET=_top>" + short_method_class + "</A>." + html_method_name;
+ ref = "<A HREF=\"" + methodClass + ".html" + "\" TARGET=_top>" + shortMethodClass + "</A>." + htmlMethodName;
}
- constantRef[index] = ret_type + " <A HREF=\"" + className + "_cp.html#cp" + class_index + "\" TARGET=Constants>" + short_method_class
- + "</A>.<A HREF=\"" + className + "_cp.html#cp" + index + "\" TARGET=ConstantPool>" + html_method_name + "</A> " + arg_types;
- printWriter.println("<P><TT>" + ret_type + " " + ref + arg_types + " </TT>\n<UL>" + "<LI><A HREF=\"#cp" + class_index + "\">Class index("
- + class_index + ")</A>\n" + "<LI><A HREF=\"#cp" + name_index + "\">NameAndType index(" + name_index + ")</A></UL>");
+ constantRef[index] = retType + " <A HREF=\"" + className + "_cp.html#cp" + classIndex + "\" TARGET=Constants>" + shortMethodClass
+ + "</A>.<A HREF=\"" + className + "_cp.html#cp" + index + "\" TARGET=ConstantPool>" + htmlMethodName + "</A> " + argTypes;
+ printWriter.println("<P><TT>" + retType + " " + ref + argTypes + " </TT>\n<UL>" + "<LI><A HREF=\"#cp" + classIndex + "\">Class index("
+ + classIndex + ")</A>\n" + "<LI><A HREF=\"#cp" + nameIndex + "\">NameAndType index(" + nameIndex + ")</A></UL>");
break;
case Const.CONSTANT_Fieldref:
// Get class_index and name_and_type_index
final ConstantFieldref c3 = (ConstantFieldref) constantPool.getConstant(index, Const.CONSTANT_Fieldref);
- class_index = c3.getClassIndex();
- name_index = c3.getNameAndTypeIndex();
+ classIndex = c3.getClassIndex();
+ nameIndex = c3.getNameAndTypeIndex();
// Get method name and its class (compacted)
- final String field_class = constantPool.constantToString(class_index, Const.CONSTANT_Class);
+ final String field_class = constantPool.constantToString(classIndex, Const.CONSTANT_Class);
String short_field_class = Utility.compactClassName(field_class); // I.e., remove java.lang.
short_field_class = Utility.compactClassName(short_field_class, classPackage + ".", true); // Remove class package prefix
- final String field_name = constantPool.constantToString(name_index, Const.CONSTANT_NameAndType);
+ final String field_name = constantPool.constantToString(nameIndex, Const.CONSTANT_NameAndType);
if (field_class.equals(className)) {
ref = "<A HREF=\"" + field_class + "_methods.html#field" + field_name + "\" TARGET=Methods>" + field_name + "</A>";
} else {
ref = "<A HREF=\"" + field_class + ".html\" TARGET=_top>" + short_field_class + "</A>." + field_name + "\n";
}
- constantRef[index] = "<A HREF=\"" + className + "_cp.html#cp" + class_index + "\" TARGET=Constants>" + short_field_class + "</A>.<A HREF=\""
+ constantRef[index] = "<A HREF=\"" + className + "_cp.html#cp" + classIndex + "\" TARGET=Constants>" + short_field_class + "</A>.<A HREF=\""
+ className + "_cp.html#cp" + index + "\" TARGET=ConstantPool>" + field_name + "</A>";
- printWriter.println("<P><TT>" + ref + "</TT><BR>\n" + "<UL>" + "<LI><A HREF=\"#cp" + class_index + "\">Class(" + class_index + ")</A><BR>\n"
- + "<LI><A HREF=\"#cp" + name_index + "\">NameAndType(" + name_index + ")</A></UL>");
+ printWriter.println("<P><TT>" + ref + "</TT><BR>\n" + "<UL>" + "<LI><A HREF=\"#cp" + classIndex + "\">Class(" + classIndex + ")</A><BR>\n"
+ + "<LI><A HREF=\"#cp" + nameIndex + "\">NameAndType(" + nameIndex + ")</A></UL>");
break;
case Const.CONSTANT_Class:
final ConstantClass c4 = (ConstantClass) constantPool.getConstant(index, Const.CONSTANT_Class);
- name_index = c4.getNameIndex();
- final String class_name2 = constantPool.constantToString(index, tag); // / -> .
- String short_class_name = Utility.compactClassName(class_name2); // I.e., remove java.lang.
- short_class_name = Utility.compactClassName(short_class_name, classPackage + ".", true); // Remove class package prefix
- ref = "<A HREF=\"" + class_name2 + ".html\" TARGET=_top>" + short_class_name + "</A>";
- constantRef[index] = "<A HREF=\"" + className + "_cp.html#cp" + index + "\" TARGET=ConstantPool>" + short_class_name + "</A>";
- printWriter.println("<P><TT>" + ref + "</TT><UL>" + "<LI><A HREF=\"#cp" + name_index + "\">Name index(" + name_index + ")</A></UL>\n");
+ nameIndex = c4.getNameIndex();
+ final String className2 = constantPool.constantToString(index, tag); // / -> .
+ String shortClassName = Utility.compactClassName(className2); // I.e., remove java.lang.
+ shortClassName = Utility.compactClassName(shortClassName, classPackage + ".", true); // Remove class package prefix
+ ref = "<A HREF=\"" + className2 + ".html\" TARGET=_top>" + shortClassName + "</A>";
+ constantRef[index] = "<A HREF=\"" + className + "_cp.html#cp" + index + "\" TARGET=ConstantPool>" + shortClassName + "</A>";
+ printWriter.println("<P><TT>" + ref + "</TT><UL>" + "<LI><A HREF=\"#cp" + nameIndex + "\">Name index(" + nameIndex + ")</A></UL>\n");
break;
case Const.CONSTANT_String:
final ConstantString c5 = (ConstantString) constantPool.getConstant(index, Const.CONSTANT_String);
- name_index = c5.getStringIndex();
+ nameIndex = c5.getStringIndex();
final String str = Class2HTML.toHTML(constantPool.constantToString(index, tag));
- printWriter.println("<P><TT>" + str + "</TT><UL>" + "<LI><A HREF=\"#cp" + name_index + "\">Name index(" + name_index + ")</A></UL>\n");
+ printWriter.println("<P><TT>" + str + "</TT><UL>" + "<LI><A HREF=\"#cp" + nameIndex + "\">Name index(" + nameIndex + ")</A></UL>\n");
break;
case Const.CONSTANT_NameAndType:
final ConstantNameAndType c6 = (ConstantNameAndType) constantPool.getConstant(index, Const.CONSTANT_NameAndType);
- name_index = c6.getNameIndex();
+ nameIndex = c6.getNameIndex();
final int signature_index = c6.getSignatureIndex();
- printWriter.println("<P><TT>" + Class2HTML.toHTML(constantPool.constantToString(index, tag)) + "</TT><UL>" + "<LI><A HREF=\"#cp" + name_index
- + "\">Name index(" + name_index + ")</A>\n" + "<LI><A HREF=\"#cp" + signature_index + "\">Signature index(" + signature_index + ")</A></UL>\n");
+ printWriter.println("<P><TT>" + Class2HTML.toHTML(constantPool.constantToString(index, tag)) + "</TT><UL>" + "<LI><A HREF=\"#cp" + nameIndex
+ + "\">Name index(" + nameIndex + ")</A>\n" + "<LI><A HREF=\"#cp" + signature_index + "\">Signature index(" + signature_index + ")</A></UL>\n");
break;
default:
printWriter.println("<P><TT>" + Class2HTML.toHTML(constantPool.constantToString(index, tag)) + "</TT>\n");
diff --git a/src/main/java/org/apache/bcel/util/JavaWrapper.java b/src/main/java/org/apache/bcel/util/JavaWrapper.java
index daa13a25..dc6cbd16 100644
--- a/src/main/java/org/apache/bcel/util/JavaWrapper.java
+++ b/src/main/java/org/apache/bcel/util/JavaWrapper.java
@@ -65,11 +65,11 @@ public class JavaWrapper {
System.out.println("Missing class name.");
return;
}
- final String class_name = argv[0];
- final String[] new_argv = new String[argv.length - 1];
- System.arraycopy(argv, 1, new_argv, 0, new_argv.length);
+ final String className = argv[0];
+ final String[] newArgv = new String[argv.length - 1];
+ System.arraycopy(argv, 1, newArgv, 0, newArgv.length);
final JavaWrapper wrapper = new JavaWrapper();
- wrapper.runMain(class_name, new_argv);
+ wrapper.runMain(className, newArgv);
}
private final java.lang.ClassLoader loader;
@@ -85,11 +85,11 @@ public class JavaWrapper {
/**
* Runs the main method of the given class with the arguments passed in argv
*
- * @param class_name the fully qualified class name
+ * @param className the fully qualified class name
* @param argv the arguments just as you would pass them directly
*/
- public void runMain(final String class_name, final String[] argv) throws ClassNotFoundException {
- final Class<?> cl = loader.loadClass(class_name);
+ public void runMain(final String className, final String[] argv) throws ClassNotFoundException {
+ final Class<?> cl = loader.loadClass(className);
Method method = null;
try {
method = cl.getMethod("main", argv.getClass());
@@ -102,7 +102,7 @@ public class JavaWrapper {
throw new NoSuchMethodException();
}
} catch (final NoSuchMethodException no) {
- System.out.println("In class " + class_name + ": public static void main(String[] argv) is not defined");
+ System.out.println("In class " + className + ": public static void main(String[] argv) is not defined");
return;
}
try {
diff --git a/src/main/java/org/apache/bcel/verifier/VerifyDialog.java b/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
index ff013c59..6ae5f592 100644
--- a/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
+++ b/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
@@ -113,7 +113,7 @@ public class VerifyDialog extends javax.swing.JDialog {
* The class to verify. Default set to 'java.lang.Object' in case this class is instantiated via one of the many
* machine-generated constructors.
*/
- private String class_name = "java.lang.Object";
+ private String className = "java.lang.Object";
/** Machine-generated. */
private javax.swing.JButton ivjFlushButton;
@@ -166,15 +166,15 @@ public class VerifyDialog extends javax.swing.JDialog {
/**
* Use this constructor if you want a possibility to verify other class files than java.lang.Object.
*
- * @param fully_qualified_class_name java.lang.String
+ * @param fullyQualifiedClassName java.lang.String
*/
- public VerifyDialog(String fully_qualified_class_name) {
- final int dotclasspos = fully_qualified_class_name.lastIndexOf(".class");
+ public VerifyDialog(String fullyQualifiedClassName) {
+ final int dotclasspos = fullyQualifiedClassName.lastIndexOf(".class");
if (dotclasspos != -1) {
- fully_qualified_class_name = fully_qualified_class_name.substring(0, dotclasspos);
+ fullyQualifiedClassName = fullyQualifiedClassName.substring(0, dotclasspos);
}
- fully_qualified_class_name = fully_qualified_class_name.replace('/', '.');
- class_name = fully_qualified_class_name;
+ fullyQualifiedClassName = fullyQualifiedClassName.replace('/', '.');
+ this.className = fullyQualifiedClassName;
initialize();
}
@@ -240,8 +240,8 @@ public class VerifyDialog extends javax.swing.JDialog {
/** Machine-generated. */
public void flushButton_ActionPerformed(final java.awt.event.ActionEvent actionEvent) {
- VerifierFactory.getVerifier(class_name).flush();
- Repository.removeClass(class_name); // Make sure it will be reloaded.
+ VerifierFactory.getVerifier(className).flush();
+ Repository.removeClass(className); // Make sure it will be reloaded.
getPass1Panel().setBackground(Color.gray);
getPass1Panel().repaint();
getPass2Panel().setBackground(Color.gray);
@@ -461,13 +461,13 @@ public class VerifyDialog extends javax.swing.JDialog {
handleException(ivjExc);
}
// user code begin {2}
- setTitle("'" + class_name + "' verification - JustIce / BCEL");
+ setTitle("'" + className + "' verification - JustIce / BCEL");
// user code end
}
/** Machine-generated. */
public void pass1Button_ActionPerformed(final java.awt.event.ActionEvent actionEvent) {
- final Verifier v = VerifierFactory.getVerifier(class_name);
+ final Verifier v = VerifierFactory.getVerifier(className);
final VerificationResult vr = v.doPass1();
if (vr.getStatus() == VerificationResult.VERIFIED_OK) {
getPass1Panel().setBackground(Color.green);
@@ -482,7 +482,7 @@ public class VerifyDialog extends javax.swing.JDialog {
/** Machine-generated. */
public void pass2Button_ActionPerformed(final java.awt.event.ActionEvent actionEvent) {
pass1Button_ActionPerformed(actionEvent);
- final Verifier v = VerifierFactory.getVerifier(class_name);
+ final Verifier v = VerifierFactory.getVerifier(className);
final VerificationResult vr = v.doPass2();
if (vr.getStatus() == VerificationResult.VERIFIED_OK) {
getPass2Panel().setBackground(Color.green);
@@ -502,12 +502,12 @@ public class VerifyDialog extends javax.swing.JDialog {
public void pass4Button_ActionPerformed(final java.awt.event.ActionEvent actionEvent) {
pass2Button_ActionPerformed(actionEvent);
Color color = Color.green;
- final Verifier v = VerifierFactory.getVerifier(class_name);
+ final Verifier v = VerifierFactory.getVerifier(className);
VerificationResult vr = v.doPass2();
if (vr.getStatus() == VerificationResult.VERIFIED_OK) {
JavaClass jc = null;
try {
- jc = Repository.lookupClass(class_name);
+ jc = Repository.lookupClass(className);
final int nr = jc.getMethods().length;
for (int i = 0; i < nr; i++) {
vr = v.doPass3b(i);
diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
index 32256acd..81616e52 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
@@ -108,26 +108,26 @@ public final class Pass2Verifier extends PassVerifier implements Constants {
private final Set<String> field_names_and_desc = new HashSet<>();
private final Set<String> method_names_and_desc = new HashSet<>();
- private CPESSC_Visitor(final JavaClass _jc) {
- jc = _jc;
- cp = _jc.getConstantPool();
- cplen = cp.getLength();
+ private CPESSC_Visitor(final JavaClass jc) {
+ this.jc = jc;
+ this.cp = jc.getConstantPool();
+ this.cplen = cp.getLength();
- CONST_Class = ConstantClass.class;
+ this.CONST_Class = ConstantClass.class;
/*
* CONST_Fieldref = ConstantFieldref.class; CONST_Methodref = ConstantMethodref.class; CONST_InterfaceMethodref =
* ConstantInterfaceMethodref.class;
*/
- CONST_String = ConstantString.class;
- CONST_Integer = ConstantInteger.class;
- CONST_Float = ConstantFloat.class;
- CONST_Long = ConstantLong.class;
- CONST_Double = ConstantDouble.class;
- CONST_NameAndType = ConstantNameAndType.class;
- CONST_Utf8 = ConstantUtf8.class;
-
- carrier = new DescendingVisitor(_jc, this);
- carrier.visit();
+ this.CONST_String = ConstantString.class;
+ this.CONST_Integer = ConstantInteger.class;
+ this.CONST_Float = ConstantFloat.class;
+ this.CONST_Long = ConstantLong.class;
+ this.CONST_Double = ConstantDouble.class;
+ this.CONST_NameAndType = ConstantNameAndType.class;
+ this.CONST_Utf8 = ConstantUtf8.class;
+
+ this.carrier = new DescendingVisitor(jc, this);
+ this.carrier.visit();
}
private void checkIndex(final Node referrer, final int index, final Class<?> shouldbe) {
@@ -455,7 +455,7 @@ public final class Pass2Verifier extends PassVerifier implements Constants {
if (pred instanceof Field) { // ConstantValue attributes are quite senseless if the predecessor is not a field.
final Field f = (Field) pred;
// Field constraints have been checked before -- so we are safe using their type information.
- final Type field_type = Type.getType(((ConstantUtf8) cp.getConstant(f.getSignatureIndex())).getBytes());
+ final Type fieldType = Type.getType(((ConstantUtf8) cp.getConstant(f.getSignatureIndex())).getBytes());
final int index = obj.getConstantValueIndex();
if (index < 0 || index >= cplen) {
@@ -463,22 +463,22 @@ public final class Pass2Verifier extends PassVerifier implements Constants {
}
final Constant c = cp.getConstant(index);
- if (CONST_Long.isInstance(c) && field_type.equals(Type.LONG) || CONST_Float.isInstance(c) && field_type.equals(Type.FLOAT)) {
+ if (CONST_Long.isInstance(c) && fieldType.equals(Type.LONG) || CONST_Float.isInstance(c) && fieldType.equals(Type.FLOAT)) {
return;
}
- if (CONST_Double.isInstance(c) && field_type.equals(Type.DOUBLE)) {
+ if (CONST_Double.isInstance(c) && fieldType.equals(Type.DOUBLE)) {
return;
}
- if (CONST_Integer.isInstance(c) && (field_type.equals(Type.INT) || field_type.equals(Type.SHORT) || field_type.equals(Type.CHAR)
- || field_type.equals(Type.BYTE) || field_type.equals(Type.BOOLEAN))) {
+ if (CONST_Integer.isInstance(c) && (fieldType.equals(Type.INT) || fieldType.equals(Type.SHORT) || fieldType.equals(Type.CHAR)
+ || fieldType.equals(Type.BYTE) || fieldType.equals(Type.BOOLEAN))) {
return;
}
- if (CONST_String.isInstance(c) && field_type.equals(Type.STRING)) {
+ if (CONST_String.isInstance(c) && fieldType.equals(Type.STRING)) {
return;
}
throw new ClassConstraintException("Illegal type of ConstantValue '" + obj + "' embedding Constant '" + c + "'. It is referenced by field '"
- + tostring(f) + "' expecting a different type: '" + field_type + "'.");
+ + tostring(f) + "' expecting a different type: '" + fieldType + "'.");
}
}
@@ -1010,8 +1010,8 @@ public final class Pass2Verifier extends PassVerifier implements Constants {
private final class FAMRAV_Visitor extends EmptyVisitor {
private final ConstantPool cp; // ==jc.getConstantPool() -- only here to save typing work.
- private FAMRAV_Visitor(final JavaClass _jc) {
- cp = _jc.getConstantPool();
+ private FAMRAV_Visitor(final JavaClass jc) {
+ this.cp = jc.getConstantPool();
}
@Override
@@ -1019,15 +1019,15 @@ public final class Pass2Verifier extends PassVerifier implements Constants {
if (obj.getTag() != Const.CONSTANT_Fieldref) {
throw new ClassConstraintException("ConstantFieldref '" + tostring(obj) + "' has wrong tag!");
}
- final int name_and_type_index = obj.getNameAndTypeIndex();
- final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(name_and_type_index);
+ final int nameAndTypeIndex = obj.getNameAndTypeIndex();
+ final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(nameAndTypeIndex);
final String name = ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes(); // Field or Method name
if (!validFieldName(name)) {
throw new ClassConstraintException("Invalid field name '" + name + "' referenced by '" + tostring(obj) + "'.");
}
- final int class_index = obj.getClassIndex();
- final ConstantClass cc = (ConstantClass) cp.getConstant(class_index);
+ final int classIndex = obj.getClassIndex();
+ final ConstantClass cc = (ConstantClass) cp.getConstant(classIndex);
final String className = ((ConstantUtf8) cp.getConstant(cc.getNameIndex())).getBytes(); // Class Name in internal form
if (!validClassName(className)) {
throw new ClassConstraintException("Illegal class name '" + className + "' used by '" + tostring(obj) + "'.");
@@ -1047,15 +1047,15 @@ public final class Pass2Verifier extends PassVerifier implements Constants {
if (obj.getTag() != Const.CONSTANT_InterfaceMethodref) {
throw new ClassConstraintException("ConstantInterfaceMethodref '" + tostring(obj) + "' has wrong tag!");
}
- final int name_and_type_index = obj.getNameAndTypeIndex();
- final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(name_and_type_index);
+ final int nameAndTypeIndex = obj.getNameAndTypeIndex();
+ final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(nameAndTypeIndex);
final String name = ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes(); // Field or Method name
if (!validInterfaceMethodName(name)) {
throw new ClassConstraintException("Invalid (interface) method name '" + name + "' referenced by '" + tostring(obj) + "'.");
}
- final int class_index = obj.getClassIndex();
- final ConstantClass cc = (ConstantClass) cp.getConstant(class_index);
+ final int classIndex = obj.getClassIndex();
+ final ConstantClass cc = (ConstantClass) cp.getConstant(classIndex);
final String className = ((ConstantUtf8) cp.getConstant(cc.getNameIndex())).getBytes(); // Class Name in internal form
if (!validClassName(className)) {
throw new ClassConstraintException("Illegal class name '" + className + "' used by '" + tostring(obj) + "'.");
@@ -1080,15 +1080,15 @@ public final class Pass2Verifier extends PassVerifier implements Constants {
if (obj.getTag() != Const.CONSTANT_Methodref) {
throw new ClassConstraintException("ConstantMethodref '" + tostring(obj) + "' has wrong tag!");
}
- final int name_and_type_index = obj.getNameAndTypeIndex();
- final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(name_and_type_index);
+ final int nameAndTypeIndex = obj.getNameAndTypeIndex();
+ final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(nameAndTypeIndex);
final String name = ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes(); // Field or Method name
if (!validClassMethodName(name)) {
throw new ClassConstraintException("Invalid (non-interface) method name '" + name + "' referenced by '" + tostring(obj) + "'.");
}
- final int class_index = obj.getClassIndex();
- final ConstantClass cc = (ConstantClass) cp.getConstant(class_index);
+ final int classIndex = obj.getClassIndex();
+ final ConstantClass cc = (ConstantClass) cp.getConstant(classIndex);
final String className = ((ConstantUtf8) cp.getConstant(cc.getNameIndex())).getBytes(); // Class Name in internal form
if (!validClassName(className)) {
throw new ClassConstraintException("Illegal class name '" + className + "' used by '" + tostring(obj) + "'.");
diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java b/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
index 28959ddf..d811f050 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
@@ -342,12 +342,12 @@ public final class Pass3aVerifier extends PassVerifier {
Field f = null;
for (final Field field : fields) {
if (field.getName().equals(field_name)) {
- final Type f_type = Type.getType(field.getSignature());
- final Type o_type = o.getType(constantPoolGen);
+ final Type fType = Type.getType(field.getSignature());
+ final Type oType = o.getType(constantPoolGen);
/*
* TODO: Check if assignment compatibility is sufficient. What does Sun do?
*/
- if (f_type.equals(o_type)) {
+ if (fType.equals(oType)) {
f = field;
break;
}
@@ -359,9 +359,9 @@ public final class Pass3aVerifier extends PassVerifier {
fields = superclass.getFields();
for (final Field field : fields) {
if (field.getName().equals(field_name)) {
- final Type f_type = Type.getType(field.getSignature());
- final Type o_type = o.getType(constantPoolGen);
- if (f_type.equals(o_type)) {
+ final Type fType = Type.getType(field.getSignature());
+ final Type oType = o.getType(constantPoolGen);
+ if (fType.equals(oType)) {
f = field;
if ((f.getAccessFlags() & (Const.ACC_PUBLIC | Const.ACC_PROTECTED)) == 0) {
f = null;
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java b/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java
index c75d48a1..96aa6d4c 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java
@@ -36,9 +36,9 @@ public class ExceptionHandler {
private final InstructionHandle handlerPc;
/** Leave instance creation to JustIce. */
- ExceptionHandler(final ObjectType catch_type, final InstructionHandle handler_pc) {
- catchType = catch_type;
- handlerPc = handler_pc;
+ ExceptionHandler(final ObjectType catchType, final InstructionHandle handlerPc) {
+ this.catchType = catchType;
+ this.handlerPc = handlerPc;
}
/**
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java b/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
index f2db0e9d..7948810a 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
@@ -1039,12 +1039,12 @@ public class InstConstraintVisitor extends EmptyVisitor {
Field f = null;
for (final Field field : fields) {
if (field.getName().equals(field_name)) {
- final Type f_type = Type.getType(field.getSignature());
- final Type o_type = o.getType(cpg);
+ final Type fType = Type.getType(field.getSignature());
+ final Type oType = o.getType(cpg);
/*
* TODO: Check if assignment compatibility is sufficient. What does Sun do?
*/
- if (f_type.equals(o_type)) {
+ if (fType.equals(oType)) {
f = field;
break;
}
@@ -1057,9 +1057,9 @@ public class InstConstraintVisitor extends EmptyVisitor {
fields = superclass.getFields();
for (final Field field : fields) {
if (field.getName().equals(field_name)) {
- final Type f_type = Type.getType(field.getSignature());
- final Type o_type = o.getType(cpg);
- if (f_type.equals(o_type)) {
+ final Type fType = Type.getType(field.getSignature());
+ final Type oType = o.getType(cpg);
+ if (fType.equals(oType)) {
f = field;
if ((f.getAccessFlags() & (Const.ACC_PUBLIC | Const.ACC_PROTECTED)) == 0) {
f = null;
@@ -2513,12 +2513,12 @@ public class InstConstraintVisitor extends EmptyVisitor {
Field f = null;
for (final Field field : fields) {
if (field.getName().equals(field_name)) {
- final Type f_type = Type.getType(field.getSignature());
- final Type o_type = o.getType(cpg);
+ final Type fType = Type.getType(field.getSignature());
+ final Type oType = o.getType(cpg);
/*
* TODO: Check if assignment compatibility is sufficient. What does Sun do?
*/
- if (f_type.equals(o_type)) {
+ if (fType.equals(oType)) {
f = field;
break;
}
@@ -2597,12 +2597,12 @@ public class InstConstraintVisitor extends EmptyVisitor {
Field f = null;
for (final Field field : fields) {
if (field.getName().equals(field_name)) {
- final Type f_type = Type.getType(field.getSignature());
- final Type o_type = o.getType(cpg);
+ final Type fType = Type.getType(field.getSignature());
+ final Type oType = o.getType(cpg);
/*
* TODO: Check if assignment compatibility is sufficient. What does Sun do?
*/
- if (f_type.equals(o_type)) {
+ if (fType.equals(oType)) {
f = field;
break;
}
@@ -2671,19 +2671,19 @@ public class InstConstraintVisitor extends EmptyVisitor {
*/
@Override
public void visitReturnInstruction(final ReturnInstruction o) {
- Type method_type = mg.getType();
- if (method_type == Type.BOOLEAN || method_type == Type.BYTE || method_type == Type.SHORT || method_type == Type.CHAR) {
- method_type = Type.INT;
+ Type methodType = mg.getType();
+ if (methodType == Type.BOOLEAN || methodType == Type.BYTE || methodType == Type.SHORT || methodType == Type.CHAR) {
+ methodType = Type.INT;
}
if (o instanceof RETURN) {
- if (method_type == Type.VOID) {
+ if (methodType == Type.VOID) {
return;
}
constraintViolated(o, "RETURN instruction in non-void method.");
}
if (o instanceof ARETURN) {
- if (method_type == Type.VOID) {
+ if (methodType == Type.VOID) {
constraintViolated(o, "ARETURN instruction in void method.");
}
if (stack().peek() == Type.NULL) {
@@ -2700,8 +2700,8 @@ public class InstConstraintVisitor extends EmptyVisitor {
// constraintViolated(o, "Type on stack top which should be returned is a '"+stack().peek()+
// "' which is not assignment compatible with the return type of this method, '"+mg.getType()+"'.");
// }
- } else if (!method_type.equals(stack().peek())) {
- constraintViolated(o, "Current method has return type of '" + mg.getType() + "' expecting a '" + method_type
+ } else if (!methodType.equals(stack().peek())) {
+ constraintViolated(o, "Current method has return type of '" + mg.getType() + "' expecting a '" + methodType
+ "' on top of the stack. But stack top is a '" + stack().peek() + "'.");
}
}