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
The following commit(s) were added to refs/heads/master by this push:
new fcb6febf Use camel case for parameter names and local variable names
fcb6febf is described below
commit fcb6febfeb4adbe136e489e0d520b847e5e4ba74
Author: Gary David Gregory (Code signing key) <[email protected]>
AuthorDate: Sat Oct 22 15:40:57 2022 -0400
Use camel case for parameter names and local variable names
---
.../org/apache/bcel/classfile/BootstrapMethod.java | 6 +-
.../bcel/classfile/ConstantMethodHandle.java | 4 +-
.../org/apache/bcel/classfile/InnerClasses.java | 4 +-
.../java/org/apache/bcel/classfile/JavaClass.java | 5 +-
.../org/apache/bcel/classfile/LineNumberTable.java | 2 +-
.../apache/bcel/classfile/LocalVariableTable.java | 6 +-
.../bcel/classfile/LocalVariableTypeTable.java | 4 +-
.../org/apache/bcel/classfile/ModulePackages.java | 4 +-
.../bcel/classfile/ParameterAnnotationEntry.java | 6 +-
.../java/org/apache/bcel/classfile/StackMap.java | 8 +-
.../org/apache/bcel/classfile/StackMapEntry.java | 46 +++----
.../java/org/apache/bcel/classfile/Utility.java | 136 ++++++++++-----------
.../java/org/apache/bcel/generic/BranchHandle.java | 8 +-
.../org/apache/bcel/generic/BranchInstruction.java | 26 ++--
.../java/org/apache/bcel/generic/ClassGen.java | 6 +-
.../org/apache/bcel/generic/ConstantPoolGen.java | 22 ++--
.../java/org/apache/bcel/generic/FieldGen.java | 6 +-
src/main/java/org/apache/bcel/generic/GOTO.java | 10 +-
.../org/apache/bcel/generic/InstructionHandle.java | 4 +-
.../org/apache/bcel/generic/InstructionList.java | 14 +--
.../apache/bcel/generic/InstructionTargeter.java | 2 +-
.../org/apache/bcel/generic/LineNumberGen.java | 4 +-
src/main/java/org/apache/bcel/generic/Select.java | 8 +-
.../java/org/apache/bcel/util/AttributeHTML.java | 24 ++--
.../java/org/apache/bcel/util/BCELFactory.java | 6 +-
.../java/org/apache/bcel/util/ClassLoader.java | 10 +-
src/main/java/org/apache/bcel/util/CodeHTML.java | 58 ++++-----
.../java/org/apache/bcel/util/ConstantHTML.java | 4 +-
.../org/apache/bcel/util/InstructionFinder.java | 6 +-
.../java/org/apache/bcel/verifier/Verifier.java | 16 +--
.../org/apache/bcel/verifier/VerifierAppFrame.java | 16 +--
.../bcel/verifier/VerifierFactoryListModel.java | 4 +-
.../bcel/verifier/statics/LocalVariablesInfo.java | 4 +-
.../bcel/verifier/statics/Pass2Verifier.java | 40 +++---
.../bcel/verifier/statics/Pass3aVerifier.java | 24 ++--
.../verifier/structurals/ControlFlowGraph.java | 16 +--
.../structurals/InstConstraintVisitor.java | 44 +++----
.../bcel/verifier/structurals/Pass3bVerifier.java | 14 +--
.../bcel/verifier/structurals/Subroutines.java | 16 +--
src/test/java/org/apache/bcel/PLSETestCase.java | 6 +-
.../GeneratingAnnotatedClassesTestCase.java | 50 ++++----
.../org/apache/bcel/util/BCELifierTestCase.java | 12 +-
42 files changed, 355 insertions(+), 356 deletions(-)
diff --git a/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
b/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
index e99bc002..dd537849 100644
--- a/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
+++ b/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
@@ -151,10 +151,10 @@ public class BootstrapMethod implements Cloneable {
final StringBuilder buf = new StringBuilder();
final String bootstrapMethodName =
constantPool.constantToString(bootstrapMethodRef, Const.CONSTANT_MethodHandle);
buf.append(Utility.compactClassName(bootstrapMethodName, false));
- final int num_bootstrap_arguments = bootstrapArguments.length;
- if (num_bootstrap_arguments > 0) {
+ final int bootstrapArgumentsLen = bootstrapArguments.length;
+ if (bootstrapArgumentsLen > 0) {
buf.append("\nMethod Arguments:");
- for (int i = 0; i < num_bootstrap_arguments; i++) {
+ for (int i = 0; i < bootstrapArgumentsLen; i++) {
buf.append("\n ").append(i).append(": ");
buf.append(constantPool.constantToString(constantPool.getConstant(bootstrapArguments[i])));
}
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantMethodHandle.java
b/src/main/java/org/apache/bcel/classfile/ConstantMethodHandle.java
index b32ea45c..5339c74b 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantMethodHandle.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantMethodHandle.java
@@ -92,8 +92,8 @@ public final class ConstantMethodHandle extends Constant {
this.referenceIndex = referenceIndex;
}
- public void setReferenceKind(final int reference_kind) {
- this.referenceKind = reference_kind;
+ public void setReferenceKind(final int referenceKind) {
+ this.referenceKind = referenceKind;
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/InnerClasses.java
b/src/main/java/org/apache/bcel/classfile/InnerClasses.java
index d853123a..dda63e80 100644
--- a/src/main/java/org/apache/bcel/classfile/InnerClasses.java
+++ b/src/main/java/org/apache/bcel/classfile/InnerClasses.java
@@ -144,8 +144,8 @@ public final class InnerClasses extends Attribute
implements Iterable<InnerClass
buf.append("InnerClasses(");
buf.append(innerClasses.length);
buf.append("):\n");
- for (final InnerClass inner_class : innerClasses) {
-
buf.append(inner_class.toString(super.getConstantPool())).append("\n");
+ for (final InnerClass innerClass : innerClasses) {
+
buf.append(innerClass.toString(super.getConstantPool())).append("\n");
}
return buf.substring(0, buf.length() - 1); // remove the last newline
}
diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java
b/src/main/java/org/apache/bcel/classfile/JavaClass.java
index 032126f2..2b184c74 100644
--- a/src/main/java/org/apache/bcel/classfile/JavaClass.java
+++ b/src/main/java/org/apache/bcel/classfile/JavaClass.java
@@ -647,9 +647,8 @@ public class JavaClass extends AccessFlags implements
Cloneable, Node, Comparabl
if (this.equals(superclass)) {
return true;
}
- final JavaClass[] super_classes = getSuperClasses();
- for (final JavaClass super_classe : super_classes) {
- if (super_classe.equals(superclass)) {
+ for (final JavaClass clazz : getSuperClasses()) {
+ if (clazz.equals(superclass)) {
return true;
}
}
diff --git a/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
b/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
index 1bca926b..cd481be2 100644
--- a/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
+++ b/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
@@ -62,7 +62,7 @@ public final class LineNumberTable extends Attribute
implements Iterable<LineNum
*
* @param lineNumberTable Table of line/numbers pairs
*
- * @param constant_pool Array of constants
+ * @param constantPool Array of constants
*/
public LineNumberTable(final int nameIndex, final int length, final
LineNumber[] lineNumberTable, final ConstantPool constantPool) {
super(Const.ATTR_LINE_NUMBER_TABLE, nameIndex, length, constantPool);
diff --git a/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
b/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
index 6d76aa7b..da1c1796 100644
--- a/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
+++ b/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
@@ -140,9 +140,9 @@ public class LocalVariableTable extends Attribute
implements Iterable<LocalVaria
public final LocalVariable getLocalVariable(final int index, final int pc)
{
for (final LocalVariable variable : localVariableTable) {
if (variable.getIndex() == index) {
- final int start_pc = variable.getStartPC();
- final int end_pc = start_pc + variable.getLength();
- if (pc >= start_pc && pc <= end_pc) {
+ final int startPc = variable.getStartPC();
+ final int endPc = startPc + variable.getLength();
+ if (pc >= startPc && pc <= endPc) {
return variable;
}
}
diff --git
a/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
b/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
index 1a933fff..44876696 100644
--- a/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
+++ b/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
@@ -72,9 +72,9 @@ public class LocalVariableTypeTable extends Attribute
implements Iterable<LocalV
}
}
- public LocalVariableTypeTable(final int nameIndex, final int length, final
LocalVariable[] local_variable_table, final ConstantPool constantPool) {
+ public LocalVariableTypeTable(final int nameIndex, final int length, final
LocalVariable[] localVariableTable, final ConstantPool constantPool) {
super(Const.ATTR_LOCAL_VARIABLE_TYPE_TABLE, nameIndex, length,
constantPool);
- this.localVariableTypeTable = local_variable_table;
+ this.localVariableTypeTable = localVariableTable;
}
public LocalVariableTypeTable(final LocalVariableTypeTable c) {
diff --git a/src/main/java/org/apache/bcel/classfile/ModulePackages.java
b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
index a806b8de..203a6329 100644
--- a/src/main/java/org/apache/bcel/classfile/ModulePackages.java
+++ b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
@@ -152,8 +152,8 @@ public final class ModulePackages extends Attribute {
buf.append(packageIndexTable.length);
buf.append("):\n");
for (final int index : packageIndexTable) {
- final String package_name =
super.getConstantPool().getConstantString(index, Const.CONSTANT_Package);
- buf.append(" ").append(Utility.compactClassName(package_name,
false)).append("\n");
+ final String packageName =
super.getConstantPool().getConstantString(index, Const.CONSTANT_Package);
+ buf.append(" ").append(Utility.compactClassName(packageName,
false)).append("\n");
}
return buf.substring(0, buf.length() - 1); // remove the last newline
}
diff --git
a/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
b/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
index 21fbf604..9a413953 100644
--- a/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
+++ b/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
@@ -53,9 +53,9 @@ public class ParameterAnnotationEntry implements Node {
* @throws IOException if an I/O error occurs.
*/
ParameterAnnotationEntry(final DataInput input, final ConstantPool
constantPool) throws IOException {
- final int annotation_table_length = input.readUnsignedShort();
- annotationTable = new AnnotationEntry[annotation_table_length];
- for (int i = 0; i < annotation_table_length; i++) {
+ final int annotationTableLength = input.readUnsignedShort();
+ annotationTable = new AnnotationEntry[annotationTableLength];
+ for (int i = 0; i < annotationTableLength; i++) {
// TODO isRuntimeVisible
annotationTable[i] = AnnotationEntry.read(input, constantPool,
false);
}
diff --git a/src/main/java/org/apache/bcel/classfile/StackMap.java
b/src/main/java/org/apache/bcel/classfile/StackMap.java
index 51ec8c8e..d4763bbc 100644
--- a/src/main/java/org/apache/bcel/classfile/StackMap.java
+++ b/src/main/java/org/apache/bcel/classfile/StackMap.java
@@ -62,7 +62,7 @@ public final class StackMap extends Attribute {
*
* @param map Table of stack map entries
*
- * @param constant_pool Array of constants
+ * @param constantPool Array of constants
*/
public StackMap(final int nameIndex, final int length, final
StackMapEntry[] map, final ConstantPool constantPool) {
super(Const.ATTR_STACK_MAP, nameIndex, length, constantPool);
@@ -136,10 +136,10 @@ public final class StackMap extends Attribute {
@Override
public String toString() {
final StringBuilder buf = new StringBuilder("StackMap(");
- int running_offset = -1; // no +1 on first entry
+ int runningOffset = -1; // no +1 on first entry
for (int i = 0; i < table.length; i++) {
- running_offset = table[i].getByteCodeOffset() + running_offset + 1;
- buf.append(String.format("%n@%03d %s", running_offset, table[i]));
+ runningOffset = table[i].getByteCodeOffset() + runningOffset + 1;
+ buf.append(String.format("%n@%03d %s", runningOffset, table[i]));
if (i < table.length - 1) {
buf.append(", ");
}
diff --git a/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
b/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
index a9cc1632..7d2f9ab6 100644
--- a/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
+++ b/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
@@ -69,21 +69,21 @@ public final class StackMapEntry implements Node, Cloneable
{
byteCodeOffset = input.readShort();
} else if (frameType >= Const.APPEND_FRAME && frameType <=
Const.APPEND_FRAME_MAX) {
byteCodeOffset = input.readShort();
- final int number_of_locals = frameType - 251;
- typesOfLocals = new StackMapType[number_of_locals];
- for (int i = 0; i < number_of_locals; i++) {
+ final int numberOfLocals = frameType - 251;
+ typesOfLocals = new StackMapType[numberOfLocals];
+ for (int i = 0; i < numberOfLocals; i++) {
typesOfLocals[i] = new StackMapType(input, constantPool);
}
} else if (frameType == Const.FULL_FRAME) {
byteCodeOffset = input.readShort();
- final int number_of_locals = input.readShort();
- typesOfLocals = new StackMapType[number_of_locals];
- for (int i = 0; i < number_of_locals; i++) {
+ final int numberOfLocals = input.readShort();
+ typesOfLocals = new StackMapType[numberOfLocals];
+ for (int i = 0; i < numberOfLocals; i++) {
typesOfLocals[i] = new StackMapType(input, constantPool);
}
- final int number_of_stack_items = input.readShort();
- typesOfStackItems = new StackMapType[number_of_stack_items];
- for (int i = 0; i < number_of_stack_items; i++) {
+ final int numberOfStackItems = input.readShort();
+ typesOfStackItems = new StackMapType[numberOfStackItems];
+ for (int i = 0; i < numberOfStackItems; i++) {
typesOfStackItems[i] = new StackMapType(input, constantPool);
}
} else {
@@ -233,8 +233,8 @@ public final class StackMapEntry implements Node, Cloneable
{
}
if (frameType >= Const.APPEND_FRAME && frameType <=
Const.APPEND_FRAME_MAX) {
int len = 3;
- for (final StackMapType types_of_local : typesOfLocals) {
- len += types_of_local.hasIndex() ? 3 : 1;
+ for (final StackMapType typesOfLocal : typesOfLocals) {
+ len += typesOfLocal.hasIndex() ? 3 : 1;
}
return len;
}
@@ -242,11 +242,11 @@ public final class StackMapEntry implements Node,
Cloneable {
throw new IllegalStateException("Invalid StackMap frameType: " +
frameType);
}
int len = 7;
- for (final StackMapType types_of_local : typesOfLocals) {
- len += types_of_local.hasIndex() ? 3 : 1;
+ for (final StackMapType typesOfLocal : typesOfLocals) {
+ len += typesOfLocal.hasIndex() ? 3 : 1;
}
- for (final StackMapType types_of_stack_item : typesOfStackItems) {
- len += types_of_stack_item.hasIndex() ? 3 : 1;
+ for (final StackMapType typesOfStackItem : typesOfStackItems) {
+ len += typesOfStackItem.hasIndex() ? 3 : 1;
}
return len;
}
@@ -267,22 +267,22 @@ public final class StackMapEntry implements Node,
Cloneable {
return typesOfStackItems;
}
- public void setByteCodeOffset(final int new_offset) {
- if (new_offset < 0 || new_offset > 32767) {
- throw new IllegalArgumentException("Invalid StackMap offset: " +
new_offset);
+ public void setByteCodeOffset(final int newOffset) {
+ if (newOffset < 0 || newOffset > 32767) {
+ throw new IllegalArgumentException("Invalid StackMap offset: " +
newOffset);
}
if (frameType >= Const.SAME_FRAME && frameType <=
Const.SAME_FRAME_MAX) {
- if (new_offset > Const.SAME_FRAME_MAX) {
+ if (newOffset > Const.SAME_FRAME_MAX) {
frameType = Const.SAME_FRAME_EXTENDED;
} else {
- frameType = new_offset;
+ frameType = newOffset;
}
} else if (frameType >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME &&
frameType <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
- if (new_offset > Const.SAME_FRAME_MAX) {
+ if (newOffset > Const.SAME_FRAME_MAX) {
frameType = Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED;
} else {
- frameType = Const.SAME_LOCALS_1_STACK_ITEM_FRAME + new_offset;
+ frameType = Const.SAME_LOCALS_1_STACK_ITEM_FRAME + newOffset;
}
} else if (frameType == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
{ // CHECKSTYLE IGNORE EmptyBlock
} else if (frameType >= Const.CHOP_FRAME && frameType <=
Const.CHOP_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock
@@ -292,7 +292,7 @@ public final class StackMapEntry implements Node, Cloneable
{
} else {
throw new IllegalStateException("Invalid StackMap frameType: " +
frameType);
}
- byteCodeOffset = new_offset;
+ byteCodeOffset = newOffset;
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/Utility.java
b/src/main/java/org/apache/bcel/classfile/Utility.java
index 8b428f7a..95b699a3 100644
--- a/src/main/java/org/apache/bcel/classfile/Utility.java
+++ b/src/main/java/org/apache/bcel/classfile/Utility.java
@@ -173,11 +173,11 @@ public abstract class Utility {
/**
* Convert bit field of flags into string such as `static final'.
*
- * @param access_flags Access flags
+ * @param accessFlags Access flags
* @return String representation of flags
*/
- public static String accessToString(final int access_flags) {
- return accessToString(access_flags, false);
+ public static String accessToString(final int accessFlags) {
+ return accessToString(accessFlags, false);
}
/**
@@ -186,21 +186,21 @@ public abstract class Utility {
* Special case: Classes compiled with new compilers and with the
`ACC_SUPER' flag would be said to be "synchronized".
* This is because SUN used the same value for the flags `ACC_SUPER' and
`ACC_SYNCHRONIZED'.
*
- * @param access_flags Access flags
- * @param for_class access flags are for class qualifiers ?
+ * @param accessFlags Access flags
+ * @param forClass access flags are for class qualifiers ?
* @return String representation of flags
*/
- public static String accessToString(final int access_flags, final boolean
for_class) {
+ public static String accessToString(final int accessFlags, final boolean
forClass) {
final StringBuilder buf = new StringBuilder();
int p = 0;
for (int i = 0; p < Const.MAX_ACC_FLAG_I; i++) { // Loop through known
flags
p = pow2(i);
- if ((access_flags & p) != 0) {
+ if ((accessFlags & p) != 0) {
/*
* Special case: Classes compiled with new compilers and with
the `ACC_SUPER' flag would be said to be "synchronized".
* This is because SUN used the same value for the flags
`ACC_SUPER' and `ACC_SYNCHRONIZED'.
*/
- if (for_class && (p == Const.ACC_SUPER || p ==
Const.ACC_INTERFACE)) {
+ if (forClass && (p == Const.ACC_SUPER || p ==
Const.ACC_INTERFACE)) {
continue;
}
buf.append(Const.getAccessName(i)).append(" ");
@@ -217,12 +217,12 @@ public abstract class Utility {
}
/**
- * @param access_flags the class flags
+ * @param accessFlags the class flags
*
* @return "class" or "interface", depending on the ACC_INTERFACE flag
*/
- public static String classOrInterface(final int access_flags) {
- return (access_flags & Const.ACC_INTERFACE) != 0 ? "interface" :
"class";
+ public static String classOrInterface(final int accessFlags) {
+ return (accessFlags & Const.ACC_INTERFACE) != 0 ? "interface" :
"class";
}
/**
@@ -282,7 +282,7 @@ public abstract class Utility {
*/
public static String codeToString(final ByteSequence bytes, final
ConstantPool constantPool, final boolean verbose) throws IOException {
final short opcode = (short) bytes.readUnsignedByte();
- int default_offset = 0;
+ int defaultOffset = 0;
int low;
int high;
int npairs;
@@ -290,8 +290,8 @@ public abstract class Utility {
int vindex;
int constant;
int[] match;
- int[] jump_table;
- int no_pad_bytes = 0;
+ int[] jumpTable;
+ int noPadBytes = 0;
int offset;
final StringBuilder buf = new
StringBuilder(Const.getOpcodeName(opcode));
/*
@@ -299,15 +299,15 @@ public abstract class Utility {
*/
if (opcode == Const.TABLESWITCH || opcode == Const.LOOKUPSWITCH) {
final int remainder = bytes.getIndex() % 4;
- no_pad_bytes = remainder == 0 ? 0 : 4 - remainder;
- for (int i = 0; i < no_pad_bytes; i++) {
+ noPadBytes = remainder == 0 ? 0 : 4 - remainder;
+ for (int i = 0; i < noPadBytes; i++) {
byte b;
if ((b = bytes.readByte()) != 0) {
System.err.println("Warning: Padding byte != 0 in " +
Const.getOpcodeName(opcode) + ":" + b);
}
}
// Both cases have a field default_offset in common
- default_offset = bytes.readInt();
+ defaultOffset = bytes.readInt();
}
switch (opcode) {
/*
@@ -316,14 +316,14 @@ public abstract class Utility {
case Const.TABLESWITCH:
low = bytes.readInt();
high = bytes.readInt();
- offset = bytes.getIndex() - 12 - no_pad_bytes - 1;
- default_offset += offset;
- buf.append("\tdefault = ").append(default_offset).append(", low =
").append(low).append(", high = ").append(high).append("(");
- jump_table = new int[high - low + 1];
- for (int i = 0; i < jump_table.length; i++) {
- jump_table[i] = offset + bytes.readInt();
- buf.append(jump_table[i]);
- if (i < jump_table.length - 1) {
+ offset = bytes.getIndex() - 12 - noPadBytes - 1;
+ defaultOffset += offset;
+ buf.append("\tdefault = ").append(defaultOffset).append(", low =
").append(low).append(", high = ").append(high).append("(");
+ jumpTable = new int[high - low + 1];
+ for (int i = 0; i < jumpTable.length; i++) {
+ jumpTable[i] = offset + bytes.readInt();
+ buf.append(jumpTable[i]);
+ if (i < jumpTable.length - 1) {
buf.append(", ");
}
}
@@ -334,15 +334,15 @@ public abstract class Utility {
*/
case Const.LOOKUPSWITCH: {
npairs = bytes.readInt();
- offset = bytes.getIndex() - 8 - no_pad_bytes - 1;
+ offset = bytes.getIndex() - 8 - noPadBytes - 1;
match = new int[npairs];
- jump_table = new int[npairs];
- default_offset += offset;
- buf.append("\tdefault = ").append(default_offset).append(", npairs
= ").append(npairs).append(" (");
+ jumpTable = new int[npairs];
+ defaultOffset += offset;
+ buf.append("\tdefault = ").append(defaultOffset).append(", npairs
= ").append(npairs).append(" (");
for (int i = 0; i < npairs; i++) {
match[i] = bytes.readInt();
- jump_table[i] = offset + bytes.readInt();
- buf.append("(").append(match[i]).append(",
").append(jump_table[i]).append(")");
+ jumpTable[i] = offset + bytes.readInt();
+ buf.append("(").append(match[i]).append(",
").append(jumpTable[i]).append(")");
if (i < npairs - 1) {
buf.append(", ");
}
@@ -775,12 +775,12 @@ public abstract class Utility {
*
* @param i integer to format
* @param length length of desired string
- * @param left_justify format left or right
+ * @param leftJustify format left or right
* @param fill fill character
* @return formatted int
*/
- public static String format(final int i, final int length, final boolean
left_justify, final char fill) {
- return fillup(Integer.toString(i), length, left_justify, fill);
+ public static String format(final int i, final int length, final boolean
leftJustify, final char fill) {
+ return fillup(Integer.toString(i), length, leftJustify, fill);
}
/**
@@ -793,7 +793,7 @@ public abstract class Utility {
public static String getSignature(String type) {
final StringBuilder buf = new StringBuilder();
final char[] chars = type.toCharArray();
- boolean char_found = false;
+ boolean charFound = false;
boolean delim = false;
int index = -1;
loop: for (int i = 0; i < chars.length; i++) {
@@ -803,18 +803,18 @@ public abstract class Utility {
case '\n':
case '\r':
case '\f':
- if (char_found) {
+ if (charFound) {
delim = true;
}
break;
case '[':
- if (!char_found) {
+ if (!charFound) {
throw new IllegalArgumentException("Illegal type: " +
type);
}
index = i;
break loop;
default:
- char_found = true;
+ charFound = true;
if (!delim) {
buf.append(chars[i]);
}
@@ -1449,71 +1449,71 @@ public abstract class Utility {
// we have TypeArguments; build up partial result
// as we recurse for each TypeArgument
final StringBuilder type = new
StringBuilder(compactClassName(signature.substring(1, bracketIndex),
chopit)).append("<");
- int consumed_chars = bracketIndex + 1; // Shadows global var
+ int consumedChars = bracketIndex + 1; // Shadows global var
// check for wildcards
- if (signature.charAt(consumed_chars) == '+') {
+ if (signature.charAt(consumedChars) == '+') {
type.append("? extends ");
- consumed_chars++;
- } else if (signature.charAt(consumed_chars) == '-') {
+ consumedChars++;
+ } else if (signature.charAt(consumedChars) == '-') {
type.append("? super ");
- consumed_chars++;
+ consumedChars++;
}
// get the first TypeArgument
- if (signature.charAt(consumed_chars) == '*') {
+ if (signature.charAt(consumedChars) == '*') {
type.append("?");
- consumed_chars++;
+ consumedChars++;
} else {
-
type.append(typeSignatureToString(signature.substring(consumed_chars), chopit));
+
type.append(typeSignatureToString(signature.substring(consumedChars), chopit));
// update our consumed count by the number of characters
the for type argument
- consumed_chars = unwrap(Utility.CONSUMER_CHARS) +
consumed_chars;
- wrap(Utility.CONSUMER_CHARS, consumed_chars);
+ consumedChars = unwrap(Utility.CONSUMER_CHARS) +
consumedChars;
+ wrap(Utility.CONSUMER_CHARS, consumedChars);
}
// are there more TypeArguments?
- while (signature.charAt(consumed_chars) != '>') {
+ while (signature.charAt(consumedChars) != '>') {
type.append(", ");
// check for wildcards
- if (signature.charAt(consumed_chars) == '+') {
+ if (signature.charAt(consumedChars) == '+') {
type.append("? extends ");
- consumed_chars++;
- } else if (signature.charAt(consumed_chars) == '-') {
+ consumedChars++;
+ } else if (signature.charAt(consumedChars) == '-') {
type.append("? super ");
- consumed_chars++;
+ consumedChars++;
}
- if (signature.charAt(consumed_chars) == '*') {
+ if (signature.charAt(consumedChars) == '*') {
type.append("?");
- consumed_chars++;
+ consumedChars++;
} else {
-
type.append(typeSignatureToString(signature.substring(consumed_chars), chopit));
+
type.append(typeSignatureToString(signature.substring(consumedChars), chopit));
// update our consumed count by the number of
characters the for type argument
- consumed_chars = unwrap(Utility.CONSUMER_CHARS) +
consumed_chars;
- wrap(Utility.CONSUMER_CHARS, consumed_chars);
+ consumedChars = unwrap(Utility.CONSUMER_CHARS) +
consumedChars;
+ wrap(Utility.CONSUMER_CHARS, consumedChars);
}
}
// process the closing ">"
- consumed_chars++;
+ consumedChars++;
type.append(">");
- if (signature.charAt(consumed_chars) == '.') {
+ if (signature.charAt(consumedChars) == '.') {
// we have a ClassTypeSignatureSuffix
type.append(".");
// convert SimpleClassTypeSignature to fake
ClassTypeSignature
// and then recurse to parse it
- type.append(typeSignatureToString("L" +
signature.substring(consumed_chars + 1), chopit));
+ type.append(typeSignatureToString("L" +
signature.substring(consumedChars + 1), chopit));
// update our consumed count by the number of characters
the for type argument
// note that this count includes the "L" we added, but
that is ok
// as it accounts for the "." we didn't consume
- consumed_chars = unwrap(Utility.CONSUMER_CHARS) +
consumed_chars;
- wrap(Utility.CONSUMER_CHARS, consumed_chars);
+ consumedChars = unwrap(Utility.CONSUMER_CHARS) +
consumedChars;
+ wrap(Utility.CONSUMER_CHARS, consumedChars);
return type.toString();
}
- if (signature.charAt(consumed_chars) != ';') {
+ if (signature.charAt(consumedChars) != ';') {
throw new ClassFormatException("Invalid signature: " +
signature);
}
- wrap(Utility.CONSUMER_CHARS, consumed_chars + 1); // remove
final ";"
+ wrap(Utility.CONSUMER_CHARS, consumedChars + 1); // remove
final ";"
return type.toString();
}
case 'S':
@@ -1524,18 +1524,18 @@ public abstract class Utility {
int n;
StringBuilder brackets;
String type;
- int consumed_chars; // Shadows global var
+ int consumedChars; // Shadows global var
brackets = new StringBuilder(); // Accumulate []'s
// Count opening brackets and look for optional size argument
for (n = 0; signature.charAt(n) == '['; n++) {
brackets.append("[]");
}
- consumed_chars = n; // Remember value
+ consumedChars = n; // Remember value
// The rest of the string denotes a `<field_type>'
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;
+ final int temp = unwrap(Utility.CONSUMER_CHARS) +
consumedChars;
wrap(Utility.CONSUMER_CHARS, temp);
return type + brackets.toString();
}
diff --git a/src/main/java/org/apache/bcel/generic/BranchHandle.java
b/src/main/java/org/apache/bcel/generic/BranchHandle.java
index 99bf0832..f09168dc 100644
--- a/src/main/java/org/apache/bcel/generic/BranchHandle.java
+++ b/src/main/java/org/apache/bcel/generic/BranchHandle.java
@@ -85,8 +85,8 @@ public final class BranchHandle extends InstructionHandle {
}
@Override
- protected int updatePosition(final int offset, final int max_offset) {
- final int x = bi.updatePosition(offset, max_offset);
+ protected int updatePosition(final int offset, final int maxOffset) {
+ final int x = bi.updatePosition(offset, maxOffset);
super.setPosition(bi.getPosition());
return x;
}
@@ -94,7 +94,7 @@ public final class BranchHandle extends InstructionHandle {
/**
* Update target of instruction.
*/
- public void updateTarget(final InstructionHandle old_ih, final
InstructionHandle new_ih) {
- bi.updateTarget(old_ih, new_ih);
+ public void updateTarget(final InstructionHandle oldIh, final
InstructionHandle newIh) {
+ bi.updateTarget(oldIh, newIh);
}
}
diff --git a/src/main/java/org/apache/bcel/generic/BranchInstruction.java
b/src/main/java/org/apache/bcel/generic/BranchInstruction.java
index 2374955e..59480203 100644
--- a/src/main/java/org/apache/bcel/generic/BranchInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/BranchInstruction.java
@@ -32,12 +32,12 @@ public abstract class BranchInstruction extends Instruction
implements Instructi
/**
* Used by BranchInstruction, LocalVariableGen, CodeExceptionGen,
LineNumberGen
*/
- static void notifyTarget(final InstructionHandle old_ih, final
InstructionHandle new_ih, final InstructionTargeter t) {
- if (old_ih != null) {
- old_ih.removeTargeter(t);
+ static void notifyTarget(final InstructionHandle oldIh, final
InstructionHandle newIh, final InstructionTargeter t) {
+ if (oldIh != null) {
+ oldIh.removeTargeter(t);
}
- if (new_ih != null) {
- new_ih.addTargeter(t);
+ if (newIh != null) {
+ newIh.addTargeter(t);
}
}
@@ -233,24 +233,24 @@ public abstract class BranchInstruction extends
Instruction implements Instructi
* positions and offsets by calling this function.
*
* @param offset additional offset caused by preceding (variable length)
instructions
- * @param max_offset the maximum offset that may be caused by these
instructions
+ * @param maxOffset the maximum offset that may be caused by these
instructions
* @return additional offset caused by possible change of this
instruction's length
*/
- protected int updatePosition(final int offset, final int max_offset) {
+ protected int updatePosition(final int offset, final int maxOffset) {
position += offset;
return 0;
}
/**
- * @param old_ih old target
- * @param new_ih new target
+ * @param oldIh old target
+ * @param newIh new target
*/
@Override
- public void updateTarget(final InstructionHandle old_ih, final
InstructionHandle new_ih) {
- if (target != old_ih) {
- throw new ClassGenException("Not targeting " + old_ih + ", but " +
target);
+ public void updateTarget(final InstructionHandle oldIh, final
InstructionHandle newIh) {
+ if (target != oldIh) {
+ throw new ClassGenException("Not targeting " + oldIh + ", but " +
target);
}
- setTarget(new_ih);
+ setTarget(newIh);
}
}
diff --git a/src/main/java/org/apache/bcel/generic/ClassGen.java
b/src/main/java/org/apache/bcel/generic/ClassGen.java
index 0653837e..bbd04f66 100644
--- a/src/main/java/org/apache/bcel/generic/ClassGen.java
+++ b/src/main/java/org/apache/bcel/generic/ClassGen.java
@@ -185,14 +185,14 @@ public class ClassGen extends AccessFlags implements
Cloneable {
*
* Add an empty constructor to this class that does nothing but calling
super().
*
- * @param access_flags rights for constructor
+ * @param accessFlags rights for constructor
*/
- public void addEmptyConstructor(final int access_flags) {
+ public void addEmptyConstructor(final int accessFlags) {
final InstructionList il = new InstructionList();
il.append(InstructionConst.THIS); // Push `this'
il.append(new INVOKESPECIAL(cp.addMethodref(superClassName,
Const.CONSTRUCTOR_NAME, "()V")));
il.append(InstructionConst.RETURN);
- final MethodGen mg = new MethodGen(access_flags, Type.VOID,
Type.NO_ARGS, null, Const.CONSTRUCTOR_NAME, className, il, cp);
+ final MethodGen mg = new MethodGen(accessFlags, Type.VOID,
Type.NO_ARGS, null, Const.CONSTRUCTOR_NAME, className, il, cp);
mg.setMaxStack(1);
addMethod(mg.getMethod());
}
diff --git a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
index 9f1dede6..1ed3a324 100644
--- a/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
+++ b/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
@@ -466,23 +466,23 @@ public class ConstantPoolGen {
* Add a new Methodref constant to the ConstantPool, if it is not already
in there.
*
* @param className class name string to add
- * @param method_name method name string to add
+ * @param methodName method name string to add
* @param signature method signature string to add
* @return index of entry
*/
- public int addMethodref(final String className, final String method_name,
final String signature) {
+ public int addMethodref(final String className, final String methodName,
final String signature) {
int ret;
int classIndex;
int nameAndTypeIndex;
- if ((ret = lookupMethodref(className, method_name, signature)) != -1) {
+ if ((ret = lookupMethodref(className, methodName, signature)) != -1) {
return ret; // Already in CP
}
adjustSize();
- nameAndTypeIndex = addNameAndType(method_name, signature);
+ nameAndTypeIndex = addNameAndType(methodName, signature);
classIndex = addClass(className);
ret = index;
constants[index++] = new ConstantMethodref(classIndex,
nameAndTypeIndex);
- final String key = className + METHODREF_DELIM + method_name +
METHODREF_DELIM + signature;
+ final String key = className + METHODREF_DELIM + methodName +
METHODREF_DELIM + signature;
if (!cpTable.containsKey(key)) {
cpTable.put(key, new Index(ret));
}
@@ -697,12 +697,12 @@ public class ConstantPoolGen {
* Look for ConstantInterfaceMethodref in ConstantPool.
*
* @param className Where to find method
- * @param method_name Guess what
+ * @param methodName Guess what
* @param signature return and argument types
* @return index on success, -1 otherwise
*/
- 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);
+ public int lookupInterfaceMethodref(final String className, final String
methodName, final String signature) {
+ final Index index = cpTable.get(className + IMETHODREF_DELIM +
methodName + IMETHODREF_DELIM + signature);
return index != null ? index.index : -1;
}
@@ -732,12 +732,12 @@ public class ConstantPoolGen {
* Look for ConstantMethodref in ConstantPool.
*
* @param className Where to find method
- * @param method_name Guess what
+ * @param methodName Guess what
* @param signature return and argument types
* @return index on success, -1 otherwise
*/
- 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);
+ public int lookupMethodref(final String className, final String
methodName, final String signature) {
+ final Index index = cpTable.get(className + METHODREF_DELIM +
methodName + METHODREF_DELIM + signature);
return index != null ? index.index : -1;
}
diff --git a/src/main/java/org/apache/bcel/generic/FieldGen.java
b/src/main/java/org/apache/bcel/generic/FieldGen.java
index 3d46e503..f42f5708 100644
--- a/src/main/java/org/apache/bcel/generic/FieldGen.java
+++ b/src/main/java/org/apache/bcel/generic/FieldGen.java
@@ -99,13 +99,13 @@ public class FieldGen extends FieldGenOrMethodGen {
* Declare a field. If it is static (isStatic() == true) and has a basic
type like int or String it may have an initial
* value associated with it as defined by setInitValue().
*
- * @param access_flags access qualifiers
+ * @param accessFlags access qualifiers
* @param type field type
* @param name field name
* @param cp constant pool
*/
- public FieldGen(final int access_flags, final Type type, final String
name, final ConstantPoolGen cp) {
- super(access_flags);
+ public FieldGen(final int accessFlags, final Type type, final String name,
final ConstantPoolGen cp) {
+ super(accessFlags);
setType(type);
setName(name);
setConstantPool(cp);
diff --git a/src/main/java/org/apache/bcel/generic/GOTO.java
b/src/main/java/org/apache/bcel/generic/GOTO.java
index e4d08945..82c60dfc 100644
--- a/src/main/java/org/apache/bcel/generic/GOTO.java
+++ b/src/main/java/org/apache/bcel/generic/GOTO.java
@@ -72,18 +72,18 @@ public class GOTO extends GotoInstruction implements
VariableLengthInstruction {
* variable length instructions.
*
* @param offset additional offset caused by preceding (variable length)
instructions
- * @param max_offset the maximum offset that may be caused by these
instructions
+ * @param maxOffset the maximum offset that may be caused by these
instructions
* @return additional offset caused by possible change of this
instruction's length
*/
@Override
- protected int updatePosition(final int offset, final int max_offset) {
+ protected int updatePosition(final int offset, final int maxOffset) {
final int i = getTargetOffset(); // Depending on old position value
setPosition(getPosition() + offset); // Position may be shifted by
preceding expansions
- if (Math.abs(i) >= Short.MAX_VALUE - max_offset) { // to large for
short (estimate)
+ if (Math.abs(i) >= Short.MAX_VALUE - maxOffset) { // to large for
short (estimate)
super.setOpcode(org.apache.bcel.Const.GOTO_W);
- final short old_length = (short) super.getLength();
+ final short oldLength = (short) super.getLength();
super.setLength(5);
- return super.getLength() - old_length;
+ return super.getLength() - oldLength;
}
return 0;
}
diff --git a/src/main/java/org/apache/bcel/generic/InstructionHandle.java
b/src/main/java/org/apache/bcel/generic/InstructionHandle.java
index 617b0531..057043d3 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionHandle.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionHandle.java
@@ -294,10 +294,10 @@ public class InstructionHandle {
* (byte) positions and offsets by calling this function.
*
* @param offset additional offset caused by preceding (variable length)
instructions
- * @param max_offset the maximum offset that may be caused by these
instructions
+ * @param maxOffset the maximum offset that may be caused by these
instructions
* @return additional offset caused by possible change of this
instruction's length
*/
- protected int updatePosition(final int offset, final int max_offset) {
+ protected int updatePosition(final int offset, final int maxOffset) {
i_position += offset;
return 0;
}
diff --git a/src/main/java/org/apache/bcel/generic/InstructionList.java
b/src/main/java/org/apache/bcel/generic/InstructionList.java
index 5974d283..125b0ea3 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionList.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionList.java
@@ -1024,7 +1024,7 @@ public class InstructionList implements
Iterable<InstructionHandle> {
}
first.setPrev(null); // Completely separated from rest of list
last.setNext(null);
- final List<InstructionHandle> target_vec = new ArrayList<>();
+ final List<InstructionHandle> targetVec = new ArrayList<>();
for (InstructionHandle ih = first; ih != null; ih = ih.getNext()) {
ih.getInstruction().dispose(); // e.g. BranchInstructions release
their targets
}
@@ -1033,7 +1033,7 @@ public class InstructionList implements
Iterable<InstructionHandle> {
next = ih.getNext();
length--;
if (ih.hasTargeters()) { // Still got targeters?
- target_vec.add(ih);
+ targetVec.add(ih);
buf.append(ih.toString(true)).append(" ");
ih.setNext(ih.setPrev(null));
} else {
@@ -1041,8 +1041,8 @@ public class InstructionList implements
Iterable<InstructionHandle> {
}
}
buf.append("}");
- if (!target_vec.isEmpty()) {
- throw new
TargetLostException(target_vec.toArray(InstructionHandle.EMPTY_ARRAY),
buf.toString());
+ if (!targetVec.isEmpty()) {
+ throw new
TargetLostException(targetVec.toArray(InstructionHandle.EMPTY_ARRAY),
buf.toString());
}
}
@@ -1058,13 +1058,13 @@ public class InstructionList implements
Iterable<InstructionHandle> {
/**
* Replace all references to the old constant pool with references to the
new constant pool
*/
- public void replaceConstantPool(final ConstantPoolGen old_cp, final
ConstantPoolGen new_cp) {
+ public void replaceConstantPool(final ConstantPoolGen oldCp, final
ConstantPoolGen newCp) {
for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) {
final Instruction i = ih.getInstruction();
if (i instanceof CPInstruction) {
final CPInstruction ci = (CPInstruction) i;
- final Constant c = old_cp.getConstant(ci.getIndex());
- ci.setIndex(new_cp.addConstant(c, old_cp));
+ final Constant c = oldCp.getConstant(ci.getIndex());
+ ci.setIndex(newCp.addConstant(c, oldCp));
}
}
}
diff --git a/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
b/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
index 20cf6c16..f958a25e 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
@@ -38,7 +38,7 @@ public interface InstructionTargeter {
*
* @param oldIh the old handle
* @param newIh the new handle
- * @throws ClassGenException if old_ih is not targeted by this object
+ * @throws ClassGenException if oldIh is not targeted by this object
*/
void updateTarget(InstructionHandle oldIh, InstructionHandle newIh) throws
ClassGenException;
}
diff --git a/src/main/java/org/apache/bcel/generic/LineNumberGen.java
b/src/main/java/org/apache/bcel/generic/LineNumberGen.java
index 8336f459..bcdd529f 100644
--- a/src/main/java/org/apache/bcel/generic/LineNumberGen.java
+++ b/src/main/java/org/apache/bcel/generic/LineNumberGen.java
@@ -85,8 +85,8 @@ public class LineNumberGen implements InstructionTargeter,
Cloneable {
this.ih = instructionHandle;
}
- public void setSourceLine(final int src_line) { // TODO could be
package-protected?
- this.srcLine = src_line;
+ public void setSourceLine(final int srcLine) { // TODO could be
package-protected?
+ this.srcLine = srcLine;
}
/**
diff --git a/src/main/java/org/apache/bcel/generic/Select.java
b/src/main/java/org/apache/bcel/generic/Select.java
index 70e2a3db..05d3c185 100644
--- a/src/main/java/org/apache/bcel/generic/Select.java
+++ b/src/main/java/org/apache/bcel/generic/Select.java
@@ -266,12 +266,12 @@ public abstract class Select extends BranchInstruction
implements VariableLength
}
/**
- * @param match_length the match_length to set
+ * @param matchLength the match_length to set
* @since 6.0
*/
- final int setMatch_length(final int match_length) {
- this.match_length = match_length;
- return match_length;
+ final int setMatch_length(final int matchLength) {
+ this.match_length = matchLength;
+ return matchLength;
}
/**
diff --git a/src/main/java/org/apache/bcel/util/AttributeHTML.java
b/src/main/java/org/apache/bcel/util/AttributeHTML.java
index 98c8ed3e..38701aa7 100644
--- a/src/main/java/org/apache/bcel/util/AttributeHTML.java
+++ b/src/main/java/org/apache/bcel/util/AttributeHTML.java
@@ -65,15 +65,15 @@ final class AttributeHTML implements Closeable {
printWriter.close();
}
- private String codeLink(final int link, final int method_number) {
- return "<A HREF=\"" + className + "_code.html#code" + method_number +
"@" + link + "\" TARGET=Code>" + link + "</A>";
+ private String codeLink(final int link, final int methodNumber) {
+ return "<A HREF=\"" + className + "_code.html#code" + methodNumber +
"@" + link + "\" TARGET=Code>" + link + "</A>";
}
void writeAttribute(final Attribute attribute, final String anchor) {
writeAttribute(attribute, anchor, 0);
}
- void writeAttribute(final Attribute attribute, final String anchor, final
int method_number) {
+ void writeAttribute(final Attribute attribute, final String anchor, final
int methodNumber) {
final byte tag = attribute.getTag();
int index;
if (tag == Const.ATTR_UNKNOWN) {
@@ -94,7 +94,7 @@ final class AttributeHTML implements Closeable {
final Code c = (Code) attribute;
// Some directly printable values
printWriter.print("<UL><LI>Maximum stack size = " +
c.getMaxStack() + "</LI>\n<LI>Number of local variables = " + c.getMaxLocals()
- + "</LI>\n<LI><A HREF=\"" + className + "_code.html#method" +
method_number + "\" TARGET=Code>Byte code</A></LI></UL>\n");
+ + "</LI>\n<LI><A HREF=\"" + className + "_code.html#method" +
methodNumber + "\" TARGET=Code>Byte code</A></LI></UL>\n");
// Get handled exceptions and list them
final CodeException[] ce = c.getExceptionTable();
final int len = ce.length;
@@ -108,8 +108,8 @@ final class AttributeHTML implements Closeable {
} else {
printWriter.print("Any Exception");
}
- printWriter.print("<BR>(Ranging from lines " +
codeLink(cex.getStartPC(), method_number) + " to " + codeLink(cex.getEndPC(),
method_number)
- + ", handled at line " + codeLink(cex.getHandlerPC(),
method_number) + ")</LI>");
+ printWriter.print("<BR>(Ranging from lines " +
codeLink(cex.getStartPC(), methodNumber) + " to " + codeLink(cex.getEndPC(),
methodNumber)
+ + ", handled at line " + codeLink(cex.getHandlerPC(),
methodNumber) + ")</LI>");
}
printWriter.print("</UL>");
}
@@ -137,12 +137,12 @@ final class AttributeHTML implements Closeable {
printWriter.print("</UL>\n");
break;
case Const.ATTR_LINE_NUMBER_TABLE:
- final LineNumber[] line_numbers = ((LineNumberTable)
attribute).getLineNumberTable();
+ final LineNumber[] lineNumbers = ((LineNumberTable)
attribute).getLineNumberTable();
// List line number pairs
printWriter.print("<P>");
- for (int i = 0; i < line_numbers.length; i++) {
- printWriter.print("(" + line_numbers[i].getStartPC() +
", " + line_numbers[i].getLineNumber() + ")");
- if (i < line_numbers.length - 1) {
+ for (int i = 0; i < lineNumbers.length; i++) {
+ printWriter.print("(" + lineNumbers[i].getStartPC() +
", " + lineNumbers[i].getLineNumber() + ")");
+ if (i < lineNumbers.length - 1) {
printWriter.print(", "); // breakable
}
}
@@ -157,8 +157,8 @@ final class AttributeHTML implements Closeable {
final int start = var.getStartPC();
final int end = start + var.getLength();
printWriter.println("<LI>" +
Class2HTML.referenceType(signature) + " <B>" + var.getName() + "</B> in
slot %" + var.getIndex()
- + "<BR>Valid from lines " + "<A HREF=\"" + className +
"_code.html#code" + method_number + "@" + start + "\" TARGET=Code>" + start
- + "</A> to " + "<A HREF=\"" + className +
"_code.html#code" + method_number + "@" + end + "\" TARGET=Code>" + end +
"</A></LI>");
+ + "<BR>Valid from lines " + "<A HREF=\"" + className +
"_code.html#code" + methodNumber + "@" + start + "\" TARGET=Code>" + start
+ + "</A> to " + "<A HREF=\"" + className +
"_code.html#code" + methodNumber + "@" + end + "\" TARGET=Code>" + end +
"</A></LI>");
});
printWriter.print("</UL>\n");
break;
diff --git a/src/main/java/org/apache/bcel/util/BCELFactory.java
b/src/main/java/org/apache/bcel/util/BCELFactory.java
index 0252016b..84f25d5c 100644
--- a/src/main/java/org/apache/bcel/util/BCELFactory.java
+++ b/src/main/java/org/apache/bcel/util/BCELFactory.java
@@ -210,10 +210,10 @@ class BCELFactory extends EmptyVisitor {
}
printWriter.println(" }, null);");
} else {
- final int t_pos = bh.getTarget().getPosition();
+ final int tPos = bh.getTarget().getPosition();
String target;
- if (pos > t_pos) {
- target = "ih_" + t_pos;
+ if (pos > tPos) {
+ target = "ih_" + tPos;
} else {
branches.add(bi);
target = "null";
diff --git a/src/main/java/org/apache/bcel/util/ClassLoader.java
b/src/main/java/org/apache/bcel/util/ClassLoader.java
index 14dcf767..680eca3e 100644
--- a/src/main/java/org/apache/bcel/util/ClassLoader.java
+++ b/src/main/java/org/apache/bcel/util/ClassLoader.java
@@ -89,10 +89,10 @@ public class ClassLoader extends java.lang.ClassLoader {
}
/**
- * @param ignored_packages classes contained in these packages will be
loaded with the system class loader
+ * @param ignoredPackages classes contained in these packages will be
loaded with the system class loader
*/
- public ClassLoader(final String[] ignored_packages) {
- this.ignoredPackages = ignored_packages;
+ public ClassLoader(final String[] ignoredPackages) {
+ this.ignoredPackages = ignoredPackages;
}
/**
@@ -109,10 +109,10 @@ public class ClassLoader extends java.lang.ClassLoader {
*/
protected JavaClass createClass(final String className) {
final int index = className.indexOf(BCEL_TOKEN);
- final String real_name = className.substring(index +
BCEL_TOKEN.length());
+ final String realName = className.substring(index +
BCEL_TOKEN.length());
JavaClass clazz = null;
try {
- final byte[] bytes = Utility.decode(real_name, true);
+ final byte[] bytes = Utility.decode(realName, true);
final ClassParser parser = new ClassParser(new
ByteArrayInputStream(bytes), "foo");
clazz = parser.parse();
} catch (final IOException e) {
diff --git a/src/main/java/org/apache/bcel/util/CodeHTML.java
b/src/main/java/org/apache/bcel/util/CodeHTML.java
index f0500519..22a3666c 100644
--- a/src/main/java/org/apache/bcel/util/CodeHTML.java
+++ b/src/main/java/org/apache/bcel/util/CodeHTML.java
@@ -73,7 +73,7 @@ final class CodeHTML {
* @param stream data input stream
* @return String representation of byte code
*/
- private String codeToHTML(final ByteSequence bytes, final int
method_number) throws IOException {
+ private String codeToHTML(final ByteSequence bytes, final int
methodNumber) throws IOException {
final short opcode = (short) bytes.readUnsignedByte();
String name;
String signature;
@@ -117,9 +117,9 @@ final class CodeHTML {
buf.append("<TH>default</TH></TR>\n<TR>");
// Print target and default indices in second row
for (final int element : jumpTable) {
- buf.append("<TD><A
HREF=\"#code").append(method_number).append("@").append(element).append("\">").append(element).append("</A></TD>");
+ buf.append("<TD><A
HREF=\"#code").append(methodNumber).append("@").append(element).append("\">").append(element).append("</A></TD>");
}
- buf.append("<TD><A
HREF=\"#code").append(method_number).append("@").append(defaultOffset).append("\">").append(defaultOffset)
+ buf.append("<TD><A
HREF=\"#code").append(methodNumber).append("@").append(defaultOffset).append("\">").append(defaultOffset)
.append("</A></TD></TR>\n</TABLE>\n");
break;
/*
@@ -140,10 +140,10 @@ final class CodeHTML {
buf.append("<TH>default</TH></TR>\n<TR>");
// Print target and default indices in second row
for (int i = 0; i < npairs; i++) {
- buf.append("<TD><A
HREF=\"#code").append(method_number).append("@").append(jumpTable[i]).append("\">").append(jumpTable[i])
+ buf.append("<TD><A
HREF=\"#code").append(methodNumber).append("@").append(jumpTable[i]).append("\">").append(jumpTable[i])
.append("</A></TD>");
}
- buf.append("<TD><A
HREF=\"#code").append(method_number).append("@").append(defaultOffset).append("\">").append(defaultOffset)
+ buf.append("<TD><A
HREF=\"#code").append(methodNumber).append("@").append(defaultOffset).append("\">").append(defaultOffset)
.append("</A></TD></TR>\n</TABLE>\n");
break;
/*
@@ -168,7 +168,7 @@ final class CodeHTML {
case Const.IF_ICMPNE:
case Const.JSR:
index = bytes.getIndex() + bytes.readShort() - 1;
- buf.append("<A
HREF=\"#code").append(method_number).append("@").append(index).append("\">").append(index).append("</A>");
+ buf.append("<A
HREF=\"#code").append(methodNumber).append("@").append(index).append("\">").append(index).append("</A>");
break;
/*
* Same for 32-bit wide jumps
@@ -176,7 +176,7 @@ final class CodeHTML {
case Const.GOTO_W:
case Const.JSR_W:
final int windex = bytes.getIndex() + bytes.readInt() - 1;
- buf.append("<A
HREF=\"#code").append(method_number).append("@").append(windex).append("\">").append(windex).append("</A>");
+ buf.append("<A
HREF=\"#code").append(methodNumber).append("@").append(windex).append("\">").append(windex).append("</A>");
break;
/*
* Index byte references local variable (register)
@@ -227,12 +227,12 @@ final class CodeHTML {
name = constantPool.getConstantString(classIndex,
Const.CONSTANT_Class);
name = Utility.compactClassName(name, false);
index = c1.getNameAndTypeIndex();
- final String field_name = constantPool.constantToString(index,
Const.CONSTANT_NameAndType);
+ final String fieldName = constantPool.constantToString(index,
Const.CONSTANT_NameAndType);
if (name.equals(className)) { // Local field
- buf.append("<A
HREF=\"").append(className).append("_methods.html#field").append(field_name).append("\"
TARGET=Methods>").append(field_name)
+ buf.append("<A
HREF=\"").append(className).append("_methods.html#field").append(fieldName).append("\"
TARGET=Methods>").append(fieldName)
.append("</A>\n");
} else {
-
buf.append(constantHtml.referenceConstant(classIndex)).append(".").append(field_name);
+
buf.append(constantHtml.referenceConstant(classIndex)).append(".").append(fieldName);
}
break;
/*
@@ -404,29 +404,29 @@ final class CodeHTML {
case Const.LOOKUPSWITCH:
// bytes.readByte(); // Skip already read byte
final int remainder = bytes.getIndex() % 4;
- final int no_pad_bytes = remainder == 0 ? 0 : 4 - remainder;
- int default_offset;
+ final int noPadBytes = remainder == 0 ? 0 : 4 - remainder;
+ int defaultOffset;
int offset;
- for (int j = 0; j < no_pad_bytes; j++) {
+ for (int j = 0; j < noPadBytes; j++) {
bytes.readByte();
}
// Both cases have a field default_offset in common
- default_offset = bytes.readInt();
+ defaultOffset = bytes.readInt();
if (opcode == Const.TABLESWITCH) {
final int low = bytes.readInt();
final int high = bytes.readInt();
- offset = bytes.getIndex() - 12 - no_pad_bytes - 1;
- default_offset += offset;
- gotoSet.set(default_offset);
+ offset = bytes.getIndex() - 12 - noPadBytes - 1;
+ defaultOffset += offset;
+ gotoSet.set(defaultOffset);
for (int j = 0; j < high - low + 1; j++) {
index = offset + bytes.readInt();
gotoSet.set(index);
}
} else { // LOOKUPSWITCH
final int npairs = bytes.readInt();
- offset = bytes.getIndex() - 8 - no_pad_bytes - 1;
- default_offset += offset;
- gotoSet.set(default_offset);
+ offset = bytes.getIndex() - 8 - noPadBytes - 1;
+ defaultOffset += offset;
+ gotoSet.set(defaultOffset);
for (int j = 0; j < npairs; j++) {
// int match = bytes.readInt();
bytes.readInt();
@@ -473,7 +473,7 @@ final class CodeHTML {
/**
* Write a single method with the byte code associated with it.
*/
- private void writeMethod(final Method method, final int method_number)
throws IOException {
+ private void writeMethod(final Method method, final int methodNumber)
throws IOException {
// Get raw signature
final String signature = method.getSignature();
// Get array of strings containing the argument types
@@ -482,14 +482,14 @@ final class CodeHTML {
final String type = Utility.methodSignatureReturnType(signature,
false);
// Get method name
final String name = method.getName();
- final String html_name = Class2HTML.toHTML(name);
+ final String htmlName = Class2HTML.toHTML(name);
// Get method's access flags
String access = Utility.accessToString(method.getAccessFlags());
access = Utility.replace(access, " ", " ");
// Get the method's attributes, the Code Attribute in particular
final Attribute[] attributes = method.getAttributes();
- printWriter.print("<P><B><FONT COLOR=\"#FF0000\">" + access +
"</FONT> " + "<A NAME=method" + method_number + ">" +
Class2HTML.referenceType(type)
- + "</A> <A HREF=\"" + className + "_methods.html#method" +
method_number + "\" TARGET=Methods>" + html_name + "</A>(");
+ printWriter.print("<P><B><FONT COLOR=\"#FF0000\">" + access +
"</FONT> " + "<A NAME=method" + methodNumber + ">" +
Class2HTML.referenceType(type)
+ + "</A> <A HREF=\"" + className + "_methods.html#method" +
methodNumber + "\" TARGET=Methods>" + htmlName + "</A>(");
for (int i = 0; i < args.length; i++) {
printWriter.print(Class2HTML.referenceType(args[i]));
if (i < args.length - 1) {
@@ -504,7 +504,7 @@ final class CodeHTML {
for (int i = 0; i < attributes.length; i++) {
byte tag = attributes[i].getTag();
if (tag != Const.ATTR_UNKNOWN) {
- printWriter.print("<LI><A HREF=\"" + className +
"_attributes.html#method" + method_number + "@" + i + "\" TARGET=Attributes>"
+ printWriter.print("<LI><A HREF=\"" + className +
"_attributes.html#method" + methodNumber + "@" + i + "\" TARGET=Attributes>"
+ Const.getAttributeName(tag) + "</A></LI>\n");
} else {
printWriter.print("<LI>" + attributes[i] + "</LI>");
@@ -516,7 +516,7 @@ final class CodeHTML {
printWriter.print("<UL>");
for (int j = 0; j < attributes2.length; j++) {
tag = attributes2[j].getTag();
- printWriter.print("<LI><A HREF=\"" + className +
"_attributes.html#" + "method" + method_number + "@" + i + "@" + j
+ printWriter.print("<LI><A HREF=\"" + className +
"_attributes.html#" + "method" + methodNumber + "@" + i + "@" + j
+ "\" TARGET=Attributes>" +
Const.getAttributeName(tag) + "</A></LI>\n");
}
printWriter.print("</UL>");
@@ -534,18 +534,18 @@ final class CodeHTML {
printWriter.println("<TABLE BORDER=0><TR><TH
ALIGN=LEFT>Byte<BR>offset</TH>" + "<TH ALIGN=LEFT>Instruction</TH><TH
ALIGN=LEFT>Argument</TH>");
while (stream.available() > 0) {
final int offset = stream.getIndex();
- final String str = codeToHTML(stream, method_number);
+ final String str = codeToHTML(stream, methodNumber);
String anchor = "";
/*
* Set an anchor mark if this line is targetted by a goto,
jsr, etc. Defining an anchor for every line is very
* inefficient!
*/
if (gotoSet.get(offset)) {
- anchor = "<A NAME=code" + method_number + "@" + offset
+ "></A>";
+ anchor = "<A NAME=code" + methodNumber + "@" + offset
+ "></A>";
}
String anchor2;
if (stream.getIndex() == code.length) {
- anchor2 = "<A NAME=code" + method_number + "@" +
code.length + ">" + offset + "</A>";
+ anchor2 = "<A NAME=code" + methodNumber + "@" +
code.length + ">" + offset + "</A>";
} else {
anchor2 = "" + offset;
}
diff --git a/src/main/java/org/apache/bcel/util/ConstantHTML.java
b/src/main/java/org/apache/bcel/util/ConstantHTML.java
index d72c242d..2c37fda8 100644
--- a/src/main/java/org/apache/bcel/util/ConstantHTML.java
+++ b/src/main/java/org/apache/bcel/util/ConstantHTML.java
@@ -45,10 +45,10 @@ final class ConstantHTML {
private final Constant[] constants; // The constants in the cp
private final Method[] methods;
- ConstantHTML(final String dir, final String className, final String
class_package, final Method[] methods, final ConstantPool constantPool,
+ ConstantHTML(final String dir, final String className, final String
classPackage, final Method[] methods, final ConstantPool constantPool,
final Charset charset) throws IOException {
this.className = className;
- this.classPackage = class_package;
+ this.classPackage = classPackage;
this.constantPool = constantPool;
this.methods = methods;
this.constants = constantPool.getConstantPool();
diff --git a/src/main/java/org/apache/bcel/util/InstructionFinder.java
b/src/main/java/org/apache/bcel/util/InstructionFinder.java
index 3e8a0d65..f5f06d96 100644
--- a/src/main/java/org/apache/bcel/util/InstructionFinder.java
+++ b/src/main/java/org/apache/bcel/util/InstructionFinder.java
@@ -256,9 +256,9 @@ public class InstructionFinder {
/**
* @return the matched piece of code as an array of instruction (handles)
*/
- private InstructionHandle[] getMatch(final int matched_from, final int
match_length) {
- final InstructionHandle[] match = new InstructionHandle[match_length];
- System.arraycopy(handles, matched_from, match, 0, match_length);
+ private InstructionHandle[] getMatch(final int matchedFrom, final int
matchLength) {
+ final InstructionHandle[] match = new InstructionHandle[matchLength];
+ System.arraycopy(handles, matchedFrom, match, 0, matchLength);
return match;
}
diff --git a/src/main/java/org/apache/bcel/verifier/Verifier.java
b/src/main/java/org/apache/bcel/verifier/Verifier.java
index 2456a854..d11818a2 100644
--- a/src/main/java/org/apache/bcel/verifier/Verifier.java
+++ b/src/main/java/org/apache/bcel/verifier/Verifier.java
@@ -121,8 +121,8 @@ public class Verifier {
*
* @see VerifierFactory
*/
- Verifier(final String fully_qualified_classname) {
- classname = fully_qualified_classname;
+ Verifier(final String fullyQualifiedClassName) {
+ classname = fullyQualifiedClassName;
flush();
}
@@ -143,22 +143,22 @@ public class Verifier {
}
/** Returns the VerificationResult for the given pass. */
- public VerificationResult doPass3a(final int method_no) {
- final String key = Integer.toString(method_no);
+ public VerificationResult doPass3a(final int methodNo) {
+ final String key = Integer.toString(methodNo);
Pass3aVerifier p3av = p3avs.get(key);
if (p3avs.get(key) == null) {
- p3av = new Pass3aVerifier(this, method_no);
+ p3av = new Pass3aVerifier(this, methodNo);
p3avs.put(key, p3av);
}
return p3av.verify();
}
/** Returns the VerificationResult for the given pass. */
- public VerificationResult doPass3b(final int method_no) {
- final String key = Integer.toString(method_no);
+ public VerificationResult doPass3b(final int methodNo) {
+ final String key = Integer.toString(methodNo);
Pass3bVerifier p3bv = p3bvs.get(key);
if (p3bvs.get(key) == null) {
- p3bv = new Pass3bVerifier(this, method_no);
+ p3bv = new Pass3bVerifier(this, methodNo);
p3bvs.put(key, p3bv);
}
return p3bv.verify();
diff --git a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
index 02f32f81..20aa2a32 100644
--- a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
+++ b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
@@ -72,7 +72,7 @@ public class VerifierAppFrame extends JFrame {
private final GridLayout gridLayout4 = new GridLayout();
private final JScrollPane jScrollPane4 = new JScrollPane();
private final CardLayout cardLayout1 = new CardLayout();
- private String current_class;
+ private String currentClass;
private final GridLayout gridLayout3 = new GridLayout();
private final JTextPane pass1TextPane = new JTextPane();
private final JTextPane pass2TextPane = new JTextPane();
@@ -112,14 +112,14 @@ public class VerifierAppFrame extends JFrame {
if (e.getValueIsAdjusting()) {
return;
}
- current_class = classNamesJList.getSelectedValue();
+ currentClass = classNamesJList.getSelectedValue();
try {
verify();
} catch (final ClassNotFoundException ex) {
// FIXME: report the error using the GUI
ex.printStackTrace();
}
- classNamesJList.setSelectedValue(current_class, true);
+ classNamesJList.setSelectedValue(currentClass, true);
}
/**
@@ -227,7 +227,7 @@ public class VerifierAppFrame extends JFrame {
if (e.getValueIsAdjusting()) {
return;
}
- final Verifier v = VerifierFactory.getVerifier(current_class);
+ final Verifier v = VerifierFactory.getVerifier(currentClass);
final StringBuilder all3amsg = new StringBuilder();
boolean all3aok = true;
boolean rejected = false;
@@ -256,7 +256,7 @@ public class VerifierAppFrame extends JFrame {
if (e.getValueIsAdjusting()) {
return;
}
- final Verifier v = VerifierFactory.getVerifier(current_class);
+ final Verifier v = VerifierFactory.getVerifier(currentClass);
final StringBuilder all3bmsg = new StringBuilder();
boolean all3bok = true;
boolean rejected = false;
@@ -292,7 +292,7 @@ public class VerifierAppFrame extends JFrame {
private void verify() throws ClassNotFoundException {
setTitle("PLEASE WAIT");
- final Verifier v = VerifierFactory.getVerifier(current_class);
+ final Verifier v = VerifierFactory.getVerifier(currentClass);
v.flush(); // Don't cache the verification result for this class.
VerificationResult vr;
vr = v.doPass1();
@@ -323,7 +323,7 @@ public class VerifierAppFrame extends JFrame {
} else { // must be Verified_OK, because Pass1 was OK (cannot be
Verified_NOTYET).
pass2TextPane.setText(vr.getMessage());
pass2TextPane.setBackground(Color.green);
- final JavaClass jc = Repository.lookupClass(current_class);
+ final JavaClass jc = Repository.lookupClass(currentClass);
/*
* boolean all3aok = true; boolean all3bok = true; String
all3amsg = ""; String all3bmsg = "";
*/
@@ -343,7 +343,7 @@ public class VerifierAppFrame extends JFrame {
allmsgs.append(msgs[i]).append("\n\n");
}
messagesTextPane.setText(allmsgs.toString());
- setTitle(current_class + " - " + JUSTICE_VERSION);
+ setTitle(currentClass + " - " + JUSTICE_VERSION);
}
void whatisMenuItem_actionPerformed(final ActionEvent e) {
diff --git
a/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
b/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
index ee12fa14..7cd58202 100644
--- a/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
+++ b/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
@@ -63,13 +63,13 @@ public class VerifierFactoryListModel implements
VerifierFactoryObserver, ListMo
@Override
public synchronized void update(final String s) {
final Verifier[] verifiers = VerifierFactory.getVerifiers();
- final int num_of_verifiers = verifiers.length;
+ final int verifierLen = verifiers.length;
cache.clear();
for (final Verifier verifier : verifiers) {
cache.add(verifier.getClassName());
}
for (final ListDataListener listener : listeners) {
- listener.contentsChanged(new ListDataEvent(this,
ListDataEvent.CONTENTS_CHANGED, 0, num_of_verifiers - 1));
+ listener.contentsChanged(new ListDataEvent(this,
ListDataEvent.CONTENTS_CHANGED, 0, verifierLen - 1));
}
}
diff --git
a/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
b/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
index c5eace05..b9eca826 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
@@ -31,8 +31,8 @@ public class LocalVariablesInfo {
private final LocalVariableInfo[] localVariableInfos;
/** The constructor. */
- LocalVariablesInfo(final int max_locals) {
- localVariableInfos = new LocalVariableInfo[max_locals];
+ LocalVariablesInfo(final int maxLocals) {
+ localVariableInfos = new LocalVariableInfo[maxLocals];
Arrays.setAll(localVariableInfos, i -> new LocalVariableInfo());
}
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 80442352..2a411cc9 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
@@ -105,9 +105,9 @@ public final class Pass2Verifier extends PassVerifier
implements Constants {
private final int cplen; // == cp.getLength() -- to save computing
power.
private final DescendingVisitor carrier;
- private final Set<String> field_names = new HashSet<>();
- private final Set<String> field_names_and_desc = new HashSet<>();
- private final Set<String> method_names_and_desc = new HashSet<>();
+ private final Set<String> fieldNames = new HashSet<>();
+ private final Set<String> fieldNamesAndDesc = new HashSet<>();
+ private final Set<String> methodNamesAndDesc = new HashSet<>();
private CPESSC_Visitor(final JavaClass jc) {
this.jc = jc;
@@ -503,12 +503,12 @@ public final class Pass2Verifier extends PassVerifier
implements Constants {
"The Exceptions attribute '" + tostring(obj) + "' is
not correctly named 'Exceptions' but '" + name + "'.");
}
- final int[] exc_indices = obj.getExceptionIndexTable();
+ final int[] excIndices = obj.getExceptionIndexTable();
- for (final int exc_indice : exc_indices) {
- checkIndex(obj, exc_indice, CONST_Class);
+ for (final int excIndice : excIndices) {
+ checkIndex(obj, excIndice, CONST_Class);
- final ConstantClass cc = (ConstantClass)
cp.getConstant(exc_indice);
+ final ConstantClass cc = (ConstantClass)
cp.getConstant(excIndice);
checkIndex(cc, cc.getNameIndex(), CONST_Utf8); // can't be
sure this ConstantClass has already been visited (checked)!
// convert internal notation on-the-fly to external
notation:
final String cname = Utility.pathToPackage(((ConstantUtf8)
cp.getConstant(cc.getNameIndex())).getBytes());
@@ -613,14 +613,14 @@ public final class Pass2Verifier extends PassVerifier
implements Constants {
}
final String nameanddesc = name + sig;
- if (field_names_and_desc.contains(nameanddesc)) {
+ if (fieldNamesAndDesc.contains(nameanddesc)) {
throw new ClassConstraintException("No two fields (like '" +
tostring(obj) + "') are allowed have same names and descriptors!");
}
- if (field_names.contains(name)) {
+ if (fieldNames.contains(name)) {
addMessage("More than one field of name '" + name + "'
detected (but with different type descriptors). This is very unusual.");
}
- field_names_and_desc.add(nameanddesc);
- field_names.add(name);
+ fieldNamesAndDesc.add(nameanddesc);
+ fieldNames.add(name);
final Attribute[] atts = obj.getAttributes();
for (final Attribute att : atts) {
@@ -655,9 +655,9 @@ public final class Pass2Verifier extends PassVerifier
implements Constants {
innerClasses.forEach(ic -> {
checkIndex(innerClasses, ic.getInnerClassIndex(), CONST_Class);
- final int outer_idx = ic.getOuterClassIndex();
- if (outer_idx != 0) {
- checkIndex(innerClasses, outer_idx, CONST_Class);
+ final int outerIdx = ic.getOuterClassIndex();
+ if (outerIdx != 0) {
+ checkIndex(innerClasses, outerIdx, CONST_Class);
}
final int innername_idx = ic.getInnerNameIndex();
if (innername_idx != 0) {
@@ -914,13 +914,13 @@ public final class Pass2Verifier extends PassVerifier
implements Constants {
}
final String nameanddesc = name + sig;
- if (method_names_and_desc.contains(nameanddesc)) {
+ if (methodNamesAndDesc.contains(nameanddesc)) {
throw new ClassConstraintException("No two methods (like '" +
tostring(obj) + "') are allowed have same names and desciptors!");
}
- method_names_and_desc.add(nameanddesc);
+ methodNamesAndDesc.add(nameanddesc);
final Attribute[] atts = obj.getAttributes();
- int num_code_atts = 0;
+ int numCodeAtts = 0;
for (final Attribute att : atts) {
if (!(att instanceof Code) && !(att instanceof ExceptionTable)
&& !(att instanceof Synthetic) && !(att instanceof Deprecated)) {
addMessage("Attribute '" + tostring(att) + "' as an
attribute of Method '" + tostring(obj) + "' is unknown and will therefore be
ignored.");
@@ -936,12 +936,12 @@ public final class Pass2Verifier extends PassVerifier
implements Constants {
// 4.7.3
}
if (att instanceof Code) {
- num_code_atts++;
+ numCodeAtts++;
}
}
- if (!obj.isNative() && !obj.isAbstract() && num_code_atts != 1) {
+ if (!obj.isNative() && !obj.isAbstract() && numCodeAtts != 1) {
throw new ClassConstraintException(
- "Non-native, non-abstract methods like '" + tostring(obj)
+ "' must have exactly one Code attribute (found: " + num_code_atts + ").");
+ "Non-native, non-abstract methods like '" + tostring(obj)
+ "' must have exactly one Code attribute (found: " + numCodeAtts + ").");
}
}
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 2430a477..6ba4ea2a 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
@@ -333,13 +333,13 @@ public final class Pass3aVerifier extends PassVerifier {
constraintViolated(o, "Indexing a constant that's not a
CONSTANT_Fieldref but a '" + tostring(c) + "'.");
}
- final String field_name = o.getFieldName(constantPoolGen);
+ final String fieldName = o.getFieldName(constantPoolGen);
final JavaClass jc =
Repository.lookupClass(getObjectType(o).getClassName());
Field[] fields = jc.getFields();
Field f = null;
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
final Type fType = Type.getType(field.getSignature());
final Type oType = o.getType(constantPoolGen);
/*
@@ -356,7 +356,7 @@ public final class Pass3aVerifier extends PassVerifier {
outer: for (final JavaClass superclass : superclasses) {
fields = superclass.getFields();
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
final Type fType =
Type.getType(field.getSignature());
final Type oType = o.getType(constantPoolGen);
if (fType.equals(oType)) {
@@ -370,7 +370,7 @@ public final class Pass3aVerifier extends PassVerifier {
}
}
if (f == null) {
- constraintViolated(o, "Referenced field '" +
field_name + "' does not exist in class '" + jc.getClassName() + "'.");
+ constraintViolated(o, "Referenced field '" + fieldName
+ "' does not exist in class '" + jc.getClassName() + "'.");
}
} else {
/*
@@ -428,18 +428,18 @@ public final class Pass3aVerifier extends PassVerifier {
@Override
public void visitGETSTATIC(final GETSTATIC o) {
try {
- final String field_name = o.getFieldName(constantPoolGen);
+ final String fieldName = o.getFieldName(constantPoolGen);
final JavaClass jc =
Repository.lookupClass(getObjectType(o).getClassName());
final Field[] fields = jc.getFields();
Field f = null;
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
f = field;
break;
}
}
if (f == null) {
- throw new AssertionViolatedException("Field '" +
field_name + "' not found in " + jc.getClassName());
+ throw new AssertionViolatedException("Field '" + fieldName
+ "' not found in " + jc.getClassName());
}
if (!f.isStatic()) {
@@ -871,18 +871,18 @@ public final class Pass3aVerifier extends PassVerifier {
@Override
public void visitPUTSTATIC(final PUTSTATIC o) {
try {
- final String field_name = o.getFieldName(constantPoolGen);
+ final String fieldName = o.getFieldName(constantPoolGen);
final JavaClass jc =
Repository.lookupClass(getObjectType(o).getClassName());
final Field[] fields = jc.getFields();
Field f = null;
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
f = field;
break;
}
}
if (f == null) {
- throw new AssertionViolatedException("Field '" +
field_name + "' not found in " + jc.getClassName());
+ throw new AssertionViolatedException("Field '" + fieldName
+ "' not found in " + jc.getClassName());
}
if (f.isFinal() &&
!myOwner.getClassName().equals(getObjectType(o).getClassName())) {
@@ -894,10 +894,10 @@ public final class Pass3aVerifier extends PassVerifier {
constraintViolated(o, "Referenced field '" + f + "' is not
static which it should be.");
}
- final String meth_name =
Repository.lookupClass(myOwner.getClassName()).getMethods()[methodNo].getName();
+ final String methName =
Repository.lookupClass(myOwner.getClassName()).getMethods()[methodNo].getName();
// If it's an interface, it can be set only in <clinit>.
- if (!jc.isClass() &&
!meth_name.equals(Const.STATIC_INITIALIZER_NAME)) {
+ if (!jc.isClass() &&
!methName.equals(Const.STATIC_INITIALIZER_NAME)) {
constraintViolated(o, "Interface field '" + f + "' must be
set in a '" + Const.STATIC_INITIALIZER_NAME + "' method.");
}
} catch (final ClassNotFoundException e) {
diff --git
a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
index f443cc3f..6e9ab743 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
@@ -377,24 +377,24 @@ public class ControlFlowGraph {
/**
* A Control Flow Graph; with additional JustIce checks
*
- * @param method_gen the method generator instance
+ * @param methodGen the method generator instance
*/
- public ControlFlowGraph(final MethodGen method_gen) {
- this(method_gen, true);
+ public ControlFlowGraph(final MethodGen methodGen) {
+ this(methodGen, true);
}
/**
* A Control Flow Graph.
*
- * @param method_gen the method generator instance
+ * @param methodGen the method generator instance
* @param enableJustIceCheck if true, additional JustIce checks are
performed
* @since 6.0
*/
- public ControlFlowGraph(final MethodGen method_gen, final boolean
enableJustIceCheck) {
- subroutines = new Subroutines(method_gen, enableJustIceCheck);
- exceptionhandlers = new ExceptionHandlers(method_gen);
+ public ControlFlowGraph(final MethodGen methodGen, final boolean
enableJustIceCheck) {
+ subroutines = new Subroutines(methodGen, enableJustIceCheck);
+ exceptionhandlers = new ExceptionHandlers(methodGen);
- final InstructionHandle[] instructionhandles =
method_gen.getInstructionList().getInstructionHandles();
+ final InstructionHandle[] instructionhandles =
methodGen.getInstructionList().getInstructionHandles();
for (final InstructionHandle instructionhandle : instructionhandles) {
instructionContexts.put(instructionhandle, new
InstructionContextImpl(instructionhandle));
}
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 7eaebc40..c6d4e7dc 100644
---
a/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
+++
b/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
@@ -125,9 +125,9 @@ public class InstConstraintVisitor extends EmptyVisitor {
* @throws StructuralCodeConstraintException always.
*/
private void constraintViolated(final Instruction violator, final String
description) {
- final String fq_classname = violator.getClass().getName();
+ final String fqClassName = violator.getClass().getName();
throw new StructuralCodeConstraintException(
- "Instruction " +
fq_classname.substring(fq_classname.lastIndexOf('.') + 1) + " constraint
violated: " + description);
+ "Instruction " +
fqClassName.substring(fqClassName.lastIndexOf('.') + 1) + " constraint
violated: " + description);
}
private ObjectType getObjectType(final FieldInstruction o) {
@@ -1031,13 +1031,13 @@ public class InstConstraintVisitor extends EmptyVisitor
{
constraintViolated(o, "Stack top should be an object reference
that's not an array reference, but is '" + objectref + "'.");
}
- final String field_name = o.getFieldName(cpg);
+ final String fieldName = o.getFieldName(cpg);
final JavaClass jc =
Repository.lookupClass(getObjectType(o).getClassName());
Field[] fields = jc.getFields();
Field f = null;
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
final Type fType = Type.getType(field.getSignature());
final Type oType = o.getType(cpg);
/*
@@ -1055,7 +1055,7 @@ public class InstConstraintVisitor extends EmptyVisitor {
outer: for (final JavaClass superclass : superclasses) {
fields = superclass.getFields();
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
final Type fType =
Type.getType(field.getSignature());
final Type oType = o.getType(cpg);
if (fType.equals(oType)) {
@@ -1069,7 +1069,7 @@ public class InstConstraintVisitor extends EmptyVisitor {
}
}
if (f == null) {
- throw new AssertionViolatedException("Field '" +
field_name + "' not found in " + jc.getClassName());
+ throw new AssertionViolatedException("Field '" + fieldName
+ "' not found in " + jc.getClassName());
}
}
@@ -1651,12 +1651,12 @@ public class InstConstraintVisitor extends EmptyVisitor
{
// constraintViolated(o, "The 'objref' item '"+objref+"' does not
implement '"+theInterface+"' as expected.");
// }
- int counted_count = 1; // 1 for the objectref
+ int countedCount = 1; // 1 for the objectref
for (int i = 0; i < nargs; i++) {
- counted_count += argtypes[i].getSize();
+ countedCount += argtypes[i].getSize();
}
- if (count != counted_count) {
- constraintViolated(o, "The 'count' argument should probably read
'" + counted_count + "' but is '" + count + "'.");
+ if (count != countedCount) {
+ constraintViolated(o, "The 'count' argument should probably read
'" + countedCount + "' but is '" + count + "'.");
}
}
@@ -1720,7 +1720,7 @@ public class InstConstraintVisitor extends EmptyVisitor {
if (!(objref instanceof ReferenceType)) {
constraintViolated(o, "Expecting a reference type as
'objectref' on the stack, not a '" + objref + "'.");
}
- String objref_classname = null;
+ String objRefClassName = null;
if (!o.getMethodName(cpg).equals(Const.CONSTRUCTOR_NAME)) {
referenceTypeIsInitialized(o, (ReferenceType) objref);
if (!(objref instanceof ObjectType)) {
@@ -1731,17 +1731,17 @@ public class InstConstraintVisitor extends EmptyVisitor
{
}
}
- objref_classname = ((ObjectType) objref).getClassName();
+ objRefClassName = ((ObjectType) objref).getClassName();
} else {
if (!(objref instanceof UninitializedObjectType)) {
constraintViolated(o, "Expecting an
UninitializedObjectType as 'objectref' on the stack, not a '" + objref
+ "'. Otherwise, you couldn't invoke a method since an
array has no methods (not to speak of a return address).");
}
- objref_classname = ((UninitializedObjectType)
objref).getInitialized().getClassName();
+ objRefClassName = ((UninitializedObjectType)
objref).getInitialized().getClassName();
}
final String theClass = o.getClassName(cpg);
- if (!Repository.instanceOf(objref_classname, theClass)) {
+ if (!Repository.instanceOf(objRefClassName, theClass)) {
constraintViolated(o, "The 'objref' item '" + objref + "' does
not implement '" + theClass + "' as expected.");
}
@@ -1860,11 +1860,11 @@ public class InstConstraintVisitor extends EmptyVisitor
{
}
}
- final String objref_classname = ((ObjectType)
objref).getClassName();
+ final String objRefClassName = ((ObjectType)
objref).getClassName();
final String theClass = o.getClassName(cpg);
- if (!Repository.instanceOf(objref_classname, theClass)) {
+ if (!Repository.instanceOf(objRefClassName, theClass)) {
constraintViolated(o, "The 'objref' item '" + objref + "' does
not implement '" + theClass + "' as expected.");
}
} catch (final ClassNotFoundException e) {
@@ -2505,13 +2505,13 @@ public class InstConstraintVisitor extends EmptyVisitor
{
constraintViolated(o, "Stack next-to-top should be an object
reference that's not an array reference, but is '" + objectref + "'.");
}
- final String field_name = o.getFieldName(cpg);
+ final String fieldName = o.getFieldName(cpg);
final JavaClass jc =
Repository.lookupClass(getObjectType(o).getClassName());
final Field[] fields = jc.getFields();
Field f = null;
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
final Type fType = Type.getType(field.getSignature());
final Type oType = o.getType(cpg);
/*
@@ -2524,7 +2524,7 @@ public class InstConstraintVisitor extends EmptyVisitor {
}
}
if (f == null) {
- throw new AssertionViolatedException("Field '" + field_name +
"' not found in " + jc.getClassName());
+ throw new AssertionViolatedException("Field '" + fieldName +
"' not found in " + jc.getClassName());
}
final Type value = stack().peek();
@@ -2590,12 +2590,12 @@ public class InstConstraintVisitor extends EmptyVisitor
{
@Override
public void visitPUTSTATIC(final PUTSTATIC o) {
try {
- final String field_name = o.getFieldName(cpg);
+ final String fieldName = o.getFieldName(cpg);
final JavaClass jc =
Repository.lookupClass(getObjectType(o).getClassName());
final Field[] fields = jc.getFields();
Field f = null;
for (final Field field : fields) {
- if (field.getName().equals(field_name)) {
+ if (field.getName().equals(fieldName)) {
final Type fType = Type.getType(field.getSignature());
final Type oType = o.getType(cpg);
/*
@@ -2608,7 +2608,7 @@ public class InstConstraintVisitor extends EmptyVisitor {
}
}
if (f == null) {
- throw new AssertionViolatedException("Field '" + field_name +
"' not found in " + jc.getClassName());
+ throw new AssertionViolatedException("Field '" + fieldName +
"' not found in " + jc.getClassName());
}
final Type value = stack().peek();
final Type t = Type.getType(f.getSignature());
diff --git
a/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
b/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
index 7e7b985d..4461c663 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
@@ -147,9 +147,9 @@ public final class Pass3bVerifier extends PassVerifier {
*
* @see org.apache.bcel.verifier.Verifier
*/
- public Pass3bVerifier(final Verifier owner, final int method_no) {
- myOwner = owner;
- this.methodNo = method_no;
+ public Pass3bVerifier(final Verifier myOwner, final int methodNo) {
+ this.myOwner = myOwner;
+ this.methodNo = methodNo;
}
/**
@@ -243,9 +243,9 @@ public final class Pass3bVerifier extends PassVerifier {
// Exception Handlers. Add them to the queue of successors.
// [subroutines are never protected; mandated by JustIce]
- final ExceptionHandler[] exc_hds = u.getExceptionHandlers();
- for (final ExceptionHandler exc_hd : exc_hds) {
- final InstructionContext v =
cfg.contextOf(exc_hd.getHandlerStart());
+ final ExceptionHandler[] excHds = u.getExceptionHandlers();
+ for (final ExceptionHandler excHd : excHds) {
+ final InstructionContext v =
cfg.contextOf(excHd.getHandlerStart());
// TODO: the "oldchain" and "newchain" is used to determine
the subroutine
// we're in (by searching for the last JSR) by the
InstructionContext
// implementation. Therefore, we should not use this chain
mechanism
@@ -259,7 +259,7 @@ public final class Pass3bVerifier extends PassVerifier {
// (exc_hds[s].getExceptionType()==null? Type.THROWABLE :
exc_hds[s].getExceptionType())) ), newchain), icv, ev) {
// icq.add(v, (ArrayList) newchain.clone());
if (v.execute(new Frame(u.getOutFrame(oldchain).getLocals(),
new OperandStack(u.getOutFrame(oldchain).getStack().maxStack(),
- exc_hd.getExceptionType() == null ? Type.THROWABLE :
exc_hd.getExceptionType())), new ArrayList<>(), icv, ev)) {
+ excHd.getExceptionType() == null ? Type.THROWABLE :
excHd.getExceptionType())), new ArrayList<>(), icv, ev)) {
icq.add(v, new ArrayList<>());
}
}
diff --git
a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
index 2635b16c..30113f0e 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
@@ -422,16 +422,16 @@ public class Subroutines {
TOPLEVEL = new SubroutineImpl();
// Calculate "real" subroutines.
- final Set<InstructionHandle> sub_leaders = new HashSet<>(); //
Elements: InstructionHandle
+ final Set<InstructionHandle> subLeaders = new HashSet<>(); //
Elements: InstructionHandle
for (final InstructionHandle element : all) {
final Instruction inst = element.getInstruction();
if (inst instanceof JsrInstruction) {
- sub_leaders.add(((JsrInstruction) inst).getTarget());
+ subLeaders.add(((JsrInstruction) inst).getTarget());
}
}
// Build up the database.
- for (final InstructionHandle astore : sub_leaders) {
+ for (final InstructionHandle astore : subLeaders) {
final SubroutineImpl sr = new SubroutineImpl();
sr.setLocalVariable(((ASTORE) astore.getInstruction()).getIndex());
subroutines.put(astore, sr);
@@ -439,7 +439,7 @@ public class Subroutines {
// Fake it a bit. We want a virtual "TopLevel" subroutine.
subroutines.put(all[0], TOPLEVEL);
- sub_leaders.add(all[0]);
+ subLeaders.add(all[0]);
// Tell the subroutines about their JsrInstructions.
// Note that there cannot be a JSR targeting the top-level
@@ -457,13 +457,13 @@ public class Subroutines {
// Now do a BFS from every subroutine leader to find all the
// instructions that belong to a subroutine.
// we don't want to assign an instruction to two or more Subroutine
objects.
- final Set<InstructionHandle> instructions_assigned = new HashSet<>();
+ final Set<InstructionHandle> instructionsAssigned = new HashSet<>();
// Graph coloring. Key: InstructionHandle, Value: ColourConstants enum
.
final Map<InstructionHandle, ColourConstants> colors = new HashMap<>();
final List<InstructionHandle> qList = new ArrayList<>();
- for (final InstructionHandle actual : sub_leaders) {
+ for (final InstructionHandle actual : subLeaders) {
// Do some BFS with "actual" as the root of the graph.
// Init colors
for (final InstructionHandle element : all) {
@@ -503,11 +503,11 @@ public class Subroutines {
for (final InstructionHandle element : all) {
if (colors.get(element) == ColourConstants.BLACK) {
((SubroutineImpl) (actual == all[0] ? getTopLevel() :
getSubroutine(actual))).addInstruction(element);
- if (instructions_assigned.contains(element)) {
+ if (instructionsAssigned.contains(element)) {
throw new StructuralCodeConstraintException(
"Instruction '" + element + "' is part of more
than one subroutine (or of the top level and a subroutine).");
}
- instructions_assigned.add(element);
+ instructionsAssigned.add(element);
}
}
if (actual != all[0]) {// If we don't deal with the top-level
'subroutine'
diff --git a/src/test/java/org/apache/bcel/PLSETestCase.java
b/src/test/java/org/apache/bcel/PLSETestCase.java
index 5072b817..71436aa7 100644
--- a/src/test/java/org/apache/bcel/PLSETestCase.java
+++ b/src/test/java/org/apache/bcel/PLSETestCase.java
@@ -90,10 +90,10 @@ public class PLSETestCase extends AbstractTestCase {
final LocalVariable lv = lvt.getLocalVariable(2, 4); // 'i'
// System.out.println(lv);
final MethodGen mg = new MethodGen(m, cg.getClassName(), pool);
- final LocalVariableTable new_lvt =
mg.getLocalVariableTable(mg.getConstantPool());
- final LocalVariable new_lv = new_lvt.getLocalVariable(2, 4); // 'i'
+ final LocalVariableTable newLvt =
mg.getLocalVariableTable(mg.getConstantPool());
+ final LocalVariable newLv = newLvt.getLocalVariable(2, 4); // 'i'
// System.out.println(new_lv);
- assertEquals(lv.getLength(), new_lv.getLength(), "live range length");
+ assertEquals(lv.getLength(), newLv.getLength(), "live range length");
}
/**
diff --git
a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
index 71d73d62..6b137215 100644
---
a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
+++
b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
@@ -103,8 +103,8 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase {
final MethodGen mg = createMethodGen("main", il, cp);
final InstructionFactory factory = new InstructionFactory(cg);
// We now define some often used types:
- final ObjectType i_stream = new ObjectType("java.io.InputStream");
- final ObjectType p_stream = new ObjectType("java.io.PrintStream");
+ final ObjectType iStream = new ObjectType("java.io.InputStream");
+ final ObjectType pStream = new ObjectType("java.io.PrintStream");
// Create variables in and name : We call the constructors, i.e.,
// execute BufferedReader(InputStreamReader(System.in)) . The reference
// to the BufferedReader object stays on top of the stack and is stored
@@ -113,8 +113,8 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase {
il.append(InstructionConst.DUP); // Use predefined constant
il.append(factory.createNew("java.io.InputStreamReader"));
il.append(InstructionConst.DUP);
- il.append(factory.createFieldAccess("java.lang.System", "in",
i_stream, Const.GETSTATIC));
- il.append(factory.createInvoke("java.io.InputStreamReader", "<init>",
Type.VOID, new Type[] {i_stream}, Const.INVOKESPECIAL));
+ il.append(factory.createFieldAccess("java.lang.System", "in", iStream,
Const.GETSTATIC));
+ il.append(factory.createInvoke("java.io.InputStreamReader", "<init>",
Type.VOID, new Type[] {iStream}, Const.INVOKESPECIAL));
il.append(factory.createInvoke("java.io.BufferedReader", "<init>",
Type.VOID, new Type[] {new ObjectType("java.io.Reader")}, Const.INVOKESPECIAL));
LocalVariableGen lg = mg.addLocalVariable("in", new
ObjectType("java.io.BufferedReader"), null, null);
final int in = lg.getIndex();
@@ -135,22 +135,22 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase {
// il.append(new ALOAD(in));
// il.append(factory.createInvoke("java.io.BufferedReader", "readLine",
// Type.STRING, Type.NO_ARGS, Constants.INVOKEVIRTUAL));
- final InstructionHandle try_start = il.append(new PUSH(cp, "Andy"));
+ final InstructionHandle tryStart = il.append(new PUSH(cp, "Andy"));
il.append(new ASTORE(name));
// Upon normal execution we jump behind exception handler, the target
// address is not known yet.
final GOTO g = new GOTO(null);
- final InstructionHandle try_end = il.append(g);
+ final InstructionHandle tryEnd = il.append(g);
// We add the exception handler which simply returns from the method.
- final LocalVariableGen var_ex = mg.addLocalVariable("ex",
Type.getType("Ljava.io.IOException;"), null, null);
- final int var_ex_slot = var_ex.getIndex();
+ final LocalVariableGen varEx = mg.addLocalVariable("ex",
Type.getType("Ljava.io.IOException;"), null, null);
+ final int var_ex_slot = varEx.getIndex();
final InstructionHandle handler = il.append(new ASTORE(var_ex_slot));
- var_ex.setStart(handler);
- var_ex.setEnd(il.append(InstructionConst.RETURN));
- mg.addExceptionHandler(try_start, try_end, handler, new
ObjectType("java.io.IOException"));
+ varEx.setStart(handler);
+ varEx.setEnd(il.append(InstructionConst.RETURN));
+ mg.addExceptionHandler(tryStart, tryEnd, handler, new
ObjectType("java.io.IOException"));
// "Normal" code continues, now we can set the branch target of the
GOTO
// .
- final InstructionHandle ih =
il.append(factory.createFieldAccess("java.lang.System", "out", p_stream,
Const.GETSTATIC));
+ final InstructionHandle ih =
il.append(factory.createFieldAccess("java.lang.System", "out", pStream,
Const.GETSTATIC));
g.setTarget(ih);
// Printing "Hello": String concatenation compiles to StringBuffer
// operations.
@@ -179,8 +179,8 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase {
final InstructionFactory factory = new InstructionFactory(cg);
mg.addAnnotationEntry(createSimpleVisibleAnnotation(mg.getConstantPool()));
// We now define some often used types:
- final ObjectType i_stream = new ObjectType("java.io.InputStream");
- final ObjectType p_stream = new ObjectType("java.io.PrintStream");
+ final ObjectType iStream = new ObjectType("java.io.InputStream");
+ final ObjectType pStream = new ObjectType("java.io.PrintStream");
// Create variables in and name : We call the constructors, i.e.,
// execute BufferedReader(InputStreamReader(System.in)) . The reference
// to the BufferedReader object stays on top of the stack and is stored
@@ -189,8 +189,8 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase {
il.append(InstructionConst.DUP); // Use predefined constant
il.append(factory.createNew("java.io.InputStreamReader"));
il.append(InstructionConst.DUP);
- il.append(factory.createFieldAccess("java.lang.System", "in",
i_stream, Const.GETSTATIC));
- il.append(factory.createInvoke("java.io.InputStreamReader", "<init>",
Type.VOID, new Type[] {i_stream}, Const.INVOKESPECIAL));
+ il.append(factory.createFieldAccess("java.lang.System", "in", iStream,
Const.GETSTATIC));
+ il.append(factory.createInvoke("java.io.InputStreamReader", "<init>",
Type.VOID, new Type[] {iStream}, Const.INVOKESPECIAL));
il.append(factory.createInvoke("java.io.BufferedReader", "<init>",
Type.VOID, new Type[] {new ObjectType("java.io.Reader")}, Const.INVOKESPECIAL));
LocalVariableGen lg = mg.addLocalVariable("in", new
ObjectType("java.io.BufferedReader"), null, null);
final int in = lg.getIndex();
@@ -211,22 +211,22 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase {
// il.append(new ALOAD(in));
// il.append(factory.createInvoke("java.io.BufferedReader", "readLine",
// Type.STRING, Type.NO_ARGS, Constants.INVOKEVIRTUAL));
- final InstructionHandle try_start = il.append(new PUSH(cp, "Andy"));
+ final InstructionHandle tryStart = il.append(new PUSH(cp, "Andy"));
il.append(new ASTORE(name));
// Upon normal execution we jump behind exception handler, the target
// address is not known yet.
final GOTO g = new GOTO(null);
- final InstructionHandle try_end = il.append(g);
+ final InstructionHandle tryEnd = il.append(g);
// We add the exception handler which simply returns from the method.
- final LocalVariableGen var_ex = mg.addLocalVariable("ex",
Type.getType("Ljava.io.IOException;"), null, null);
- final int var_ex_slot = var_ex.getIndex();
- final InstructionHandle handler = il.append(new ASTORE(var_ex_slot));
- var_ex.setStart(handler);
- var_ex.setEnd(il.append(InstructionConst.RETURN));
- mg.addExceptionHandler(try_start, try_end, handler, new
ObjectType("java.io.IOException"));
+ final LocalVariableGen varEx = mg.addLocalVariable("ex",
Type.getType("Ljava.io.IOException;"), null, null);
+ final int varExSlot = varEx.getIndex();
+ final InstructionHandle handler = il.append(new ASTORE(varExSlot));
+ varEx.setStart(handler);
+ varEx.setEnd(il.append(InstructionConst.RETURN));
+ mg.addExceptionHandler(tryStart, tryEnd, handler, new
ObjectType("java.io.IOException"));
// "Normal" code continues, now we can set the branch target of the
GOTO
// .
- final InstructionHandle ih =
il.append(factory.createFieldAccess("java.lang.System", "out", p_stream,
Const.GETSTATIC));
+ final InstructionHandle ih =
il.append(factory.createFieldAccess("java.lang.System", "out", pStream,
Const.GETSTATIC));
g.setTarget(ih);
// Printing "Hello": String concatenation compiles to StringBuffer
// operations.
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index d286a97a..d34a0000 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
@@ -66,11 +66,11 @@ public class BCELifierTestCase {
final File workDir = new File("target");
final File infile = new File(javaClassFileName);
- final JavaClass java_class =
BCELifier.getJavaClass(infile.getName().replace(".class", ""));
- assertNotNull(java_class);
+ final JavaClass javaClass =
BCELifier.getJavaClass(infile.getName().replace(".class", ""));
+ assertNotNull(javaClass);
final File outfile = new File(workDir,
infile.getName().replace(".class", "Creator.java"));
try (FileOutputStream fos = new FileOutputStream(outfile)) {
- final BCELifier bcelifier = new BCELifier(java_class, fos);
+ final BCELifier bcelifier = new BCELifier(javaClass, fos);
bcelifier.start();
}
exec(workDir, "javac", "-cp", "classes", outfile.getName(), "-source",
"1.8", "-target", "1.8");
@@ -91,9 +91,9 @@ public class BCELifierTestCase {
@Test
public void testStart() throws Exception {
final OutputStream os = new ByteArrayOutputStream();
- final JavaClass java_class = BCELifier.getJavaClass("Java8Example");
- assertNotNull(java_class);
- final BCELifier bcelifier = new BCELifier(java_class, os);
+ final JavaClass javaClass = BCELifier.getJavaClass("Java8Example");
+ assertNotNull(javaClass);
+ final BCELifier bcelifier = new BCELifier(javaClass, os);
bcelifier.start();
}
