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/21 01:47:38 UTC
svn commit: r1696882 - in /commons/proper/bcel/trunk: ./
src/main/java/org/apache/commons/bcel6/classfile/
src/main/java/org/apache/commons/bcel6/generic/
src/main/java/org/apache/commons/bcel6/util/
src/main/java/org/apache/commons/bcel6/verifier/ src...
Author: sebb
Date: Thu Aug 20 23:47:37 2015
New Revision: 1696882
URL: http://svn.apache.org/r1696882
Log:
Removed lots of unnecessary parentheses
Modified:
commons/proper/bcel/trunk/checkstyle.xml
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.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/LocalVariableTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.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/BranchInstruction.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/InstructionFactory.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/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/InstructionFinder.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java
Modified: commons/proper/bcel/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/checkstyle.xml?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/checkstyle.xml (original)
+++ commons/proper/bcel/trunk/checkstyle.xml Thu Aug 20 23:47:37 2015
@@ -76,8 +76,11 @@ limitations under the License.
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
- <module name="TypeName"/>
-->
+ <module name="TypeName">
+ <!-- Allow underscore in class names -->
+ <property name="format" value="^[A-Z][A-Za-z0-9]*(_[A-Za-z0-9]+)*$"/>
+ </module>
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_imports.html -->
<module name="AvoidStarImport"/>
@@ -130,7 +133,7 @@ limitations under the License.
<module name="CovariantEquals"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation"/>
- <!--module name="InnerAssignment"/-->
+ <!--module name="InnerAssignment"/--><!-- Inner assignments are OK -->
<!-- module name="MagicNumber">
<property name="ignoreNumbers" value="-1,0,1,2,3"/>
</module-->
@@ -146,7 +149,7 @@ limitations under the License.
<property name="reliefPattern" value="\$FALL-THROUGH\$"/><!-- to agree with Eclipse -->
</module>
<module name="MultipleVariableDeclarations"/>
- <!--module name="UnnecessaryParentheses"/-->
+ <module name="UnnecessaryParentheses"/>
<!-- Checks for class design -->
<!-- See http://checkstyle.sf.net/config_design.html -->
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java Thu Aug 20 23:47:37 2015
@@ -52,7 +52,7 @@ public class AnnotationEntry implements
public static AnnotationEntry read(DataInput input, ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {
final AnnotationEntry annotationEntry = new AnnotationEntry(input.readUnsignedShort(), constant_pool, isRuntimeVisible);
- final int num_element_value_pairs = (input.readUnsignedShort());
+ final int num_element_value_pairs = input.readUnsignedShort();
annotationEntry.element_value_pairs = new ArrayList<>();
for (int i = 0; i < num_element_value_pairs; i++) {
annotationEntry.element_value_pairs.add(
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java Thu Aug 20 23:47:37 2015
@@ -42,7 +42,7 @@ public abstract class Annotations extend
Annotations(byte annotation_type, int name_index, int length, DataInput input,
ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {
this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool, isRuntimeVisible);
- final int annotation_table_length = (input.readUnsignedShort());
+ final int annotation_table_length = input.readUnsignedShort();
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
annotation_table[i] = AnnotationEntry.read(input, constant_pool, isRuntimeVisible);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantPool.java Thu Aug 20 23:47:37 2015
@@ -129,17 +129,17 @@ public class ConstantPool implements Clo
str = String.valueOf(((ConstantInteger) c).getBytes());
break;
case Constants.CONSTANT_NameAndType:
- str = (constantToString(((ConstantNameAndType) c).getNameIndex(),
+ str = constantToString(((ConstantNameAndType) c).getNameIndex(),
Constants.CONSTANT_Utf8)
+ ":" + constantToString(((ConstantNameAndType) c).getSignatureIndex(),
- Constants.CONSTANT_Utf8));
+ Constants.CONSTANT_Utf8);
break;
case Constants.CONSTANT_InterfaceMethodref:
case Constants.CONSTANT_Methodref:
case Constants.CONSTANT_Fieldref:
- str = (constantToString(((ConstantCP) c).getClassIndex(), Constants.CONSTANT_Class)
+ str = constantToString(((ConstantCP) c).getClassIndex(), Constants.CONSTANT_Class)
+ "." + constantToString(((ConstantCP) c).getNameAndTypeIndex(),
- Constants.CONSTANT_NameAndType));
+ Constants.CONSTANT_NameAndType);
break;
case Constants.CONSTANT_MethodHandle:
// Note that the ReferenceIndex may point to a Fieldref, Methodref or
@@ -154,7 +154,7 @@ public class ConstantPool implements Clo
str = constantToString(cmt.getDescriptorIndex(), Constants.CONSTANT_Utf8);
break;
case Constants.CONSTANT_InvokeDynamic:
- ConstantInvokeDynamic cid = ((ConstantInvokeDynamic) c);
+ ConstantInvokeDynamic cid = (ConstantInvokeDynamic) c;
str = cid.getBootstrapMethodAttrIndex()
+ ":" + constantToString(cid.getNameAndTypeIndex(),
Constants.CONSTANT_NameAndType);
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=1696882&r1=1696881&r2=1696882&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 23:47:37 2015
@@ -70,7 +70,7 @@ public final class LineNumberTable exten
LineNumberTable(int name_index, int length, DataInput input, ConstantPool constant_pool)
throws IOException {
this(name_index, length, (LineNumber[]) null, constant_pool);
- int line_number_table_length = (input.readUnsignedShort());
+ int line_number_table_length = input.readUnsignedShort();
line_number_table = new LineNumber[line_number_table_length];
for (int i = 0; i < line_number_table_length; i++) {
line_number_table[i] = new LineNumber(input);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java Thu Aug 20 23:47:37 2015
@@ -69,7 +69,7 @@ public class LocalVariableTable extends
LocalVariableTable(int name_index, int length, DataInput input, ConstantPool constant_pool)
throws IOException {
this(name_index, length, (LocalVariable[]) null, constant_pool);
- int local_variable_table_length = (input.readUnsignedShort());
+ int local_variable_table_length = input.readUnsignedShort();
local_variable_table = new LocalVariable[local_variable_table_length];
for (int i = 0; i < local_variable_table_length; i++) {
local_variable_table[i] = new LocalVariable(input, constant_pool);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTypeTable.java Thu Aug 20 23:47:37 2015
@@ -70,7 +70,7 @@ public class LocalVariableTypeTable exte
LocalVariableTypeTable(int nameIdx, int len, DataInput input, ConstantPool cpool) throws IOException {
this(nameIdx, len, (LocalVariable[]) null, cpool);
- int local_variable_type_table_length = (input.readUnsignedShort());
+ int local_variable_type_table_length = input.readUnsignedShort();
local_variable_type_table = new LocalVariable[local_variable_type_table_length];
for (int i = 0; i < local_variable_type_table_length; i++) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotationEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotationEntry.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotationEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotationEntry.java Thu Aug 20 23:47:37 2015
@@ -42,7 +42,7 @@ public class ParameterAnnotationEntry im
* @throws IOException
*/
ParameterAnnotationEntry(DataInput input, ConstantPool constant_pool) throws IOException {
- int annotation_table_length = (input.readUnsignedShort());
+ int annotation_table_length = input.readUnsignedShort();
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
// TODO isRuntimeVisible
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotations.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ParameterAnnotations.java Thu Aug 20 23:47:37 2015
@@ -43,7 +43,7 @@ public abstract class ParameterAnnotatio
DataInput input, ConstantPool constant_pool) throws IOException {
this(parameter_annotation_type, name_index, length, (ParameterAnnotationEntry[]) null,
constant_pool);
- int num_parameters = (input.readUnsignedByte());
+ int num_parameters = input.readUnsignedByte();
parameter_annotation_table = new ParameterAnnotationEntry[num_parameters];
for (int i = 0; i < num_parameters; i++) {
parameter_annotation_table[i] = new ParameterAnnotationEntry(input, constant_pool);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/SimpleElementValue.java Thu Aug 20 23:47:37 2015
@@ -129,7 +129,7 @@ public class SimpleElementValue extends
"Dont call getValueBoolean() on a non BOOLEAN ElementValue");
}
ConstantInteger bo = (ConstantInteger) cpool.getConstant(getIndex());
- return (bo.getBytes() != 0);
+ return bo.getBytes() != 0;
}
public short getValueShort()
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapType.java Thu Aug 20 23:47:37 2015
@@ -110,7 +110,7 @@ public final class StackMapType implemen
/** @return true, if type is either ITEM_Object or ITEM_NewObject
*/
public final boolean hasIndex() {
- return ((type == Constants.ITEM_Object) || (type == Constants.ITEM_NewObject));
+ return type == Constants.ITEM_Object || type == Constants.ITEM_NewObject;
}
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=1696882&r1=1696881&r2=1696882&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 23:47:37 2015
@@ -283,7 +283,7 @@ public abstract class Utility {
*/
case Constants.GOTO_W:
case Constants.JSR_W:
- buf.append("\t\t#").append(((bytes.getIndex() - 1) + bytes.readInt()));
+ buf.append("\t\t#").append((bytes.getIndex() - 1) + bytes.readInt());
break;
/* Index byte references local variable (register)
*/
@@ -329,7 +329,7 @@ public abstract class Utility {
index = bytes.readUnsignedShort();
buf.append("\t\t").append(
constant_pool.constantToString(index, Constants.CONSTANT_Fieldref)).append(
- (verbose ? " (" + index + ")" : ""));
+ verbose ? " (" + index + ")" : "");
break;
/* Operands are references to classes in constant pool
*/
@@ -341,7 +341,7 @@ public abstract class Utility {
index = bytes.readUnsignedShort();
buf.append("\t<").append(
constant_pool.constantToString(index, Constants.CONSTANT_Class))
- .append(">").append((verbose ? " (" + index + ")" : ""));
+ .append(">").append(verbose ? " (" + index + ")" : "");
break;
/* Operands are references to methods in constant pool
*/
@@ -353,13 +353,13 @@ public abstract class Utility {
// or a CONSTANT_InterfaceMethodref. (markro)
buf.append("\t").append(
constant_pool.constantToString(index, c.getTag()))
- .append((verbose ? " (" + index + ")" : ""));
+ .append(verbose ? " (" + index + ")" : "");
break;
case Constants.INVOKEVIRTUAL:
index = bytes.readUnsignedShort();
buf.append("\t").append(
constant_pool.constantToString(index, Constants.CONSTANT_Methodref))
- .append((verbose ? " (" + index + ")" : ""));
+ .append(verbose ? " (" + index + ")" : "");
break;
case Constants.INVOKEINTERFACE:
index = bytes.readUnsignedShort();
@@ -386,13 +386,13 @@ public abstract class Utility {
index = bytes.readUnsignedShort();
buf.append("\t\t").append(
constant_pool.constantToString(index, constant_pool.getConstant(index)
- .getTag())).append((verbose ? " (" + index + ")" : ""));
+ .getTag())).append(verbose ? " (" + index + ")" : "");
break;
case Constants.LDC:
index = bytes.readUnsignedByte();
buf.append("\t\t").append(
constant_pool.constantToString(index, constant_pool.getConstant(index)
- .getTag())).append((verbose ? " (" + index + ")" : ""));
+ .getTag())).append(verbose ? " (" + index + ")" : "");
break;
/* Array of references.
*/
@@ -401,7 +401,7 @@ public abstract class Utility {
buf.append("\t\t<").append(
compactClassName(constant_pool.getConstantString(index,
Constants.CONSTANT_Class), false)).append(">").append(
- (verbose ? " (" + index + ")" : ""));
+ verbose ? " (" + index + ")" : "");
break;
/* Multidimensional array of references.
*/
@@ -411,7 +411,7 @@ public abstract class Utility {
buf.append("\t<").append(
compactClassName(constant_pool.getConstantString(index,
Constants.CONSTANT_Class), false)).append(">\t").append(dimensions)
- .append((verbose ? " (" + index + ")" : ""));
+ .append(verbose ? " (" + index + ")" : "");
}
break;
/* Increment local variable.
@@ -1222,8 +1222,7 @@ public abstract class Utility {
}
for (int i = 0; i < obj.length; i++) {
if (obj[i] != null) {
- buf.append((quote ? "\"" : "")).append(obj[i].toString()).append(
- (quote ? "\"" : ""));
+ buf.append(quote ? "\"" : "").append(obj[i].toString()).append(quote ? "\"" : "");
} else {
buf.append("null");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java Thu Aug 20 23:47:37 2015
@@ -226,7 +226,7 @@ public abstract class BranchInstruction
*/
@Override
public boolean containsTarget( InstructionHandle ih ) {
- return (target == ih);
+ return target == ih;
}
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=1696882&r1=1696881&r2=1696882&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 23:47:37 2015
@@ -249,7 +249,7 @@ public class FieldGen extends FieldGenOr
case Constants.T_LONG:
return cp.addLong(((Long) value).longValue());
case Constants.T_REFERENCE:
- return cp.addString(((String) value));
+ return cp.addString((String) value);
default:
throw new RuntimeException("Oops: Unhandled : " + type.getType());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java Thu Aug 20 23:47:37 2015
@@ -221,8 +221,8 @@ public class InstructionFactory {
private static boolean isString( Type type ) {
- return ((type instanceof ObjectType) && ((ObjectType) type).getClassName().equals(
- "java.lang.String"));
+ return (type instanceof ObjectType) &&
+ ((ObjectType) type).getClassName().equals("java.lang.String");
}
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=1696882&r1=1696881&r2=1696882&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 23:47:37 2015
@@ -638,7 +638,7 @@ public class MethodGen extends FieldGenO
*/
int attrs_len = 0;
for (Attribute code_attr : code_attrs) {
- attrs_len += (code_attr.getLength() + 6);
+ attrs_len += code_attr.getLength() + 6;
}
CodeException[] c_exc = getCodeExceptions();
int exc_len = c_exc.length * 8; // Every entry takes 8 bytes
@@ -906,7 +906,7 @@ public class MethodGen extends FieldGenO
private boolean visited( InstructionHandle target ) {
- return (visitedTargets.get(target) != null);
+ return visitedTargets.get(target) != null;
}
}
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=1696882&r1=1696881&r2=1696882&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 23:47:37 2015
@@ -171,7 +171,7 @@ final class AttributeHTML {
Constants.CONSTANT_Utf8)).getBytes();
signature = Utility.signatureToString(signature, false);
int start = var.getStartPC();
- int end = (start + var.getLength());
+ int end = start + var.getLength();
file.println("<LI>" + Class2HTML.referenceType(signature) + " <B>"
+ var.getName() + "</B> in slot %" + var.getIndex()
+ "<BR>Valid from lines " + "<A HREF=\"" + class_name
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=1696882&r1=1696881&r2=1696882&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 23:47:37 2015
@@ -173,7 +173,7 @@ final class CodeHTML {
case Constants.IF_ICMPLT:
case Constants.IF_ICMPNE:
case Constants.JSR:
- index = (bytes.getIndex() + bytes.readShort() - 1);
+ index = bytes.getIndex() + bytes.readShort() - 1;
buf.append("<A HREF=\"#code").append(method_number).append("@").append(index)
.append("\">").append(index).append("</A>");
break;
@@ -405,7 +405,7 @@ final class CodeHTML {
.getLocalVariableTable();
for (LocalVariable var : vars) {
int start = var.getStartPC();
- int end = (start + var.getLength());
+ int end = start + var.getLength();
goto_set.set(start);
goto_set.set(end);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java Thu Aug 20 23:47:37 2015
@@ -222,7 +222,7 @@ public class InstructionFinder {
while (start < il_string.length() && matcher.find(start)) {
int startExpr = matcher.start();
int endExpr = matcher.end();
- int lenExpr = (endExpr - startExpr);
+ int lenExpr = endExpr - startExpr;
InstructionHandle[] match = getMatch(startExpr, lenExpr);
if ((constraint == null) || constraint.checkCode(match)) {
matches.add(match);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java Thu Aug 20 23:47:37 2015
@@ -102,7 +102,7 @@ public class VerificationResult {
return false;
}
VerificationResult other = (VerificationResult) o;
- return ((other.numeric == this.numeric) && (other.detailMessage.equals(this.detailMessage)));
+ return (other.numeric == this.numeric) && other.detailMessage.equals(this.detailMessage);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java Thu Aug 20 23:47:37 2015
@@ -43,14 +43,14 @@ public class LocalVariableInfo{
* (Hashtable) database.
*/
private void setName(int offset, String name){
- names.put( ((Integer.toString(offset))), name);
+ names.put(Integer.toString(offset), name);
}
/**
* Adds a type of a local variable and a certain slot to our 'types'
* (Hashtable) database.
*/
private void setType(int offset, Type t){
- types.put( ((Integer.toString(offset))), t);
+ types.put(Integer.toString(offset), t);
}
/**
@@ -73,7 +73,7 @@ public class LocalVariableInfo{
* variable slot at the given bytecode offset.
*/
public String getName(int offset){
- return (names.get(Integer.toString(offset)));
+ return names.get(Integer.toString(offset));
}
/**
* Adds some information about this local variable (slot).
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java Thu Aug 20 23:47:37 2015
@@ -252,7 +252,7 @@ public final class Pass2Verifier extends
Method[] methods = jc.getMethods();
for (Method method : methods) {
- String nameAndSig = (method.getName() + method.getSignature());
+ String nameAndSig = method.getName() + method.getSignature();
if (hashmap.containsKey(nameAndSig)) {
if (method.isFinal()) {
@@ -587,7 +587,7 @@ public final class Pass2Verifier extends
throw new ClassConstraintException("Illegal descriptor (==signature) '"+sig+"' used by '"+tostring(obj)+"'.", cfe);
}
- String nameanddesc = (name+sig);
+ String nameanddesc = name+sig;
if (field_names_and_desc.contains(nameanddesc)){
throw new ClassConstraintException("No two fields (like '"+tostring(obj)+
"') are allowed have same names and descriptors!");
@@ -783,7 +783,7 @@ public final class Pass2Verifier extends
" ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT, ACC_STRICT set (ignored).");
}
- String nameanddesc = (name+sig);
+ String nameanddesc = name+sig;
if (method_names_and_desc.contains(nameanddesc)){
throw new ClassConstraintException(
"No two methods (like '"+tostring(obj)+"') are allowed have same names and desciptors!");
@@ -1435,7 +1435,7 @@ public final class Pass2Verifier extends
}
if (allowStaticInit){
- return (name.equals(Constants.CONSTRUCTOR_NAME) || name.equals(Constants.STATIC_INITIALIZER_NAME));
+ return name.equals(Constants.CONSTRUCTOR_NAME) || name.equals(Constants.STATIC_INITIALIZER_NAME);
}
return name.equals(Constants.CONSTRUCTOR_NAME);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java Thu Aug 20 23:47:37 2015
@@ -182,7 +182,7 @@ public class InstConstraintVisitor exten
if (! ((arrayref instanceof ArrayType) || arrayref.equals(Type.NULL)) ) {
constraintViolated(o, "The 'arrayref' does not refer to an array but is of type "+arrayref+".");
}
- return (arrayref instanceof ArrayType);
+ return arrayref instanceof ArrayType;
}
/***************************************************************/
@@ -386,7 +386,7 @@ public class InstConstraintVisitor exten
constraintViolated(o, "Cannot STORE: Stack to read from is empty.");
}
- if ( (!(o instanceof ASTORE)) ){
+ if ( !(o instanceof ASTORE) ){
if (! (stack().peek() == o.getType(cpg)) ){// the other xSTORE types are singletons in BCEL.
constraintViolated(o, "Stack top type and STOREing Instruction type mismatch: Stack top: '"+stack().peek()+
"'; Instruction type: '"+o.getType(cpg)+"'.");
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java Thu Aug 20 23:47:37 2015
@@ -232,7 +232,7 @@ public final class Pass3bVerifier extend
//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())) ),
+ exc_hd.getExceptionType()==null? Type.THROWABLE : exc_hd.getExceptionType())),
new ArrayList<InstructionContext>(), icv, ev)){
icq.add(v, new ArrayList<InstructionContext>());
}
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java?rev=1696882&r1=1696881&r2=1696882&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java Thu Aug 20 23:47:37 2015
@@ -44,7 +44,7 @@ public class NanoTimer {
*/
@Override
public String toString() {
- return ((double) (time) / 1000000000) + " s";
+ return ((double) time / 1000000000) + " s";
}