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 19:26:40 UTC
svn commit: r1696826 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile:
ClassParser.java Field.java InnerClass.java JavaClass.java
LineNumberTable.java LocalVariable.java Method.java PMGClass.java
Author: sebb
Date: Thu Aug 20 17:26:40 2015
New Revision: 1696826
URL: http://svn.apache.org/r1696826
Log:
Checkstyle
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java
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/LocalVariable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java?rev=1696826&r1=1696825&r2=1696826&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ClassParser.java Thu Aug 20 17:26:40 2015
@@ -47,8 +47,10 @@ public final class ClassParser {
private final boolean fileOwned;
private final String file_name;
private String zip_file;
- private int class_name_index, superclass_name_index;
- private int major, minor; // Compiler version
+ private int class_name_index;
+ private int superclass_name_index;
+ private int major; // Compiler version
+ private int minor; // Compiler version
private int access_flags; // Access rights of parsed class
private int[] interfaces; // Names of implemented interfaces
private ConstantPool constant_pool; // collection of constants
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java?rev=1696826&r1=1696825&r2=1696826&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java Thu Aug 20 17:26:40 2015
@@ -117,7 +117,10 @@ public final class Field extends FieldOr
*/
@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
+
// Get names from constant pool
access = Utility.accessToString(super.getAccessFlags());
access = access.equals("") ? "" : (access + " ");
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java?rev=1696826&r1=1696825&r2=1696826&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/InnerClass.java Thu Aug 20 17:26:40 2015
@@ -179,8 +179,9 @@ public final class InnerClass implements
* @return Resolved string representation
*/
public final String toString( ConstantPool constant_pool ) {
- String inner_class_name, outer_class_name, inner_name, access;
- inner_class_name = constant_pool.getConstantString(inner_class_index,
+ String outer_class_name;
+ String inner_name;
+ String inner_class_name = constant_pool.getConstantString(inner_class_index,
Constants.CONSTANT_Class);
inner_class_name = Utility.compactClassName(inner_class_name);
if (outer_class_index != 0) {
@@ -196,7 +197,7 @@ public final class InnerClass implements
} else {
inner_name = "(anonymous)";
}
- access = Utility.accessToString(inner_access_flags, true);
+ String access = Utility.accessToString(inner_access_flags, true);
access = access.equals("") ? "" : (access + " ");
return " " + access + inner_name + "=class " + inner_class_name + outer_class_name;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java?rev=1696826&r1=1696825&r2=1696826&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/JavaClass.java Thu Aug 20 17:26:40 2015
@@ -55,7 +55,8 @@ public class JavaClass extends AccessFla
private int superclass_name_index;
private String class_name;
private String superclass_name;
- private int major, minor; // Compiler version
+ private int major;
+ private int minor; // Compiler version
private ConstantPool constant_pool; // Constant pool
private int[] interfaces; // implemented interfaces
private String[] interface_names;
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=1696826&r1=1696825&r2=1696826&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 17:26:40 2015
@@ -154,7 +154,8 @@ public final class LineNumberTable exten
* @return corresponding line in source code
*/
public int getSourceLine( int pos ) {
- int l = 0, r = line_number_table.length - 1;
+ int l = 0;
+ int r = line_number_table.length - 1;
if (r < 0) {
return -1;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java?rev=1696826&r1=1696825&r2=1696826&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariable.java Thu Aug 20 17:26:40 2015
@@ -182,7 +182,8 @@ public final class LocalVariable impleme
* Helper method shared with LocalVariableTypeTable
*/
final String toStringShared( boolean typeTable ) {
- String name = getName(), signature = Utility.signatureToString(getSignature(), false);
+ String name = getName();
+ String signature = Utility.signatureToString(getSignature(), false);
String label = "LocalVariable" + (typeTable ? "Types" : "" );
return label + "(start_pc = " + start_pc + ", length = " + length + ", index = "
+ index + ":" + signature + " " + name + ")";
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java?rev=1696826&r1=1696825&r2=1696826&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java Thu Aug 20 17:26:40 2015
@@ -168,18 +168,15 @@ public final class Method extends FieldO
*/
@Override
public final String toString() {
- ConstantUtf8 c;
- String name, signature, access; // Short cuts to constant pool
- StringBuilder buf;
- access = Utility.accessToString(super.getAccessFlags());
+ String access = Utility.accessToString(super.getAccessFlags());
// Get name and signature from constant pool
- c = (ConstantUtf8) super.getConstantPool().getConstant(super.getSignatureIndex(), Constants.CONSTANT_Utf8);
- signature = c.getBytes();
+ ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(super.getSignatureIndex(), Constants.CONSTANT_Utf8);
+ String signature = c.getBytes();
c = (ConstantUtf8) super.getConstantPool().getConstant(super.getNameIndex(), Constants.CONSTANT_Utf8);
- name = c.getBytes();
+ String name = c.getBytes();
signature = Utility.methodSignatureToString(signature, name, access, true,
getLocalVariableTable());
- buf = new StringBuilder(signature);
+ StringBuilder buf = new StringBuilder(signature);
for (Attribute attribute : super.getAttributes()) {
if (!((attribute instanceof Code) || (attribute instanceof ExceptionTable))) {
buf.append(" [").append(attribute.toString()).append("]");
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java?rev=1696826&r1=1696825&r2=1696826&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/PMGClass.java Thu Aug 20 17:26:40 2015
@@ -32,7 +32,8 @@ import org.apache.commons.bcel6.Constant
*/
public final class PMGClass extends Attribute {
- private int pmg_class_index, pmg_index;
+ private int pmg_class_index;
+ private int pmg_index;
/**