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 3245ca4  Normalize private names and parameter names to camel-case.
3245ca4 is described below

commit 3245ca4a23ffbeb120ef8fac89688415b4710d23
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Jun 4 09:53:15 2020 -0400

    Normalize private names and parameter names to camel-case.
---
 .travis.yml                                        |  4 +--
 .../apache/bcel/classfile/BootstrapMethods.java    |  8 ++---
 .../apache/bcel/classfile/ConstantNameAndType.java | 14 ++++-----
 .../java/org/apache/bcel/classfile/InnerClass.java | 36 +++++++++++-----------
 .../org/apache/bcel/classfile/ModuleMainClass.java | 22 ++++++-------
 .../java/org/apache/bcel/classfile/Signature.java  |  4 +--
 .../java/org/apache/bcel/classfile/SourceFile.java | 24 +++++++--------
 .../org/apache/bcel/classfile/StackMapEntry.java   |  4 +--
 .../org/apache/bcel/classfile/StackMapType.java    |  4 +--
 .../java/org/apache/bcel/generic/ClassGen.java     | 26 ++++++++--------
 .../org/apache/bcel/generic/CodeExceptionGen.java  | 16 +++++-----
 .../org/apache/bcel/generic/LocalVariableGen.java  |  4 +--
 .../bcel/generic/LocalVariableInstruction.java     |  4 +--
 13 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3eb2cd2..2e63a22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ jdk:
   - openjdk-ea
 
 script:
-  - mvn -Ddoclint:none
+  - mvn -Ddoclint=none
 
 after_success:
