You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/20 23:47:14 UTC
svn commit: r1696863 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:
classfile/ generic/ util/
Author: sebb
Date: Thu Aug 20 21:47:14 2015
New Revision: 1696863
URL: http://svn.apache.org/r1696863
Log:
Checkstyle multiple defs
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java Thu Aug 20 21:47:14 2015
@@ -159,7 +159,8 @@ public final class LineNumberTable exten
if (r < 0) {
return -1;
}
- int min_index = -1, min = -1;
+ int min_index = -1;
+ int min = -1;
/* Do a binary search since the array is ordered.
*/
do {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java Thu Aug 20 21:47:14 2015
@@ -745,7 +745,8 @@ public abstract class Utility {
* @return new String object
*/
public static String replace( String str, String old, String new_ ) {
- int index, old_index;
+ int index;
+ int old_index;
try {
if (str.contains(old)) { // `old' found in str
StringBuilder buf = new StringBuilder();
@@ -948,7 +949,8 @@ public abstract class Utility {
public static String getSignature( String type ) {
StringBuilder buf = new StringBuilder();
char[] chars = type.toCharArray();
- boolean char_found = false, delim = false;
+ boolean char_found = false;
+ boolean delim = false;
int index = -1;
loop: for (int i = 0; i < chars.length; i++) {
switch (chars[i]) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java Thu Aug 20 21:47:14 2015
@@ -45,10 +45,13 @@ public class ClassGen extends AccessFlag
/* Corresponds to the fields found in a JavaClass object.
*/
- private String class_name, super_class_name;
+ private String class_name;
+ private String super_class_name;
private final String file_name;
- private int class_name_index = -1, superclass_name_index = -1;
- private int major = Constants.MAJOR_1_1, minor = Constants.MINOR_1_1;
+ private int class_name_index = -1;
+ private int superclass_name_index = -1;
+ private int major = Constants.MAJOR_1_1;
+ private int minor = Constants.MINOR_1_1;
private ConstantPoolGen cp; // Template for building up constant pool
// ArrayLists instead of arrays to gather fields, methods, etc.
private final List<Field> field_vec = new ArrayList<>();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java Thu Aug 20 21:47:14 2015
@@ -510,7 +510,8 @@ public class ConstantPoolGen {
*/
public int addNameAndType( String name, String signature ) {
int ret;
- int name_index, signature_index;
+ int name_index;
+ int signature_index;
if ((ret = lookupNameAndType(name, signature)) != -1) {
return ret; // Already in CP
}
@@ -559,7 +560,9 @@ public class ConstantPoolGen {
* @return index of entry
*/
public int addMethodref( String class_name, String method_name, String signature ) {
- int ret, class_index, name_and_type_index;
+ int ret;
+ int class_index;
+ int name_and_type_index;
if ((ret = lookupMethodref(class_name, method_name, signature)) != -1) {
return ret; // Already in CP
}
@@ -612,7 +615,9 @@ public class ConstantPoolGen {
* @return index of entry
*/
public int addInterfaceMethodref( String class_name, String method_name, String signature ) {
- int ret, class_index, name_and_type_index;
+ int ret;
+ int class_index;
+ int name_and_type_index;
if ((ret = lookupInterfaceMethodref(class_name, method_name, signature)) != -1) {
return ret; // Already in CP
}
@@ -660,7 +665,8 @@ public class ConstantPoolGen {
*/
public int addFieldref( String class_name, String field_name, String signature ) {
int ret;
- int class_index, name_and_type_index;
+ int class_index;
+ int name_and_type_index;
if ((ret = lookupFieldref(class_name, field_name, signature)) != -1) {
return ret; // Already in CP
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGen.java Thu Aug 20 21:47:14 2015
@@ -312,7 +312,9 @@ public class FieldGen extends FieldGenOr
*/
@Override
public final String toString() {
- String name, signature, access; // Short cuts to constant pool
+ String name;
+ String signature;
+ String access; // Short cuts to constant pool
access = Utility.accessToString(super.getAccessFlags());
access = access.equals("") ? "" : (access + " ");
signature = type.toString();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionHandle.java Thu Aug 20 21:47:14 2015
@@ -44,7 +44,8 @@ import org.apache.commons.bcel6.classfil
*/
public class InstructionHandle {
- InstructionHandle next, prev; // Will be set from the outside
+ InstructionHandle next;
+ InstructionHandle prev; // Will be set from the outside
Instruction instruction;
protected int i_position = -1; // byte code offset of instruction
private Set<InstructionTargeter> targeters;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java Thu Aug 20 21:47:14 2015
@@ -35,7 +35,8 @@ public class LocalVariableGen implements
private int index;
private String name;
private Type type;
- private InstructionHandle start, end;
+ private InstructionHandle start;
+ private InstructionHandle end;
/**
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java Thu Aug 20 21:47:14 2015
@@ -929,7 +929,8 @@ public class MethodGen extends FieldGenO
branchTargets.push(handler_pc, 1);
}
}
- int stackDepth = 0, maxStackDepth = 0;
+ int stackDepth = 0;
+ int maxStackDepth = 0;
InstructionHandle ih = il.getStart();
while (ih != null) {
Instruction instruction = ih.getInstruction();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java Thu Aug 20 21:47:14 2015
@@ -99,8 +99,10 @@ public final class SWITCH implements Com
* Sort match and targets array with QuickSort.
*/
private void sort( int l, int r ) {
- int i = l, j = r;
- int h, m = match[(l + r) / 2];
+ int i = l;
+ int j = r;
+ int h;
+ int m = match[(l + r) / 2];
InstructionHandle h2;
do {
while (match[i] < m) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/AttributeHTML.java Thu Aug 20 21:47:14 2015
@@ -186,7 +186,8 @@ final class AttributeHTML {
// List inner classes
file.print("<UL>");
for (InnerClass classe : classes) {
- String name, access;
+ String name;
+ String access;
index = classe.getInnerNameIndex();
if (index > 0) {
name = ((ConstantUtf8) constant_pool.getConstant(index, Constants.CONSTANT_Utf8))
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java Thu Aug 20 21:47:14 2015
@@ -423,8 +423,8 @@ final class CodeHTML {
//bytes.readByte(); // Skip already read byte
int remainder = bytes.getIndex() % 4;
int no_pad_bytes = (remainder == 0) ? 0 : 4 - remainder;
- int default_offset,
- offset;
+ int default_offset;
+ int offset;
for (int j = 0; j < no_pad_bytes; j++) {
bytes.readByte();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java Thu Aug 20 21:47:14 2015
@@ -85,7 +85,8 @@ final class ConstantHTML {
private void writeConstant( int index ) {
byte tag = constants[index].getTag();
- int class_index, name_index;
+ int class_index;
+ int name_index;
String ref;
// The header is always the same
file.println("<H4> <A NAME=cp" + index + ">" + index + "</A> " + Constants.CONSTANT_NAMES[tag]
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java?rev=1696863&r1=1696862&r2=1696863&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java Thu Aug 20 21:47:14 2015
@@ -109,7 +109,8 @@ final class MethodHTML {
// Get return type string
String type = Utility.methodSignatureReturnType(signature, false);
// Get method name
- String name = method.getName(), html_name;
+ String name = method.getName();
+ String html_name;
// Get method's access flags
String access = Utility.accessToString(method.getAccessFlags());
// Get the method's attributes, the Code Attribute in particular