You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/06/21 20:50:21 UTC
svn commit: r1749603 [1/9] - in /commons/proper/bcel/trunk/src:
main/java/org/apache/bcel/ main/java/org/apache/bcel/classfile/
main/java/org/apache/bcel/generic/ main/java/org/apache/bcel/util/
main/java/org/apache/bcel/verifier/ main/java/org/apache/...
Author: ggregory
Date: Tue Jun 21 20:50:19 2016
New Revision: 1749603
URL: http://svn.apache.org/viewvc?rev=1749603&view=rev
Log:
Use final on local vars when possible (which already do on fields and parameters when possible.)
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassParser.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Code.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantClass.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantString.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValuePair.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Field.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/FieldOrMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClass.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/JavaClass.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumber.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Method.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameter.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/MethodParameters.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ParameterAnnotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SimpleElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapType.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Unknown.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayType.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchHandle.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/BranchInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CPInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGenOrMethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GOTO.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JsrInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NameSignatureInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWITCH.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPathRepository.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassSet.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassVector.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ConstantHTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/JavaWrapper.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MethodHTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/StringRepresentation.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExecutionVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Frame.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PLSETestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/data/PLSETestClass.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/JDKGenericDumpTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/generic/TypeTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArray01.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestCreator.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java Tue Jun 21 20:50:19 2016
@@ -90,8 +90,8 @@ public final class ExceptionConst {
// helper method to merge exception class arrays
private static Class<?>[] mergeExceptions(final Class<?>[] input, final Class<?> ... extraClasses) {
- int extraLen = extraClasses == null ? 0 : extraClasses.length;
- Class<?>[] excs = new Class<?>[input.length + extraLen];
+ final int extraLen = extraClasses == null ? 0 : extraClasses.length;
+ final Class<?>[] excs = new Class<?>[input.length + extraLen];
System.arraycopy(input, 0, excs, 0, input.length);
if (extraLen > 0) {
System.arraycopy(extraClasses, 0, excs, input.length, extraLen);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java Tue Jun 21 20:50:19 2016
@@ -83,12 +83,12 @@ public abstract class Repository {
*/
public static ClassPath.ClassFile lookupClassFile( final String class_name ) {
try {
- ClassPath path = repository.getClassPath();
+ final ClassPath path = repository.getClassPath();
if (path == null) {
return null;
}
return path.getClassFile(class_name);
- } catch (IOException e) {
+ } catch (final IOException e) {
return null;
}
}
@@ -107,7 +107,7 @@ public abstract class Repository {
* @return old entry in repository
*/
public static JavaClass addClass( final JavaClass clazz ) {
- JavaClass old = repository.findClass(clazz.getClassName());
+ final JavaClass old = repository.findClass(clazz.getClassName());
repository.storeClass(clazz);
return old;
}
@@ -146,7 +146,7 @@ public abstract class Repository {
* superclasses can't be found
*/
public static JavaClass[] getSuperClasses( final String class_name ) throws ClassNotFoundException {
- JavaClass jc = lookupClass(class_name);
+ final JavaClass jc = lookupClass(class_name);
return getSuperClasses(jc);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java Tue Jun 21 20:50:19 2016
@@ -138,10 +138,10 @@ public class AnnotationEntry implements
final StringBuilder result = new StringBuilder();
result.append("@");
result.append(getAnnotationType());
- ElementValuePair[] evPairs = getElementValuePairs();
+ final ElementValuePair[] evPairs = getElementValuePairs();
if (evPairs.length > 0) {
result.append("(");
- for (ElementValuePair element : evPairs) {
+ for (final ElementValuePair element : evPairs) {
result.append(element.toShortString());
}
result.append(")");
@@ -156,10 +156,10 @@ public class AnnotationEntry implements
public static AnnotationEntry[] createAnnotationEntries(final Attribute[] attrs) {
// Find attributes that contain annotation data
- List<AnnotationEntry> accumulatedAnnotations = new ArrayList<>(attrs.length);
- for (Attribute attribute : attrs) {
+ final List<AnnotationEntry> accumulatedAnnotations = new ArrayList<>(attrs.length);
+ for (final Attribute attribute : attrs) {
if (attribute instanceof Annotations) {
- Annotations runtimeAnnotations = (Annotations) attribute;
+ final Annotations runtimeAnnotations = (Annotations) attribute;
Collections.addAll(accumulatedAnnotations, runtimeAnnotations.getAnnotationEntries());
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Annotations.java Tue Jun 21 20:50:19 2016
@@ -107,7 +107,7 @@ public abstract class Annotations extend
return;
}
dos.writeShort(annotation_table.length);
- for (AnnotationEntry element : annotation_table) {
+ for (final AnnotationEntry element : annotation_table) {
element.dump(dos);
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java Tue Jun 21 20:50:19 2016
@@ -31,7 +31,7 @@ public class ArrayElementValue extends E
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append("{");
for (int i = 0; i < evalues.length; i++)
{
@@ -59,7 +59,7 @@ public class ArrayElementValue extends E
{
dos.writeByte(super.getType()); // u1 type of value (ARRAY == '[')
dos.writeShort(evalues.length);
- for (ElementValue evalue : evalues) {
+ for (final ElementValue evalue : evalues) {
evalue.dump(dos);
}
}
@@ -67,7 +67,7 @@ public class ArrayElementValue extends E
@Override
public String stringifyValue()
{
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append("[");
for (int i = 0; i < evalues.length; i++)
{
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java Tue Jun 21 20:50:19 2016
@@ -185,12 +185,12 @@ public abstract class Attribute implemen
{
byte tag = Const.ATTR_UNKNOWN; // Unknown attribute
// Get class name from constant pool via `name_index' indirection
- int name_index = file.readUnsignedShort();
- ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8);
- String name = c.getBytes();
+ final int name_index = file.readUnsignedShort();
+ final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8);
+ final String name = c.getBytes();
// Length of data in bytes
- int length = file.readInt();
+ final int length = file.readInt();
// Compare strings to find known attribute
for (byte i = 0; i < Const.KNOWN_ATTRIBUTES; i++)
@@ -206,7 +206,7 @@ public abstract class Attribute implemen
switch (tag)
{
case Const.ATTR_UNKNOWN:
- Object r = readers.get(name);
+ final Object r = readers.get(name);
if (r instanceof UnknownAttributeReader)
{
return ((UnknownAttributeReader) r).createAttribute(name_index, length, file, constant_pool);
@@ -268,7 +268,7 @@ public abstract class Attribute implemen
*/
public String getName()
{
- ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8);
+ final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8);
return c.getBytes();
}
@@ -344,7 +344,7 @@ public abstract class Attribute implemen
{
attr = (Attribute) super.clone();
}
- catch (CloneNotSupportedException e)
+ catch (final CloneNotSupportedException e)
{
throw new Error("Clone Not Supported"); // never happens
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethod.java Tue Jun 21 20:50:19 2016
@@ -125,7 +125,7 @@ public class BootstrapMethod implements
* @return Resolved string representation
*/
public final String toString( final ConstantPool constant_pool ) {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
String bootstrap_method_name;
bootstrap_method_name = constant_pool.constantToString(bootstrap_method_ref,
Const.CONSTANT_MethodHandle);
@@ -150,7 +150,7 @@ public class BootstrapMethod implements
public final void dump(final DataOutputStream file) throws IOException {
file.writeShort(bootstrap_method_ref);
file.writeShort(bootstrap_arguments.length);
- for (int bootstrap_argument : bootstrap_arguments) {
+ for (final int bootstrap_argument : bootstrap_arguments) {
file.writeShort(bootstrap_argument);
}
}
@@ -161,7 +161,7 @@ public class BootstrapMethod implements
public BootstrapMethod copy() {
try {
return (BootstrapMethod) clone();
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// TODO should this throw?
}
return null;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/BootstrapMethods.java Tue Jun 21 20:50:19 2016
@@ -66,7 +66,7 @@ public class BootstrapMethods extends At
BootstrapMethods(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException {
this(name_index, length, (BootstrapMethod[]) null, constant_pool);
- int num_bootstrap_methods = input.readUnsignedShort();
+ final int num_bootstrap_methods = input.readUnsignedShort();
bootstrap_methods = new BootstrapMethod[num_bootstrap_methods];
for (int i = 0; i < num_bootstrap_methods; i++) {
bootstrap_methods[i] = new BootstrapMethod(input);
@@ -100,7 +100,7 @@ public class BootstrapMethods extends At
*/
@Override
public BootstrapMethods copy(final ConstantPool _constant_pool) {
- BootstrapMethods c = (BootstrapMethods) clone();
+ final BootstrapMethods c = (BootstrapMethods) clone();
c.bootstrap_methods = new BootstrapMethod[bootstrap_methods.length];
for (int i = 0; i < bootstrap_methods.length; i++) {
@@ -121,7 +121,7 @@ public class BootstrapMethods extends At
super.dump(file);
file.writeShort(bootstrap_methods.length);
- for (BootstrapMethod bootstrap_method : bootstrap_methods) {
+ for (final BootstrapMethod bootstrap_method : bootstrap_methods) {
bootstrap_method.dump(file);
}
}
@@ -131,7 +131,7 @@ public class BootstrapMethods extends At
*/
@Override
public final String toString() {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
buf.append("BootstrapMethods(");
buf.append(bootstrap_methods.length);
buf.append("):\n");
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassElementValue.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassElementValue.java Tue Jun 21 20:50:19 2016
@@ -45,7 +45,7 @@ public class ClassElementValue extends E
public String getClassString()
{
- ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(idx,
+ final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(idx,
Const.CONSTANT_Utf8);
return c.getBytes();
}
@@ -53,7 +53,7 @@ public class ClassElementValue extends E
@Override
public String stringifyValue()
{
- ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(idx,
+ final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(idx,
Const.CONSTANT_Utf8);
return cu8.getBytes();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassParser.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassParser.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassParser.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ClassParser.java Tue Jun 21 20:50:19 2016
@@ -70,7 +70,7 @@ public final class ClassParser {
public ClassParser(final InputStream inputStream, final String file_name) {
this.file_name = file_name;
fileOwned = false;
- String clazz = inputStream.getClass().getName(); // Not a very clean solution ...
+ final String clazz = inputStream.getClass().getName(); // Not a very clean solution ...
is_zip = clazz.startsWith("java.util.zip.") || clazz.startsWith("java.util.jar.");
if (inputStream instanceof DataInputStream) {
this.dataInputStream = (DataInputStream) inputStream;
@@ -121,7 +121,7 @@ public final class ClassParser {
if (fileOwned) {
if (is_zip) {
zip = new ZipFile(zip_file);
- ZipEntry entry = zip.getEntry(file_name);
+ final ZipEntry entry = zip.getEntry(file_name);
if (entry == null) {
throw new IOException("File " + file_name + " not found");
@@ -174,7 +174,7 @@ public final class ClassParser {
if (dataInputStream != null) {
dataInputStream.close();
}
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
//ignore close exceptions
}
}
@@ -182,7 +182,7 @@ public final class ClassParser {
if (zip != null) {
zip.close();
}
- } catch (IOException ioe) {
+ } catch (final IOException ioe) {
//ignore close exceptions
}
}
@@ -200,7 +200,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readAttributes() throws IOException, ClassFormatException {
- int attributes_count = dataInputStream.readUnsignedShort();
+ final int attributes_count = dataInputStream.readUnsignedShort();
attributes = new Attribute[attributes_count];
for (int i = 0; i < attributes_count; i++) {
attributes[i] = Attribute.readAttribute(dataInputStream, constant_pool);
@@ -246,7 +246,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readFields() throws IOException, ClassFormatException {
- int fields_count = dataInputStream.readUnsignedShort();
+ final int fields_count = dataInputStream.readUnsignedShort();
fields = new Field[fields_count];
for (int i = 0; i < fields_count; i++) {
fields[i] = new Field(dataInputStream, constant_pool);
@@ -274,7 +274,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readInterfaces() throws IOException, ClassFormatException {
- int interfaces_count = dataInputStream.readUnsignedShort();
+ final int interfaces_count = dataInputStream.readUnsignedShort();
interfaces = new int[interfaces_count];
for (int i = 0; i < interfaces_count; i++) {
interfaces[i] = dataInputStream.readUnsignedShort();
@@ -288,7 +288,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readMethods() throws IOException, ClassFormatException {
- int methods_count = dataInputStream.readUnsignedShort();
+ final int methods_count = dataInputStream.readUnsignedShort();
methods = new Method[methods_count];
for (int i = 0; i < methods_count; i++) {
methods[i] = new Method(dataInputStream, constant_pool);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Code.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Code.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Code.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Code.java Tue Jun 21 20:50:19 2016
@@ -71,13 +71,13 @@ public final class Code extends Attribut
// Initialize with some default values which will be overwritten later
this(name_index, length, file.readUnsignedShort(), file.readUnsignedShort(), (byte[]) null,
(CodeException[]) null, (Attribute[]) null, constant_pool);
- int code_length = file.readInt();
+ final int code_length = file.readInt();
code = new byte[code_length]; // Read byte code
file.readFully(code);
/* Read exception table that contains all regions where an exception
* handler is active, i.e., a try { ... } catch() block.
*/
- int exception_table_length = file.readUnsignedShort();
+ final int exception_table_length = file.readUnsignedShort();
exception_table = new CodeException[exception_table_length];
for (int i = 0; i < exception_table_length; i++) {
exception_table[i] = new CodeException(file);
@@ -85,7 +85,7 @@ public final class Code extends Attribut
/* Read all attributes, currently `LineNumberTable' and
* `LocalVariableTable'
*/
- int attributes_count = file.readUnsignedShort();
+ final int attributes_count = file.readUnsignedShort();
attributes = new Attribute[attributes_count];
for (int i = 0; i < attributes_count; i++) {
attributes[i] = Attribute.readAttribute(file, constant_pool);
@@ -147,11 +147,11 @@ public final class Code extends Attribut
file.writeInt(code.length);
file.write(code, 0, code.length);
file.writeShort(exception_table.length);
- for (CodeException exception : exception_table) {
+ for (final CodeException exception : exception_table) {
exception.dump(file);
}
file.writeShort(attributes.length);
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
attribute.dump(file);
}
}
@@ -170,7 +170,7 @@ public final class Code extends Attribut
* @return LineNumberTable of Code, if it has one
*/
public LineNumberTable getLineNumberTable() {
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
if (attribute instanceof LineNumberTable) {
return (LineNumberTable) attribute;
}
@@ -183,7 +183,7 @@ public final class Code extends Attribut
* @return LocalVariableTable of Code, if it has one
*/
public LocalVariableTable getLocalVariableTable() {
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
if (attribute instanceof LocalVariableTable) {
return (LocalVariableTable) attribute;
}
@@ -245,7 +245,7 @@ public final class Code extends Attribut
private int calculateLength() {
int len = 0;
if (attributes != null) {
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
len += attribute.getLength() + 6 /*attribute header size*/;
}
}
@@ -300,19 +300,19 @@ public final class Code extends Attribut
* @return String representation of code chunk.
*/
public final String toString( final boolean verbose ) {
- StringBuilder buf = new StringBuilder(100); // CHECKSTYLE IGNORE MagicNumber
+ final StringBuilder buf = new StringBuilder(100); // CHECKSTYLE IGNORE MagicNumber
buf.append("Code(max_stack = ").append(max_stack).append(", max_locals = ").append(
max_locals).append(", code_length = ").append(code.length).append(")\n").append(
Utility.codeToString(code, super.getConstantPool(), 0, -1, verbose));
if (exception_table.length > 0) {
buf.append("\nException handler(s) = \n").append("From\tTo\tHandler\tType\n");
- for (CodeException exception : exception_table) {
+ for (final CodeException exception : exception_table) {
buf.append(exception.toString(super.getConstantPool(), verbose)).append("\n");
}
}
if (attributes.length > 0) {
buf.append("\nAttribute(s) = ");
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
buf.append("\n").append(attribute);
}
}
@@ -336,7 +336,7 @@ public final class Code extends Attribut
*/
@Override
public Attribute copy( final ConstantPool _constant_pool ) {
- Code c = (Code) clone();
+ final Code c = (Code) clone();
if (code != null) {
c.code = new byte[code.length];
System.arraycopy(code, 0, c.code, 0, code.length);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/CodeException.java Tue Jun 21 20:50:19 2016
@@ -210,7 +210,7 @@ public final class CodeException impleme
public CodeException copy() {
try {
return (CodeException) clone();
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// TODO should this throw?
}
return null;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java Tue Jun 21 20:50:19 2016
@@ -37,15 +37,15 @@ public abstract class Constant implement
@Override
public boolean equals( final Object o1, final Object o2 ) {
- Constant THIS = (Constant) o1;
- Constant THAT = (Constant) o2;
+ final Constant THIS = (Constant) o1;
+ final Constant THAT = (Constant) o2;
return THIS.toString().equals(THAT.toString());
}
@Override
public int hashCode( final Object o ) {
- Constant THIS = (Constant) o;
+ final Constant THIS = (Constant) o;
return THIS.toString().hashCode();
}
};
@@ -107,7 +107,7 @@ public abstract class Constant implement
public Constant copy() {
try {
return (Constant) super.clone();
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// TODO should this throw?
}
return null;
@@ -118,7 +118,7 @@ public abstract class Constant implement
public Object clone() {
try {
return super.clone();
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
throw new Error("Clone Not Supported"); // never happens
}
}
@@ -133,7 +133,7 @@ public abstract class Constant implement
*/
public static Constant readConstant( final DataInput input ) throws IOException,
ClassFormatException {
- byte b = input.readByte(); // Read tag byte
+ final byte b = input.readByte(); // Read tag byte
switch (b) {
case Const.CONSTANT_Class:
return new ConstantClass(input);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantClass.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantClass.java Tue Jun 21 20:50:19 2016
@@ -110,7 +110,7 @@ public final class ConstantClass extends
*/
@Override
public Object getConstantValue( final ConstantPool cp ) {
- Constant c = cp.getConstant(name_index, Const.CONSTANT_Utf8);
+ final Constant c = cp.getConstant(name_index, Const.CONSTANT_Utf8);
return ((ConstantUtf8) c).getBytes();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java Tue Jun 21 20:50:19 2016
@@ -57,7 +57,7 @@ public class ConstantPool implements Clo
*/
public ConstantPool(final DataInput input) throws IOException, ClassFormatException {
byte tag;
- int constant_pool_count = input.readUnsignedShort();
+ final int constant_pool_count = input.readUnsignedShort();
constant_pool = new Constant[constant_pool_count];
/* constant_pool[0] is unused by the compiler and may be used freely
* by the implementation.
@@ -101,7 +101,7 @@ public class ConstantPool implements Clo
public String constantToString( Constant c ) throws ClassFormatException {
String str;
int i;
- byte tag = c.getTag();
+ final byte tag = c.getTag();
switch (tag) {
case Const.CONSTANT_Class:
i = ((ConstantClass) c).getNameIndex();
@@ -144,17 +144,17 @@ public class ConstantPool implements Clo
case Const.CONSTANT_MethodHandle:
// Note that the ReferenceIndex may point to a Fieldref, Methodref or
// InterfaceMethodref - so we need to peek ahead to get the actual type.
- ConstantMethodHandle cmh = (ConstantMethodHandle) c;
+ final ConstantMethodHandle cmh = (ConstantMethodHandle) c;
str = Const.getMethodHandleName(cmh.getReferenceKind())
+ " " + constantToString(cmh.getReferenceIndex(),
getConstant(cmh.getReferenceIndex()).getTag());
break;
case Const.CONSTANT_MethodType:
- ConstantMethodType cmt = (ConstantMethodType) c;
+ final ConstantMethodType cmt = (ConstantMethodType) c;
str = constantToString(cmt.getDescriptorIndex(), Const.CONSTANT_Utf8);
break;
case Const.CONSTANT_InvokeDynamic:
- ConstantInvokeDynamic cid = (ConstantInvokeDynamic) c;
+ final ConstantInvokeDynamic cid = (ConstantInvokeDynamic) c;
str = cid.getBootstrapMethodAttrIndex()
+ ":" + constantToString(cid.getNameAndTypeIndex(),
Const.CONSTANT_NameAndType);
@@ -167,9 +167,9 @@ public class ConstantPool implements Clo
private static String escape( final String str ) {
- int len = str.length();
- StringBuilder buf = new StringBuilder(len + 5);
- char[] ch = str.toCharArray();
+ final int len = str.length();
+ final StringBuilder buf = new StringBuilder(len + 5);
+ final char[] ch = str.toCharArray();
for (int i = 0; i < len; i++) {
switch (ch[i]) {
case '\n':
@@ -204,7 +204,7 @@ public class ConstantPool implements Clo
* @return String representation
*/
public String constantToString( final int index, final byte tag ) throws ClassFormatException {
- Constant c = getConstant(index, tag);
+ final Constant c = getConstant(index, tag);
return constantToString(c);
}
@@ -343,7 +343,7 @@ public class ConstantPool implements Clo
*/
@Override
public String toString() {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
for (int i = 1; i < constant_pool.length; i++) {
buf.append(i).append(")").append(constant_pool[i]).append("\n");
}
@@ -364,7 +364,7 @@ public class ConstantPool implements Clo
c.constant_pool[i] = constant_pool[i].copy();
}
}
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// TODO should this throw?
}
return c;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantString.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantString.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantString.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantString.java Tue Jun 21 20:50:19 2016
@@ -118,7 +118,7 @@ public final class ConstantString extend
*/
@Override
public Object getConstantValue( final ConstantPool cp ) {
- Constant c = cp.getConstant(string_index, Const.CONSTANT_Utf8);
+ final Constant c = cp.getConstant(string_index, Const.CONSTANT_Utf8);
return ((ConstantUtf8) c).getBytes();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantValue.java Tue Jun 21 20:50:19 2016
@@ -153,7 +153,7 @@ public final class ConstantValue extends
*/
@Override
public Attribute copy( final ConstantPool _constant_pool ) {
- ConstantValue c = (ConstantValue) clone();
+ final ConstantValue c = (ConstantValue) clone();
c.setConstantPool(_constant_pool);
return c;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Deprecated.java Tue Jun 21 20:50:19 2016
@@ -135,7 +135,7 @@ public final class Deprecated extends At
*/
@Override
public Attribute copy( final ConstantPool _constant_pool ) {
- Deprecated c = (Deprecated) clone();
+ final Deprecated c = (Deprecated) clone();
if (bytes != null) {
c.bytes = new byte[bytes.length];
System.arraycopy(bytes, 0, c.bytes, 0, bytes.length);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java Tue Jun 21 20:50:19 2016
@@ -49,7 +49,7 @@ public class DescendingVisitor implement
*/
public Object predecessor(final int level)
{
- int size = stack.size();
+ final int size = stack.size();
if ((size < 2) || (level < 0))
{
return null;
@@ -90,16 +90,16 @@ public class DescendingVisitor implement
{
stack.push(_clazz);
_clazz.accept(visitor);
- Field[] fields = _clazz.getFields();
- for (Field field : fields) {
+ final Field[] fields = _clazz.getFields();
+ for (final Field field : fields) {
field.accept(this);
}
- Method[] methods = _clazz.getMethods();
- for (Method method : methods) {
+ final Method[] methods = _clazz.getMethods();
+ for (final Method method : methods) {
method.accept(this);
}
- Attribute[] attributes = _clazz.getAttributes();
- for (Attribute attribute : attributes) {
+ final Attribute[] attributes = _clazz.getAttributes();
+ for (final Attribute attribute : attributes) {
attribute.accept(this);
}
_clazz.getConstantPool().accept(this);
@@ -114,8 +114,8 @@ public class DescendingVisitor implement
{
stack.push(annotation);
annotation.accept(visitor);
- AnnotationEntry[] entries = annotation.getAnnotationEntries();
- for (AnnotationEntry entrie : entries) {
+ final AnnotationEntry[] entries = annotation.getAnnotationEntries();
+ for (final AnnotationEntry entrie : entries) {
entrie.accept(this);
}
stack.pop();
@@ -137,8 +137,8 @@ public class DescendingVisitor implement
{
stack.push(field);
field.accept(visitor);
- Attribute[] attributes = field.getAttributes();
- for (Attribute attribute : attributes) {
+ final Attribute[] attributes = field.getAttributes();
+ for (final Attribute attribute : attributes) {
attribute.accept(this);
}
stack.pop();
@@ -157,8 +157,8 @@ public class DescendingVisitor implement
{
stack.push(method);
method.accept(visitor);
- Attribute[] attributes = method.getAttributes();
- for (Attribute attribute : attributes) {
+ final Attribute[] attributes = method.getAttributes();
+ for (final Attribute attribute : attributes) {
attribute.accept(this);
}
stack.pop();
@@ -177,12 +177,12 @@ public class DescendingVisitor implement
{
stack.push(code);
code.accept(visitor);
- CodeException[] table = code.getExceptionTable();
- for (CodeException element : table) {
+ final CodeException[] table = code.getExceptionTable();
+ for (final CodeException element : table) {
element.accept(this);
}
- Attribute[] attributes = code.getAttributes();
- for (Attribute attribute : attributes) {
+ final Attribute[] attributes = code.getAttributes();
+ for (final Attribute attribute : attributes) {
attribute.accept(this);
}
stack.pop();
@@ -201,8 +201,8 @@ public class DescendingVisitor implement
{
stack.push(table);
table.accept(visitor);
- LineNumber[] numbers = table.getLineNumberTable();
- for (LineNumber number : numbers) {
+ final LineNumber[] numbers = table.getLineNumberTable();
+ for (final LineNumber number : numbers) {
number.accept(this);
}
stack.pop();
@@ -221,8 +221,8 @@ public class DescendingVisitor implement
{
stack.push(table);
table.accept(visitor);
- LocalVariable[] vars = table.getLocalVariableTable();
- for (LocalVariable var : vars) {
+ final LocalVariable[] vars = table.getLocalVariableTable();
+ for (final LocalVariable var : vars) {
var.accept(this);
}
stack.pop();
@@ -233,8 +233,8 @@ public class DescendingVisitor implement
{
stack.push(table);
table.accept(visitor);
- StackMapEntry[] vars = table.getStackMap();
- for (StackMapEntry var : vars) {
+ final StackMapEntry[] vars = table.getStackMap();
+ for (final StackMapEntry var : vars) {
var.accept(this);
}
stack.pop();
@@ -261,7 +261,7 @@ public class DescendingVisitor implement
{
stack.push(cp);
cp.accept(visitor);
- Constant[] constants = cp.getConstantPool();
+ final Constant[] constants = cp.getConstantPool();
for (int i = 1; i < constants.length; i++)
{
if (constants[i] != null)
@@ -378,8 +378,8 @@ public class DescendingVisitor implement
{
stack.push(ic);
ic.accept(visitor);
- InnerClass[] ics = ic.getInnerClasses();
- for (InnerClass ic2 : ics) {
+ final InnerClass[] ics = ic.getInnerClasses();
+ for (final InnerClass ic2 : ics) {
ic2.accept(this);
}
stack.pop();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java Tue Jun 21 20:50:19 2016
@@ -76,7 +76,7 @@ public abstract class ElementValue
public static ElementValue readElementValue(final DataInput input, final ConstantPool cpool) throws IOException
{
- byte type = input.readByte();
+ final byte type = input.readByte();
switch (type)
{
case PRIMITIVE_BYTE:
@@ -101,8 +101,8 @@ public abstract class ElementValue
return new AnnotationElementValue(ANNOTATION, AnnotationEntry.read(input, cpool, false), cpool);
case ARRAY:
- int numArrayVals = input.readUnsignedShort();
- ElementValue[] evalues = new ElementValue[numArrayVals];
+ final int numArrayVals = input.readUnsignedShort();
+ final ElementValue[] evalues = new ElementValue[numArrayVals];
for (int j = 0; j < numArrayVals; j++)
{
evalues[j] = ElementValue.readElementValue(input, cpool);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValuePair.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValuePair.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValuePair.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValuePair.java Tue Jun 21 20:50:19 2016
@@ -46,7 +46,7 @@ public class ElementValuePair
public String getNameString()
{
- ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant(
+ final ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant(
elementNameIndex, Const.CONSTANT_Utf8);
return c.getBytes();
}
@@ -63,7 +63,7 @@ public class ElementValuePair
public String toShortString()
{
- StringBuilder result = new StringBuilder();
+ final StringBuilder result = new StringBuilder();
result.append(getNameString()).append("=").append(
getValue().toShortString());
return result.toString();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnclosingMethod.java Tue Jun 21 20:50:19 2016
@@ -83,7 +83,7 @@ public class EnclosingMethod extends Att
}
public final ConstantClass getEnclosingClass() {
- ConstantClass c =
+ final ConstantClass c =
(ConstantClass)super.getConstantPool().getConstant(classIndex,Const.CONSTANT_Class);
return c;
}
@@ -92,7 +92,7 @@ public class EnclosingMethod extends Att
if (methodIndex == 0) {
return null;
}
- ConstantNameAndType nat =
+ final ConstantNameAndType nat =
(ConstantNameAndType)super.getConstantPool().getConstant(methodIndex,Const.CONSTANT_NameAndType);
return nat;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/EnumElementValue.java Tue Jun 21 20:50:19 2016
@@ -55,21 +55,21 @@ public class EnumElementValue extends El
@Override
public String stringifyValue()
{
- ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx,
+ final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx,
Const.CONSTANT_Utf8);
return cu8.getBytes();
}
public String getEnumTypeString()
{
- ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(typeIdx,
+ final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(typeIdx,
Const.CONSTANT_Utf8);
return cu8.getBytes();// Utility.signatureToString(cu8.getBytes());
}
public String getEnumValueString()
{
- ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx,
+ final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx,
Const.CONSTANT_Utf8);
return cu8.getBytes();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java Tue Jun 21 20:50:19 2016
@@ -71,7 +71,7 @@ public final class ExceptionTable extend
*/
ExceptionTable(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException {
this(name_index, length, (int[]) null, constant_pool);
- int number_of_exceptions = input.readUnsignedShort();
+ final int number_of_exceptions = input.readUnsignedShort();
exception_index_table = new int[number_of_exceptions];
for (int i = 0; i < number_of_exceptions; i++) {
exception_index_table[i] = input.readUnsignedShort();
@@ -102,7 +102,7 @@ public final class ExceptionTable extend
public final void dump( final DataOutputStream file ) throws IOException {
super.dump(file);
file.writeShort(exception_index_table.length);
- for (int index : exception_index_table) {
+ for (final int index : exception_index_table) {
file.writeShort(index);
}
}
@@ -128,7 +128,7 @@ public final class ExceptionTable extend
* @return class names of thrown exceptions
*/
public final String[] getExceptionNames() {
- String[] names = new String[exception_index_table.length];
+ final String[] names = new String[exception_index_table.length];
for (int i = 0; i < exception_index_table.length; i++) {
names[i] = super.getConstantPool().getConstantString(exception_index_table[i],
Const.CONSTANT_Class).replace('/', '.');
@@ -151,7 +151,7 @@ public final class ExceptionTable extend
*/
@Override
public final String toString() {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
String str;
buf.append("Exceptions: ");
for (int i = 0; i < exception_index_table.length; i++) {
@@ -170,7 +170,7 @@ public final class ExceptionTable extend
*/
@Override
public Attribute copy( final ConstantPool _constant_pool ) {
- ExceptionTable c = (ExceptionTable) clone();
+ final ExceptionTable c = (ExceptionTable) clone();
if (exception_index_table != null) {
c.exception_index_table = new int[exception_index_table.length];
System.arraycopy(exception_index_table, 0, c.exception_index_table, 0,
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Field.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Field.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Field.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Field.java Tue Jun 21 20:50:19 2016
@@ -36,8 +36,8 @@ public final class Field extends FieldOr
@Override
public boolean equals( final Object o1, final Object o2 ) {
- Field THIS = (Field) o1;
- Field THAT = (Field) o2;
+ final Field THIS = (Field) o1;
+ final Field THAT = (Field) o2;
return THIS.getName().equals(THAT.getName())
&& THIS.getSignature().equals(THAT.getSignature());
}
@@ -45,7 +45,7 @@ public final class Field extends FieldOr
@Override
public int hashCode( final Object o ) {
- Field THIS = (Field) o;
+ final Field THIS = (Field) o;
return THIS.getSignature().hashCode() ^ THIS.getName().hashCode();
}
};
@@ -100,7 +100,7 @@ public final class Field extends FieldOr
* @return constant value associated with this field (may be null)
*/
public final ConstantValue getConstantValue() {
- for (Attribute attribute : super.getAttributes()) {
+ for (final Attribute attribute : super.getAttributes()) {
if (attribute.getTag() == Const.ATTR_CONSTANT_VALUE) {
return (ConstantValue) attribute;
}
@@ -126,13 +126,13 @@ public final class Field extends FieldOr
access = access.isEmpty() ? "" : (access + " ");
signature = Utility.signatureToString(getSignature());
name = getName();
- StringBuilder buf = new StringBuilder(64); // CHECKSTYLE IGNORE MagicNumber
+ final StringBuilder buf = new StringBuilder(64); // CHECKSTYLE IGNORE MagicNumber
buf.append(access).append(signature).append(" ").append(name);
- ConstantValue cv = getConstantValue();
+ final ConstantValue cv = getConstantValue();
if (cv != null) {
buf.append(" = ").append(cv);
}
- for (Attribute attribute : super.getAttributes()) {
+ for (final Attribute attribute : super.getAttributes()) {
if (!(attribute instanceof ConstantValue)) {
buf.append(" [").append(attribute).append("]");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/FieldOrMethod.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/FieldOrMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/FieldOrMethod.java Tue Jun 21 20:50:19 2016
@@ -103,7 +103,7 @@ public abstract class FieldOrMethod exte
protected FieldOrMethod(final DataInput file, final ConstantPool constant_pool) throws IOException, ClassFormatException {
this(file.readUnsignedShort(), file.readUnsignedShort(), file.readUnsignedShort(), null,
constant_pool);
- int attributes_count = file.readUnsignedShort();
+ final int attributes_count = file.readUnsignedShort();
attributes = new Attribute[attributes_count];
for (int i = 0; i < attributes_count; i++) {
attributes[i] = Attribute.readAttribute(file, constant_pool);
@@ -140,7 +140,7 @@ public abstract class FieldOrMethod exte
file.writeShort(name_index);
file.writeShort(signature_index);
file.writeShort(attributes.length);
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
attribute.dump(file);
}
}
@@ -239,7 +239,7 @@ public abstract class FieldOrMethod exte
try {
c = (FieldOrMethod)clone();
- } catch(CloneNotSupportedException e) {
+ } catch(final CloneNotSupportedException e) {
// ignored, but will cause NPE ...
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClass.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClass.java Tue Jun 21 20:50:19 2016
@@ -209,7 +209,7 @@ public final class InnerClass implements
public InnerClass copy() {
try {
return (InnerClass) clone();
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// TODO should this throw?
}
return null;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java Tue Jun 21 20:50:19 2016
@@ -71,7 +71,7 @@ public final class InnerClasses extends
InnerClasses(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool)
throws IOException {
this(name_index, length, (InnerClass[]) null, constant_pool);
- int number_of_classes = input.readUnsignedShort();
+ final int number_of_classes = input.readUnsignedShort();
inner_classes = new InnerClass[number_of_classes];
for (int i = 0; i < number_of_classes; i++) {
inner_classes[i] = new InnerClass(input);
@@ -102,7 +102,7 @@ public final class InnerClasses extends
public final void dump( final DataOutputStream file ) throws IOException {
super.dump(file);
file.writeShort(inner_classes.length);
- for (InnerClass inner_class : inner_classes) {
+ for (final InnerClass inner_class : inner_classes) {
inner_class.dump(file);
}
}
@@ -129,11 +129,11 @@ public final class InnerClasses extends
*/
@Override
public final String toString() {
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
buf.append("InnerClasses(");
buf.append(inner_classes.length);
buf.append("):\n");
- for (InnerClass inner_class : inner_classes) {
+ for (final InnerClass inner_class : inner_classes) {
buf.append(inner_class.toString(super.getConstantPool())).append("\n");
}
return buf.toString();
@@ -146,7 +146,7 @@ public final class InnerClasses extends
@Override
public Attribute copy( final ConstantPool _constant_pool ) {
// TODO this could be recoded to use a lower level constructor after creating a copy of the inner classes
- InnerClasses c = (InnerClasses) clone();
+ final InnerClasses c = (InnerClasses) clone();
c.inner_classes = new InnerClass[inner_classes.length];
for (int i = 0; i < inner_classes.length; i++) {
c.inner_classes[i] = inner_classes[i].copy();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/JavaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/JavaClass.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/JavaClass.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/JavaClass.java Tue Jun 21 20:50:19 2016
@@ -77,15 +77,15 @@ public class JavaClass extends AccessFla
@Override
public boolean equals( final Object o1, final Object o2 ) {
- JavaClass THIS = (JavaClass) o1;
- JavaClass THAT = (JavaClass) o2;
+ final JavaClass THIS = (JavaClass) o1;
+ final JavaClass THAT = (JavaClass) o2;
return THIS.getClassName().equals(THAT.getClassName());
}
@Override
public int hashCode( final Object o ) {
- JavaClass THIS = (JavaClass) o;
+ final JavaClass THIS = (JavaClass) o;
return THIS.getClassName().hashCode();
}
};
@@ -144,7 +144,7 @@ public class JavaClass extends AccessFla
this.attributes = attributes;
this.source = source;
// Get source file name if available
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
if (attribute instanceof SourceFile) {
source_file_name = ((SourceFile) attribute).getSourceFileName();
break;
@@ -156,7 +156,7 @@ public class JavaClass extends AccessFla
*/
class_name = constant_pool.getConstantString(class_name_index, Const.CONSTANT_Class);
class_name = Utility.compactClassName(class_name, false);
- int index = class_name.lastIndexOf('.');
+ final int index = class_name.lastIndexOf('.');
if (index < 0) {
package_name = "";
} else {
@@ -172,7 +172,7 @@ public class JavaClass extends AccessFla
}
interface_names = new String[interfaces.length];
for (int i = 0; i < interfaces.length; i++) {
- String str = constant_pool.getConstantString(interfaces[i], Const.CONSTANT_Class);
+ final String str = constant_pool.getConstantString(interfaces[i], Const.CONSTANT_Class);
interface_names[i] = Utility.compactClassName(str, false);
}
}
@@ -230,9 +230,9 @@ public class JavaClass extends AccessFla
* @throws IOException
*/
public void dump(final File file) throws IOException {
- String parent = file.getParent();
+ final String parent = file.getParent();
if (parent != null) {
- File dir = new File(parent);
+ final File dir = new File(parent);
if (!dir.mkdirs()) { // either was not created or already existed
if (!dir.isDirectory()) {
throw new IOException("Could not create the directory " + dir);
@@ -260,16 +260,16 @@ public class JavaClass extends AccessFla
* @return class in binary format
*/
public byte[] getBytes() {
- ByteArrayOutputStream s = new ByteArrayOutputStream();
- DataOutputStream ds = new DataOutputStream(s);
+ final ByteArrayOutputStream s = new ByteArrayOutputStream();
+ final DataOutputStream ds = new DataOutputStream(s);
try {
dump(ds);
- } catch (IOException e) {
+ } catch (final IOException e) {
e.printStackTrace();
} finally {
try {
ds.close();
- } catch (IOException e2) {
+ } catch (final IOException e2) {
e2.printStackTrace();
}
}
@@ -303,20 +303,20 @@ public class JavaClass extends AccessFla
file.writeShort(class_name_index);
file.writeShort(superclass_name_index);
file.writeShort(interfaces.length);
- for (int interface1 : interfaces) {
+ for (final int interface1 : interfaces) {
file.writeShort(interface1);
}
file.writeShort(fields.length);
- for (Field field : fields) {
+ for (final Field field : fields) {
field.dump(file);
}
file.writeShort(methods.length);
- for (Method method : methods) {
+ for (final Method method : methods) {
method.dump(file);
}
if (attributes != null) {
file.writeShort(attributes.length);
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
attribute.dump(file);
}
} else {
@@ -432,7 +432,7 @@ public class JavaClass extends AccessFla
* java.lang.reflect.Method if any
*/
public Method getMethod( final java.lang.reflect.Method m ) {
- for (Method method : methods) {
+ for (final Method method : methods) {
if (m.getName().equals(method.getName()) && (m.getModifiers() == method.getModifiers())
&& Type.getSignature(m).equals(method.getSignature())) {
return method;
@@ -596,11 +596,11 @@ public class JavaClass extends AccessFla
public String toString() {
String access = Utility.accessToString(super.getAccessFlags(), true);
access = access.isEmpty() ? "" : (access + " ");
- StringBuilder buf = new StringBuilder(128);
+ final StringBuilder buf = new StringBuilder(128);
buf.append(access).append(Utility.classOrInterface(super.getAccessFlags())).append(" ").append(
class_name).append(" extends ").append(
Utility.compactClassName(superclass_name, false)).append('\n');
- int size = interfaces.length;
+ final int size = interfaces.length;
if (size > 0) {
buf.append("implements\t\t");
for (int i = 0; i < size; i++) {
@@ -619,26 +619,26 @@ public class JavaClass extends AccessFla
buf.append("ACC_SUPER flag\t\t").append(isSuper()).append("\n");
if (attributes.length > 0) {
buf.append("\nAttribute(s):\n");
- for (Attribute attribute : attributes) {
+ for (final Attribute attribute : attributes) {
buf.append(indent(attribute));
}
}
- AnnotationEntry[] annotations = getAnnotationEntries();
+ final AnnotationEntry[] annotations = getAnnotationEntries();
if (annotations!=null && annotations.length>0) {
buf.append("\nAnnotation(s):\n");
- for (AnnotationEntry annotation : annotations) {
+ for (final AnnotationEntry annotation : annotations) {
buf.append(indent(annotation));
}
}
if (fields.length > 0) {
buf.append("\n").append(fields.length).append(" fields:\n");
- for (Field field : fields) {
+ for (final Field field : fields) {
buf.append("\t").append(field).append('\n');
}
}
if (methods.length > 0) {
buf.append("\n").append(methods.length).append(" methods:\n");
- for (Method method : methods) {
+ for (final Method method : methods) {
buf.append("\t").append(method).append('\n');
}
}
@@ -647,8 +647,8 @@ public class JavaClass extends AccessFla
private static String indent( final Object obj ) {
- StringTokenizer tok = new StringTokenizer(obj.toString(), "\n");
- StringBuilder buf = new StringBuilder();
+ final StringTokenizer tok = new StringTokenizer(obj.toString(), "\n");
+ final StringBuilder buf = new StringBuilder();
while (tok.hasMoreTokens()) {
buf.append("\t").append(tok.nextToken()).append("\n");
}
@@ -678,7 +678,7 @@ public class JavaClass extends AccessFla
for (int i = 0; i < attributes.length; i++) {
c.attributes[i] = attributes[i].copy(c.constant_pool);
}
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// TODO should this throw?
}
return c;
@@ -714,10 +714,10 @@ public class JavaClass extends AccessFla
if (computedNestedTypeStatus) {
return;
}
- for (Attribute attribute : this.attributes) {
+ for (final Attribute attribute : this.attributes) {
if (attribute instanceof InnerClasses) {
- InnerClass[] innerClasses = ((InnerClasses) attribute).getInnerClasses();
- for (InnerClass innerClasse : innerClasses) {
+ final InnerClass[] innerClasses = ((InnerClasses) attribute).getInnerClasses();
+ for (final InnerClass innerClasse : innerClasses) {
boolean innerClassAttributeRefersToMe = false;
String inner_class_name = constant_pool.getConstantString(innerClasse.getInnerClassIndex(),
Const.CONSTANT_Class);
@@ -774,8 +774,8 @@ public class JavaClass extends AccessFla
if (this.equals(super_class)) {
return true;
}
- JavaClass[] super_classes = getSuperClasses();
- for (JavaClass super_classe : super_classes) {
+ final JavaClass[] super_classes = getSuperClasses();
+ for (final JavaClass super_classe : super_classes) {
if (super_classe.equals(super_class)) {
return true;
}
@@ -799,8 +799,8 @@ public class JavaClass extends AccessFla
if (this.equals(inter)) {
return true;
}
- JavaClass[] super_interfaces = getAllInterfaces();
- for (JavaClass super_interface : super_interfaces) {
+ final JavaClass[] super_interfaces = getAllInterfaces();
+ for (final JavaClass super_interface : super_interfaces) {
if (super_interface.equals(inter)) {
return true;
}
@@ -829,7 +829,7 @@ public class JavaClass extends AccessFla
*/
public JavaClass[] getSuperClasses() throws ClassNotFoundException {
JavaClass clazz = this;
- List<JavaClass> allSuperClasses = new ArrayList<>();
+ final List<JavaClass> allSuperClasses = new ArrayList<>();
for (clazz = clazz.getSuperClass(); clazz != null; clazz = clazz.getSuperClass()) {
allSuperClasses.add(clazz);
}
@@ -841,8 +841,8 @@ public class JavaClass extends AccessFla
* Get interfaces directly implemented by this JavaClass.
*/
public JavaClass[] getInterfaces() throws ClassNotFoundException {
- String[] _interfaces = getInterfaceNames();
- JavaClass[] classes = new JavaClass[_interfaces.length];
+ final String[] _interfaces = getInterfaceNames();
+ final JavaClass[] classes = new JavaClass[_interfaces.length];
for (int i = 0; i < _interfaces.length; i++) {
classes[i] = repository.loadClass(_interfaces[i]);
}
@@ -854,13 +854,13 @@ public class JavaClass extends AccessFla
* Get all interfaces implemented by this JavaClass (transitively).
*/
public JavaClass[] getAllInterfaces() throws ClassNotFoundException {
- ClassQueue queue = new ClassQueue();
- Set<JavaClass> allInterfaces = new TreeSet<>();
+ final ClassQueue queue = new ClassQueue();
+ final Set<JavaClass> allInterfaces = new TreeSet<>();
queue.enqueue(this);
while (!queue.empty()) {
- JavaClass clazz = queue.dequeue();
- JavaClass souper = clazz.getSuperClass();
- JavaClass[] _interfaces = clazz.getInterfaces();
+ final JavaClass clazz = queue.dequeue();
+ final JavaClass souper = clazz.getSuperClass();
+ final JavaClass[] _interfaces = clazz.getInterfaces();
if (clazz.isInterface()) {
allInterfaces.add(clazz);
} else {
@@ -868,7 +868,7 @@ public class JavaClass extends AccessFla
queue.enqueue(souper);
}
}
- for (JavaClass _interface : _interfaces) {
+ for (final JavaClass _interface : _interfaces) {
queue.enqueue(_interface);
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumber.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumber.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumber.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumber.java Tue Jun 21 20:50:19 2016
@@ -140,7 +140,7 @@ public final class LineNumber implements
public LineNumber copy() {
try {
return (LineNumber) clone();
- } catch (CloneNotSupportedException e) {
+ } catch (final CloneNotSupportedException e) {
// TODO should this throw?
}
return null;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java?rev=1749603&r1=1749602&r2=1749603&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java Tue Jun 21 20:50:19 2016
@@ -71,7 +71,7 @@ public final class LineNumberTable exten
LineNumberTable(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool)
throws IOException {
this(name_index, length, (LineNumber[]) null, constant_pool);
- int line_number_table_length = input.readUnsignedShort();
+ final 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);
@@ -102,7 +102,7 @@ public final class LineNumberTable exten
public final void dump( final DataOutputStream file ) throws IOException {
super.dump(file);
file.writeShort(line_number_table.length);
- for (LineNumber lineNumber : line_number_table) {
+ for (final LineNumber lineNumber : line_number_table) {
lineNumber.dump(file);
}
}
@@ -129,9 +129,9 @@ public final class LineNumberTable exten
*/
@Override
public final String toString() {
- StringBuilder buf = new StringBuilder();
- StringBuilder line = new StringBuilder();
- String newLine = System.getProperty("line.separator", "\n");
+ final StringBuilder buf = new StringBuilder();
+ final StringBuilder line = new StringBuilder();
+ final String newLine = System.getProperty("line.separator", "\n");
for (int i = 0; i < line_number_table.length; i++) {
line.append(line_number_table[i].toString());
if (i < line_number_table.length - 1) {
@@ -165,8 +165,8 @@ public final class LineNumberTable exten
/* Do a binary search since the array is ordered.
*/
do {
- int i = (l + r) / 2;
- int j = line_number_table[i].getStartPC();
+ final int i = (l + r) / 2;
+ final int j = line_number_table[i].getStartPC();
if (j == pos) {
return line_number_table[i].getLineNumber();
} else if (pos < j) {
@@ -200,7 +200,7 @@ public final class LineNumberTable exten
public Attribute copy( final ConstantPool _constant_pool ) {
// TODO could use the lower level constructor and thereby allow
// line_number_table to be made final
- LineNumberTable c = (LineNumberTable) clone();
+ final LineNumberTable c = (LineNumberTable) clone();
c.line_number_table = new LineNumber[line_number_table.length];
for (int i = 0; i < line_number_table.length; i++) {
c.line_number_table[i] = line_number_table[i].copy();