-  - mvn -Ddoclint:none clean cobertura:cobertura coveralls:report
+  - mvn -Ddoclint=none clean cobertura:cobertura coveralls:report
diff --git a/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java 
b/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
index d342104..3abe716 100644
--- a/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
+++ b/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
@@ -49,9 +49,9 @@ public class BootstrapMethods extends Attribute {
      * @param bootstrapMethods array of bootstrap methods
      * @param constant_pool Array of constants
      */
-    public BootstrapMethods(final int name_index, final int length, final 
BootstrapMethod[] bootstrap_methods, final ConstantPool constant_pool) {
+    public BootstrapMethods(final int name_index, final int length, final 
BootstrapMethod[] bootstrapMethods, final ConstantPool constant_pool) {
         super(Const.ATTR_BOOTSTRAP_METHODS, name_index, length, constant_pool);
-        this.bootstrapMethods = bootstrap_methods;
+        this.bootstrapMethods = bootstrapMethods;
     }
 
     /**
@@ -83,8 +83,8 @@ public class BootstrapMethods extends Attribute {
     /**
      * @param bootstrapMethods the array of bootstrap methods
      */
-    public final void setBootstrapMethods(final BootstrapMethod[] 
bootstrap_methods) {
-        this.bootstrapMethods = bootstrap_methods;
+    public final void setBootstrapMethods(final BootstrapMethod[] 
bootstrapMethods) {
+        this.bootstrapMethods = bootstrapMethods;
     }
 
     /**
diff --git a/src/main/java/org/apache/bcel/classfile/ConstantNameAndType.java 
b/src/main/java/org/apache/bcel/classfile/ConstantNameAndType.java
index 55d6b41..01982ea 100644
--- a/src/main/java/org/apache/bcel/classfile/ConstantNameAndType.java
+++ b/src/main/java/org/apache/bcel/classfile/ConstantNameAndType.java
@@ -59,10 +59,10 @@ public final class ConstantNameAndType extends Constant {
      * @param nameIndex Name of field/method
      * @param signatureIndex and its signature
      */
-    public ConstantNameAndType(final int name_index, final int 
signature_index) {
+    public ConstantNameAndType(final int nameIndex, final int signatureIndex) {
         super(Const.CONSTANT_NameAndType);
-        this.nameIndex = name_index;
-        this.signatureIndex = signature_index;
+        this.nameIndex = nameIndex;
+        this.signatureIndex = signatureIndex;
     }
 
 
@@ -126,16 +126,16 @@ public final class ConstantNameAndType extends Constant {
     /**
      * @param nameIndex the name index of this constant
      */
-    public void setNameIndex( final int name_index ) {
-        this.nameIndex = name_index;
+    public void setNameIndex( final int nameIndex ) {
+        this.nameIndex = nameIndex;
     }
 
 
     /**
      * @param signatureIndex the signature index in the constant pool of this 
type
      */
-    public void setSignatureIndex( final int signature_index ) {
-        this.signatureIndex = signature_index;
+    public void setSignatureIndex( final int signatureIndex ) {
+        this.signatureIndex = signatureIndex;
     }
 
 
diff --git a/src/main/java/org/apache/bcel/classfile/InnerClass.java 
b/src/main/java/org/apache/bcel/classfile/InnerClass.java
index 394fe4f..ff2033a 100644
--- a/src/main/java/org/apache/bcel/classfile/InnerClass.java
+++ b/src/main/java/org/apache/bcel/classfile/InnerClass.java
@@ -64,12 +64,12 @@ public final class InnerClass implements Cloneable, Node {
      * @param innerNameIndex  Name index in constant pool of inner class
      * @param innerAccessFlags Access flags of inner class
      */
-    public InnerClass(final int inner_class_index, final int 
outer_class_index, final int inner_name_index,
-            final int inner_access_flags) {
-        this.innerClassIndex = inner_class_index;
-        this.outerClassIndex = outer_class_index;
-        this.innerNameIndex = inner_name_index;
-        this.innerAccessFlags = inner_access_flags;
+    public InnerClass(final int innerClassIndex, final int outerClassIndex, 
final int innerNameIndex,
+            final int innerAccessFlags) {
+        this.innerClassIndex = innerClassIndex;
+        this.outerClassIndex = outerClassIndex;
+        this.innerNameIndex = innerNameIndex;
+        this.innerAccessFlags = innerAccessFlags;
     }
 
 
@@ -135,32 +135,32 @@ public final class InnerClass implements Cloneable, Node {
     /**
      * @param innerAccessFlags access flags for this inner class
      */
-    public void setInnerAccessFlags( final int inner_access_flags ) {
-        this.innerAccessFlags = inner_access_flags;
+    public void setInnerAccessFlags( final int innerAccessFlags ) {
+        this.innerAccessFlags = innerAccessFlags;
     }
 
 
     /**
      * @param innerClassIndex index into the constant pool for this class
      */
-    public void setInnerClassIndex( final int inner_class_index ) {
-        this.innerClassIndex = inner_class_index;
+    public void setInnerClassIndex( final int innerClassIndex ) {
+        this.innerClassIndex = innerClassIndex;
     }
 
 
     /**
      * @param innerNameIndex index into the constant pool for this class's name
      */
-    public void setInnerNameIndex( final int inner_name_index ) { // TODO 
unused
-        this.innerNameIndex = inner_name_index;
+    public void setInnerNameIndex( final int innerNameIndex ) { // TODO unused
+        this.innerNameIndex = innerNameIndex;
     }
 
 
     /**
      * @param outerClassIndex index into the constant pool for the owning class
      */
-    public void setOuterClassIndex( final int outer_class_index ) { // TODO 
unused
-        this.outerClassIndex = outer_class_index;
+    public void setOuterClassIndex( final int outerClassIndex ) { // TODO 
unused
+        this.outerClassIndex = outerClassIndex;
     }
 
 
@@ -177,21 +177,21 @@ public final class InnerClass implements Cloneable, Node {
     /**
      * @return Resolved string representation
      */
-    public String toString( final ConstantPool constant_pool ) {
+    public String toString( final ConstantPool constantPool ) {
         String outer_class_name;
         String inner_name;
-        String inner_class_name = 
constant_pool.getConstantString(innerClassIndex,
+        String inner_class_name = 
constantPool.getConstantString(innerClassIndex,
                 Const.CONSTANT_Class);
         inner_class_name = Utility.compactClassName(inner_class_name, false);
         if (outerClassIndex != 0) {
-            outer_class_name = constant_pool.getConstantString(outerClassIndex,
+            outer_class_name = constantPool.getConstantString(outerClassIndex,
                     Const.CONSTANT_Class);
             outer_class_name = " of class " + 
Utility.compactClassName(outer_class_name, false);
         } else {
             outer_class_name = "";
         }
         if (innerNameIndex != 0) {
-            inner_name = ((ConstantUtf8) 
constant_pool.getConstant(innerNameIndex,
+            inner_name = ((ConstantUtf8) 
constantPool.getConstant(innerNameIndex,
                     Const.CONSTANT_Utf8)).getBytes();
         } else {
             inner_name = "(anonymous)";
diff --git a/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java 
b/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java
index b798038..6b69888 100644
--- a/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java
+++ b/src/main/java/org/apache/bcel/classfile/ModuleMainClass.java
@@ -47,25 +47,25 @@ public final class ModuleMainClass extends Attribute {
      * @param name_index Index in constant pool
      * @param length Content length in bytes
      * @param mainClassIndex Host class index
-     * @param constant_pool Array of constants
+     * @param constantPool Array of constants
      */
-    public ModuleMainClass(final int name_index, final int length, final int 
main_class_index,
-            final ConstantPool constant_pool) {
-        super(Const.ATTR_NEST_MEMBERS, name_index, length, constant_pool);
-        this.mainClassIndex = main_class_index;
+    public ModuleMainClass(final int name_index, final int length, final int 
mainClassIndex,
+            final ConstantPool constantPool) {
+        super(Const.ATTR_NEST_MEMBERS, name_index, length, constantPool);
+        this.mainClassIndex = mainClassIndex;
     }
 
 
     /**
      * Construct object from input stream.
-     * @param name_index Index in constant pool
+     * @param nameIndex Index in constant pool
      * @param length Content length in bytes
      * @param input Input stream
-     * @param constant_pool Array of constants
+     * @param constantPool Array of constants
      * @throws IOException
      */
-    ModuleMainClass(final int name_index, final int length, final DataInput 
input, final ConstantPool constant_pool) throws IOException {
-        this(name_index, length, 0, constant_pool);
+    ModuleMainClass(final int nameIndex, final int length, final DataInput 
input, final ConstantPool constantPool) throws IOException {
+        this(nameIndex, length, 0, constantPool);
         mainClassIndex = input.readUnsignedShort();
     }
 
@@ -107,8 +107,8 @@ public final class ModuleMainClass extends Attribute {
     /**
      * @param mainClassIndex the host class index
      */
-    public void setHostClassIndex( final int main_class_index ) {
-        this.mainClassIndex = main_class_index;
+    public void setHostClassIndex( final int mainClassIndex ) {
+        this.mainClassIndex = mainClassIndex;
     }
 
 
diff --git a/src/main/java/org/apache/bcel/classfile/Signature.java 
b/src/main/java/org/apache/bcel/classfile/Signature.java
index 6e15362..88cfdc5 100644
--- a/src/main/java/org/apache/bcel/classfile/Signature.java
+++ b/src/main/java/org/apache/bcel/classfile/Signature.java
@@ -64,9 +64,9 @@ public final class Signature extends Attribute {
      * @param signatureIndex Index in constant pool to CONSTANT_Utf8
      * @param constant_pool Array of constants
      */
-    public Signature(final int name_index, final int length, final int 
signature_index, final ConstantPool constant_pool) {
+    public Signature(final int name_index, final int length, final int 
signatureIndex, final ConstantPool constant_pool) {
         super(Const.ATTR_SIGNATURE, name_index, length, constant_pool);
-        this.signatureIndex = signature_index;
+        this.signatureIndex = signatureIndex;
     }
 
 
diff --git a/src/main/java/org/apache/bcel/classfile/SourceFile.java 
b/src/main/java/org/apache/bcel/classfile/SourceFile.java
index cf85db0..e088947 100644
--- a/src/main/java/org/apache/bcel/classfile/SourceFile.java
+++ b/src/main/java/org/apache/bcel/classfile/SourceFile.java
@@ -33,7 +33,7 @@ import org.apache.bcel.Const;
  */
 public final class SourceFile extends Attribute {
 
-    private int sourcefileIndex;
+    private int sourceFileIndex;
 
 
     /**
@@ -63,18 +63,18 @@ public final class SourceFile extends Attribute {
      * @param name_index Index in constant pool to CONSTANT_Utf8, which
      * should represent the string "SourceFile".
      * @param length Content length in bytes, the value should be 2.
-     * @param constant_pool The constant pool that this attribute is
+     * @param constantPool The constant pool that this attribute is
      * associated with.
-     * @param sourcefileIndex Index in constant pool to CONSTANT_Utf8.  This
+     * @param sourceFileIndex Index in constant pool to CONSTANT_Utf8.  This
      * string will be interpreted as the name of the file from which this
      * class was compiled.  It will not be interpreted as indicating the name
      * of the directory contqining the file or an absolute path; this
      * information has to be supplied the consumer of this attribute - in
      * many cases, the JVM.
      */
-    public SourceFile(final int name_index, final int length, final int 
sourcefile_index, final ConstantPool constant_pool) {
-        super(Const.ATTR_SOURCE_FILE, name_index, length, constant_pool);
-        this.sourcefileIndex = sourcefile_index;
+    public SourceFile(final int name_index, final int length, final int 
sourceFileIndex, final ConstantPool constantPool) {
+        super(Const.ATTR_SOURCE_FILE, name_index, length, constantPool);
+        this.sourceFileIndex = sourceFileIndex;
     }
 
 
@@ -100,7 +100,7 @@ public final class SourceFile extends Attribute {
     @Override
     public void dump( final DataOutputStream file ) throws IOException {
         super.dump(file);
-        file.writeShort(sourcefileIndex);
+        file.writeShort(sourceFileIndex);
     }
 
 
@@ -108,15 +108,15 @@ public final class SourceFile extends Attribute {
      * @return Index in constant pool of source file name.
      */
     public int getSourceFileIndex() {
-        return sourcefileIndex;
+        return sourceFileIndex;
     }
 
 
     /**
-     * @param sourcefileIndex
+     * @param sourceFileIndex
      */
-    public void setSourceFileIndex( final int sourcefile_index ) {
-        this.sourcefileIndex = sourcefile_index;
+    public void setSourceFileIndex( final int sourceFileIndex ) {
+        this.sourceFileIndex = sourceFileIndex;
     }
 
 
@@ -124,7 +124,7 @@ public final class SourceFile extends Attribute {
      * @return Source file name.
      */
     public String getSourceFileName() {
-        final ConstantUtf8 c = (ConstantUtf8) 
super.getConstantPool().getConstant(sourcefileIndex,
+        final ConstantUtf8 c = (ConstantUtf8) 
super.getConstantPool().getConstant(sourceFileIndex,
                 Const.CONSTANT_Utf8);
         return c.getBytes();
     }
diff --git a/src/main/java/org/apache/bcel/classfile/StackMapEntry.java 
b/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
index e53a81f..ef23b71 100644
--- a/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
+++ b/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
@@ -429,7 +429,7 @@ public final class StackMapEntry implements Node, Cloneable
     /**
      * @param constantPool Constant pool to be used for this object.
      */
-    public void setConstantPool( final ConstantPool constant_pool ) {
-        this.constantPool = constant_pool;
+    public void setConstantPool( final ConstantPool constantPool ) {
+        this.constantPool = constantPool;
     }
 }
diff --git a/src/main/java/org/apache/bcel/classfile/StackMapType.java 
b/src/main/java/org/apache/bcel/classfile/StackMapType.java
index 2505370..4010642 100644
--- a/src/main/java/org/apache/bcel/classfile/StackMapType.java
+++ b/src/main/java/org/apache/bcel/classfile/StackMapType.java
@@ -160,7 +160,7 @@ public final class StackMapType implements Cloneable {
     /**
      * @param constantPool Constant pool to be used for this object.
      */
-    public void setConstantPool( final ConstantPool constant_pool ) {
-        this.constantPool = constant_pool;
+    public void setConstantPool( final ConstantPool constantPool ) {
+        this.constantPool = constantPool;
     }
 }
diff --git a/src/main/java/org/apache/bcel/generic/ClassGen.java 
b/src/main/java/org/apache/bcel/generic/ClassGen.java
index e4e049a..8884463 100644
--- a/src/main/java/org/apache/bcel/generic/ClassGen.java
+++ b/src/main/java/org/apache/bcel/generic/ClassGen.java
@@ -83,24 +83,24 @@ public class ClassGen extends AccessFlags implements 
Cloneable {
      * @param className fully qualified class name
      * @param superClassName fully qualified superclass name
      * @param fileName source file name
-     * @param access_flags access qualifiers
+     * @param accessFlags access qualifiers
      * @param interfaces implemented interfaces
      * @param cp constant pool to use
      */
-    public ClassGen(final String class_name, final String super_class_name, 
final String file_name, final int access_flags,
+    public ClassGen(final String className, final String superClassName, final 
String fileName, final int accessFlags,
             final String[] interfaces, final ConstantPoolGen cp) {
-        super(access_flags);
-        this.className = class_name;
-        this.superClassName = super_class_name;
-        this.fileName = file_name;
+        super(accessFlags);
+        this.className = className;
+        this.superClassName = superClassName;
+        this.fileName = fileName;
         this.cp = cp;
         // Put everything needed by default into the constant pool and the 
vectors
-        if (file_name != null) {
-            addAttribute(new SourceFile(cp.addUtf8("SourceFile"), 2, 
cp.addUtf8(file_name), cp
+        if (fileName != null) {
+            addAttribute(new SourceFile(cp.addUtf8("SourceFile"), 2, 
cp.addUtf8(fileName), cp
                     .getConstantPool()));
         }
-        classNameIndex = cp.addClass(class_name);
-        superclass_name_index = cp.addClass(super_class_name);
+        classNameIndex = cp.addClass(className);
+        superclass_name_index = cp.addClass(superClassName);
         if (interfaces != null) {
             for (final String interface1 : interfaces) {
                 addInterface(interface1);
@@ -114,12 +114,12 @@ public class ClassGen extends AccessFlags implements 
Cloneable {
      * @param className fully qualified class name
      * @param superClassName fully qualified superclass name
      * @param fileName source file name
-     * @param access_flags access qualifiers
+     * @param accessFlags access qualifiers
      * @param interfaces implemented interfaces
      */
-    public ClassGen(final String class_name, final String super_class_name, 
final String file_name, final int access_flags,
+    public ClassGen(final String className, final String superClassName, final 
String fileName, final int accessFlags,
             final String[] interfaces) {
-        this(class_name, super_class_name, file_name, access_flags, interfaces,
+        this(className, superClassName, fileName, accessFlags, interfaces,
                 new ConstantPoolGen());
     }
 
diff --git a/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java 
b/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
index 025c1b4..b2a1e24 100644
--- a/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
+++ b/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
@@ -49,12 +49,12 @@ public final class CodeExceptionGen implements 
InstructionTargeter, Cloneable {
      * @param handlerPc Where handling is done
      * @param catchType which exception is handled, null for ANY
      */
-    public CodeExceptionGen(final InstructionHandle start_pc, final 
InstructionHandle end_pc,
-            final InstructionHandle handler_pc, final ObjectType catch_type) {
-        setStartPC(start_pc);
-        setEndPC(end_pc);
-        setHandlerPC(handler_pc);
-        this.catchType = catch_type;
+    public CodeExceptionGen(final InstructionHandle startPc, final 
InstructionHandle endPc,
+            final InstructionHandle handlerPc, final ObjectType catchType) {
+        setStartPC(startPc);
+        setEndPC(endPc);
+        setHandlerPC(handlerPc);
+        this.catchType = catchType;
     }
 
 
@@ -137,8 +137,8 @@ public final class CodeExceptionGen implements 
InstructionTargeter, Cloneable {
 
 
     /** Sets the type of the Exception to catch. Set 'null' for ANY. */
-    public void setCatchType( final ObjectType catch_type ) {
-        this.catchType = catch_type;
+    public void setCatchType( final ObjectType catchType ) {
+        this.catchType = catchType;
     }
 
 
diff --git a/src/main/java/org/apache/bcel/generic/LocalVariableGen.java 
b/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
index c7d6de5..2a89c19 100644
--- a/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
+++ b/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
@@ -77,9 +77,9 @@ public class LocalVariableGen implements InstructionTargeter, 
NamedAndTyped, Clo
      * @param origIndex index of local variable prior to any changes to index
      */
     public LocalVariableGen(final int index, final String name, final Type 
type, final InstructionHandle start,
-            final InstructionHandle end, final int orig_index) {
+            final InstructionHandle end, final int origIndex) {
         this(index, name, type, start, end);
-        this.origIndex = orig_index;
+        this.origIndex = origIndex;
     }
 
 
diff --git 
a/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java 
b/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java
index 8a9c933..2dbab3b 100644
--- a/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java
+++ b/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java
@@ -70,9 +70,9 @@ public abstract class LocalVariableInstruction extends 
Instruction implements Ty
      * @param cTag Instruction number for compact version, ALOAD_0, e.g.
      * @param n local variable index (unsigned short)
      */
-    protected LocalVariableInstruction(final short opcode, final short c_tag, 
final int n) {
+    protected LocalVariableInstruction(final short opcode, final short cTag, 
final int n) {
         super(opcode, (short) 2);
-        this.cTag = c_tag;
+        this.cTag = cTag;
         canonTag = opcode;
         setIndex(n);
     }

Reply via email to