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/01 04:25:32 UTC
svn commit: r1746378 [8/13] - in /commons/proper/bcel/trunk/src:
main/java/org/apache/commons/bcel6/
main/java/org/apache/commons/bcel6/classfile/
main/java/org/apache/commons/bcel6/generic/
main/java/org/apache/commons/bcel6/util/ main/java/org/apache...
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java Wed Jun 1 04:25:27 2016
@@ -49,8 +49,8 @@ public class LocalVariableGen implements
* @param start from where the instruction is valid (null means from the start)
* @param end until where the instruction is valid (null means to the end)
*/
- public LocalVariableGen(int index, String name, Type type, InstructionHandle start,
- InstructionHandle end) {
+ public LocalVariableGen(final int index, final String name, final Type type, final InstructionHandle start,
+ final InstructionHandle end) {
if ((index < 0) || (index > Const.MAX_SHORT)) {
throw new ClassGenException("Invalid index index: " + index);
}
@@ -76,7 +76,7 @@ public class LocalVariableGen implements
*
* @param cp constant pool
*/
- public LocalVariable getLocalVariable( ConstantPoolGen cp ) {
+ public LocalVariable getLocalVariable( final ConstantPoolGen cp ) {
int start_pc = 0;
int length = 0;
if ((start != null) && (end != null)) {
@@ -93,7 +93,7 @@ public class LocalVariableGen implements
}
- public void setIndex( int index ) {
+ public void setIndex( final int index ) {
this.index = index;
}
@@ -104,7 +104,7 @@ public class LocalVariableGen implements
@Override
- public void setName( String name ) {
+ public void setName( final String name ) {
this.name = name;
}
@@ -116,7 +116,7 @@ public class LocalVariableGen implements
@Override
- public void setType( Type type ) {
+ public void setType( final Type type ) {
this.type = type;
}
@@ -137,13 +137,13 @@ public class LocalVariableGen implements
}
- public void setStart( InstructionHandle start ) { // TODO could be package-protected?
+ public void setStart( final InstructionHandle start ) { // TODO could be package-protected?
BranchInstruction.notifyTarget(this.start, start, this);
this.start = start;
}
- public void setEnd( InstructionHandle end ) { // TODO could be package-protected?
+ public void setEnd( final InstructionHandle end ) { // TODO could be package-protected?
BranchInstruction.notifyTarget(this.end, end, this);
this.end = end;
}
@@ -154,7 +154,7 @@ public class LocalVariableGen implements
* @param new_ih new target
*/
@Override
- public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
+ public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) {
boolean targeted = false;
if (start == old_ih) {
targeted = true;
@@ -182,7 +182,7 @@ public class LocalVariableGen implements
* @return true, if ih is target of this variable
*/
@Override
- public boolean containsTarget( InstructionHandle ih ) {
+ public boolean containsTarget( final InstructionHandle ih ) {
return (start == ih) || (end == ih);
}
@@ -200,7 +200,7 @@ public class LocalVariableGen implements
* are valid in the same range.
*/
@Override
- public boolean equals( Object o ) {
+ public boolean equals( final Object o ) {
if (!(o instanceof LocalVariableGen)) {
return false;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableInstruction.java Wed Jun 1 04:25:27 2016
@@ -51,7 +51,7 @@ public abstract class LocalVariableInstr
* Instruction.readInstruction(). Not to be used otherwise.
* tag and length are defined in readInstruction and initFromFile, respectively.
*/
- LocalVariableInstruction(short canon_tag, short c_tag) {
+ LocalVariableInstruction(final short canon_tag, final short c_tag) {
super();
this.canon_tag = canon_tag;
this.c_tag = c_tag;
@@ -71,7 +71,7 @@ public abstract class LocalVariableInstr
* @param c_tag Instruction number for compact version, ALOAD_0, e.g.
* @param n local variable index (unsigned short)
*/
- protected LocalVariableInstruction(short opcode, short c_tag, int n) {
+ protected LocalVariableInstruction(final short opcode, final short c_tag, final int n) {
super(opcode, (short) 2);
this.c_tag = c_tag;
canon_tag = opcode;
@@ -84,7 +84,7 @@ public abstract class LocalVariableInstr
* @param out Output stream
*/
@Override
- public void dump( DataOutputStream out ) throws IOException {
+ public void dump( final DataOutputStream out ) throws IOException {
if (wide()) {
out.writeByte(Const.WIDE);
}
@@ -109,7 +109,7 @@ public abstract class LocalVariableInstr
* @return mnemonic for instruction
*/
@Override
- public String toString( boolean verbose ) {
+ public String toString( final boolean verbose ) {
final short _opcode = super.getOpcode();
if (((_opcode >= Const.ILOAD_0) && (_opcode <= Const.ALOAD_3))
|| ((_opcode >= Const.ISTORE_0) && (_opcode <= Const.ASTORE_3))) {
@@ -126,7 +126,7 @@ public abstract class LocalVariableInstr
* </pre>
*/
@Override
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
+ protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException {
if (wide) {
n = bytes.readUnsignedShort();
super.setLength(4);
@@ -163,7 +163,7 @@ public abstract class LocalVariableInstr
* @see #setIndexOnly(int)
*/
@Override
- public void setIndex( int n ) { // TODO could be package-protected?
+ public void setIndex( final int n ) { // TODO could be package-protected?
if ((n < 0) || (n > Const.MAX_SHORT)) {
throw new ClassGenException("Illegal value: " + n);
}
@@ -199,7 +199,7 @@ public abstract class LocalVariableInstr
* @return type associated with the instruction
*/
@Override
- public Type getType( ConstantPoolGen cp ) {
+ public Type getType( final ConstantPoolGen cp ) {
switch (canon_tag) {
case Const.ILOAD:
case Const.ISTORE:
@@ -226,7 +226,7 @@ public abstract class LocalVariableInstr
* @since 6.0
* @see #setIndex(int)
*/
- final void setIndexOnly(int n) {
+ final void setIndexOnly(final int n) {
this.n = n;
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITORENTER.java Wed Jun 1 04:25:27 2016
@@ -49,7 +49,7 @@ public class MONITORENTER extends Instru
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
v.visitMONITORENTER(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MONITOREXIT.java Wed Jun 1 04:25:27 2016
@@ -49,7 +49,7 @@ public class MONITOREXIT extends Instruc
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
v.visitMONITOREXIT(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java Wed Jun 1 04:25:27 2016
@@ -44,7 +44,7 @@ public class MULTIANEWARRAY extends CPIn
}
- public MULTIANEWARRAY(int index, short dimensions) {
+ public MULTIANEWARRAY(final int index, final short dimensions) {
super(org.apache.commons.bcel6.Const.MULTIANEWARRAY, index);
if (dimensions < 1) {
throw new ClassGenException("Invalid dimensions value: " + dimensions);
@@ -59,7 +59,7 @@ public class MULTIANEWARRAY extends CPIn
* @param out Output stream
*/
@Override
- public void dump( DataOutputStream out ) throws IOException {
+ public void dump( final DataOutputStream out ) throws IOException {
out.writeByte(super.getOpcode());
out.writeShort(super.getIndex());
out.writeByte(dimensions);
@@ -70,7 +70,7 @@ public class MULTIANEWARRAY extends CPIn
* Read needed data (i.e., no. dimension) from file.
*/
@Override
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
+ protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException {
super.initFromFile(bytes, wide);
dimensions = bytes.readByte();
super.setLength(4);
@@ -89,7 +89,7 @@ public class MULTIANEWARRAY extends CPIn
* @return mnemonic for instruction
*/
@Override
- public String toString( boolean verbose ) {
+ public String toString( final boolean verbose ) {
return super.toString(verbose) + " " + super.getIndex() + " " + dimensions;
}
@@ -98,7 +98,7 @@ public class MULTIANEWARRAY extends CPIn
* @return mnemonic for instruction with symbolic references resolved
*/
@Override
- public String toString( ConstantPool cp ) {
+ public String toString( final ConstantPool cp ) {
return super.toString(cp) + " " + dimensions;
}
@@ -109,7 +109,7 @@ public class MULTIANEWARRAY extends CPIn
* @return Number of words consumed from stack by this instruction
*/
@Override
- public int consumeStack( ConstantPoolGen cpg ) {
+ public int consumeStack( final ConstantPoolGen cpg ) {
return dimensions;
}
@@ -123,7 +123,7 @@ public class MULTIANEWARRAY extends CPIn
@Override
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
+ public ObjectType getLoadClassType( final ConstantPoolGen cpg ) {
Type t = getType(cpg);
if (t instanceof ArrayType) {
t = ((ArrayType) t).getBasicType();
@@ -141,7 +141,7 @@ public class MULTIANEWARRAY extends CPIn
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitLoadClass(this);
v.visitAllocationInstruction(this);
v.visitExceptionThrower(this);
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=1746378&r1=1746377&r2=1746378&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 Wed Jun 1 04:25:27 2016
@@ -78,7 +78,7 @@ public class MethodGen extends FieldGenO
private static BCELComparator _cmp = new BCELComparator() {
@Override
- public boolean equals( Object o1, Object o2 ) {
+ public boolean equals( final Object o1, final Object o2 ) {
MethodGen THIS = (MethodGen) o1;
MethodGen THAT = (MethodGen) o2;
return THIS.getName().equals(THAT.getName())
@@ -87,7 +87,7 @@ public class MethodGen extends FieldGenO
@Override
- public int hashCode( Object o ) {
+ public int hashCode( final Object o ) {
MethodGen THIS = (MethodGen) o;
return THIS.getSignature().hashCode() ^ THIS.getName().hashCode();
}
@@ -116,8 +116,8 @@ public class MethodGen extends FieldGenO
* abstract or native methods
* @param cp constant pool
*/
- public MethodGen(int access_flags, Type return_type, Type[] arg_types, String[] arg_names,
- String method_name, String class_name, InstructionList il, ConstantPoolGen cp) {
+ public MethodGen(final int access_flags, final Type return_type, final Type[] arg_types, String[] arg_names,
+ final String method_name, final String class_name, final InstructionList il, final ConstantPoolGen cp) {
super(access_flags);
setType(return_type);
setArgumentTypes(arg_types);
@@ -173,7 +173,7 @@ public class MethodGen extends FieldGenO
* @param class_name class name containing this method
* @param cp constant pool
*/
- public MethodGen(Method m, String class_name, ConstantPoolGen cp) {
+ public MethodGen(final Method m, final String class_name, final ConstantPoolGen cp) {
this(m.getAccessFlags(), Type.getReturnType(m.getSignature()), Type.getArgumentTypes(m
.getSignature()), null /* may be overridden anyway */
, m.getName(), class_name,
@@ -271,8 +271,8 @@ public class MethodGen extends FieldGenO
* @return new local variable object
* @see LocalVariable
*/
- public LocalVariableGen addLocalVariable( String name, Type type, int slot,
- InstructionHandle start, InstructionHandle end ) {
+ public LocalVariableGen addLocalVariable( final String name, final Type type, final int slot,
+ final InstructionHandle start, final InstructionHandle end ) {
byte t = type.getType();
if (t != Const.T_ADDRESS) {
int add = type.getSize();
@@ -305,8 +305,8 @@ public class MethodGen extends FieldGenO
* @return new local variable object
* @see LocalVariable
*/
- public LocalVariableGen addLocalVariable( String name, Type type, InstructionHandle start,
- InstructionHandle end ) {
+ public LocalVariableGen addLocalVariable( final String name, final Type type, final InstructionHandle start,
+ final InstructionHandle end ) {
return addLocalVariable(name, type, max_locals, start, end);
}
@@ -315,7 +315,7 @@ public class MethodGen extends FieldGenO
* Remove a local variable, its slot will not be reused, if you do not use addLocalVariable
* with an explicit index argument.
*/
- public void removeLocalVariable( LocalVariableGen l ) {
+ public void removeLocalVariable( final LocalVariableGen l ) {
l.dispose();
variable_vec.remove(l);
}
@@ -353,7 +353,7 @@ public class MethodGen extends FieldGenO
if (size > 1) {
Arrays.sort(lg, new Comparator<LocalVariableGen>() {
@Override
- public int compare(LocalVariableGen o1, LocalVariableGen o2) {
+ public int compare(final LocalVariableGen o1, final LocalVariableGen o2) {
return o1.getIndex() - o2.getIndex();
}
});
@@ -365,7 +365,7 @@ public class MethodGen extends FieldGenO
/**
* @return `LocalVariableTable' attribute of all the local variables of this method.
*/
- public LocalVariableTable getLocalVariableTable( ConstantPoolGen cp ) {
+ public LocalVariableTable getLocalVariableTable( final ConstantPoolGen cp ) {
LocalVariableGen[] lg = getLocalVariables();
int size = lg.length;
LocalVariable[] lv = new LocalVariable[size];
@@ -384,7 +384,7 @@ public class MethodGen extends FieldGenO
* @return new line number object
* @see LineNumber
*/
- public LineNumberGen addLineNumber( InstructionHandle ih, int src_line ) {
+ public LineNumberGen addLineNumber( final InstructionHandle ih, final int src_line ) {
LineNumberGen l = new LineNumberGen(ih, src_line);
line_number_vec.add(l);
return l;
@@ -394,7 +394,7 @@ public class MethodGen extends FieldGenO
/**
* Remove a line number.
*/
- public void removeLineNumber( LineNumberGen l ) {
+ public void removeLineNumber( final LineNumberGen l ) {
line_number_vec.remove(l);
}
@@ -420,7 +420,7 @@ public class MethodGen extends FieldGenO
/**
* @return `LineNumberTable' attribute of all the local variables of this method.
*/
- public LineNumberTable getLineNumberTable( ConstantPoolGen cp ) {
+ public LineNumberTable getLineNumberTable( final ConstantPoolGen cp ) {
int size = line_number_vec.size();
LineNumber[] ln = new LineNumber[size];
for (int i = 0; i < size; i++) {
@@ -442,8 +442,8 @@ public class MethodGen extends FieldGenO
* exception is handled
* @return new exception handler object
*/
- public CodeExceptionGen addExceptionHandler( InstructionHandle start_pc,
- InstructionHandle end_pc, InstructionHandle handler_pc, ObjectType catch_type ) {
+ public CodeExceptionGen addExceptionHandler( final InstructionHandle start_pc,
+ final InstructionHandle end_pc, final InstructionHandle handler_pc, final ObjectType catch_type ) {
if ((start_pc == null) || (end_pc == null) || (handler_pc == null)) {
throw new ClassGenException("Exception handler target is null instruction");
}
@@ -456,7 +456,7 @@ public class MethodGen extends FieldGenO
/**
* Remove an exception handler.
*/
- public void removeExceptionHandler( CodeExceptionGen c ) {
+ public void removeExceptionHandler( final CodeExceptionGen c ) {
exception_vec.remove(c);
}
@@ -498,7 +498,7 @@ public class MethodGen extends FieldGenO
*
* @param class_name (fully qualified) name of exception
*/
- public void addException( String class_name ) {
+ public void addException( final String class_name ) {
throws_vec.add(class_name);
}
@@ -506,7 +506,7 @@ public class MethodGen extends FieldGenO
/**
* Remove an exception.
*/
- public void removeException( String c ) {
+ public void removeException( final String c ) {
throws_vec.remove(c);
}
@@ -532,7 +532,7 @@ public class MethodGen extends FieldGenO
/**
* @return `Exceptions' attribute of all the exceptions thrown by this method.
*/
- private ExceptionTable getExceptionTable( ConstantPoolGen cp ) {
+ private ExceptionTable getExceptionTable( final ConstantPoolGen cp ) {
int size = throws_vec.size();
int[] ex = new int[size];
for (int i = 0; i < size; i++) {
@@ -551,7 +551,7 @@ public class MethodGen extends FieldGenO
*
* @param a attribute to be added
*/
- public void addCodeAttribute( Attribute a ) {
+ public void addCodeAttribute( final Attribute a ) {
code_attrs_vec.add(a);
}
@@ -559,7 +559,7 @@ public class MethodGen extends FieldGenO
/**
* Remove a code attribute.
*/
- public void removeCodeAttribute( Attribute a ) {
+ public void removeCodeAttribute( final Attribute a ) {
code_attrs_vec.remove(a);
}
@@ -584,7 +584,7 @@ public class MethodGen extends FieldGenO
/**
* @since 6.0
*/
- public void addAnnotationsAsAttribute(ConstantPoolGen cp) {
+ public void addAnnotationsAsAttribute(final ConstantPoolGen cp) {
Attribute[] attrs = AnnotationEntryGen.getAnnotationAttributes(cp, super.getAnnotationEntries());
for (Attribute attr : attrs) {
addAttribute(attr);
@@ -594,7 +594,7 @@ public class MethodGen extends FieldGenO
/**
* @since 6.0
*/
- public void addParameterAnnotationsAsAttribute(ConstantPoolGen cp) {
+ public void addParameterAnnotationsAsAttribute(final ConstantPoolGen cp) {
if (!hasParameterAnnotations) {
return;
}
@@ -715,7 +715,7 @@ public class MethodGen extends FieldGenO
/**
* Set maximum number of local variables.
*/
- public void setMaxLocals( int m ) {
+ public void setMaxLocals( final int m ) {
max_locals = m;
}
@@ -728,7 +728,7 @@ public class MethodGen extends FieldGenO
/**
* Set maximum stack size for this method.
*/
- public void setMaxStack( int m ) { // TODO could be package-protected?
+ public void setMaxStack( final int m ) { // TODO could be package-protected?
max_stack = m;
}
@@ -745,12 +745,12 @@ public class MethodGen extends FieldGenO
}
- public void setClassName( String class_name ) { // TODO could be package-protected?
+ public void setClassName( final String class_name ) { // TODO could be package-protected?
this.class_name = class_name;
}
- public void setReturnType( Type return_type ) {
+ public void setReturnType( final Type return_type ) {
setType(return_type);
}
@@ -760,7 +760,7 @@ public class MethodGen extends FieldGenO
}
- public void setArgumentTypes( Type[] arg_types ) {
+ public void setArgumentTypes( final Type[] arg_types ) {
this.arg_types = arg_types;
}
@@ -770,17 +770,17 @@ public class MethodGen extends FieldGenO
}
- public void setArgumentType( int i, Type type ) {
+ public void setArgumentType( final int i, final Type type ) {
arg_types[i] = type;
}
- public Type getArgumentType( int i ) {
+ public Type getArgumentType( final int i ) {
return arg_types[i];
}
- public void setArgumentNames( String[] arg_names ) {
+ public void setArgumentNames( final String[] arg_names ) {
this.arg_names = arg_names;
}
@@ -790,12 +790,12 @@ public class MethodGen extends FieldGenO
}
- public void setArgumentName( int i, String name ) {
+ public void setArgumentName( final int i, final String name ) {
arg_names[i] = name;
}
- public String getArgumentName( int i ) {
+ public String getArgumentName( final int i ) {
return arg_names[i];
}
@@ -805,7 +805,7 @@ public class MethodGen extends FieldGenO
}
- public void setInstructionList( InstructionList il ) { // TODO could be package-protected?
+ public void setInstructionList( final InstructionList il ) { // TODO could be package-protected?
this.il = il;
}
@@ -860,7 +860,7 @@ public class MethodGen extends FieldGenO
/** Do not/Do produce attributes code attributesLineNumberTable and
* LocalVariableTable, like javac -O
*/
- public void stripAttributes( boolean flag ) {
+ public void stripAttributes( final boolean flag ) {
strip_attributes = flag;
}
@@ -870,7 +870,7 @@ public class MethodGen extends FieldGenO
final int stackDepth;
- BranchTarget(InstructionHandle target, int stackDepth) {
+ BranchTarget(final InstructionHandle target, final int stackDepth) {
this.target = target;
this.stackDepth = stackDepth;
}
@@ -882,7 +882,7 @@ public class MethodGen extends FieldGenO
private final Hashtable<InstructionHandle, BranchTarget> visitedTargets = new Hashtable<>();
- public void push( InstructionHandle target, int stackDepth ) {
+ public void push( final InstructionHandle target, final int stackDepth ) {
if (visited(target)) {
return;
}
@@ -899,14 +899,14 @@ public class MethodGen extends FieldGenO
}
- private BranchTarget visit( InstructionHandle target, int stackDepth ) {
+ private BranchTarget visit( final InstructionHandle target, final int stackDepth ) {
BranchTarget bt = new BranchTarget(target, stackDepth);
visitedTargets.put(target, bt);
return bt;
}
- private boolean visited( InstructionHandle target ) {
+ private boolean visited( final InstructionHandle target ) {
return visitedTargets.get(target) != null;
}
}
@@ -917,7 +917,7 @@ public class MethodGen extends FieldGenO
*
* @return maximum stack depth used by method
*/
- public static int getMaxStack( ConstantPoolGen cp, InstructionList il, CodeExceptionGen[] et ) {
+ public static int getMaxStack( final ConstantPoolGen cp, final InstructionList il, final CodeExceptionGen[] et ) {
BranchStack branchTargets = new BranchStack();
/* Initially, populate the branch stack with the exception
* handlers, because these aren't (necessarily) branched to
@@ -993,7 +993,7 @@ public class MethodGen extends FieldGenO
/** Add observer for this object.
*/
- public void addObserver( MethodObserver o ) {
+ public void addObserver( final MethodObserver o ) {
if (observers == null) {
observers = new ArrayList<>();
}
@@ -1003,7 +1003,7 @@ public class MethodGen extends FieldGenO
/** Remove observer for this object.
*/
- public void removeObserver( MethodObserver o ) {
+ public void removeObserver( final MethodObserver o ) {
if (observers != null) {
observers.remove(o);
}
@@ -1053,7 +1053,7 @@ public class MethodGen extends FieldGenO
/** @return deep copy of this method
*/
- public MethodGen copy( String class_name, ConstantPoolGen cp ) {
+ public MethodGen copy( final String class_name, final ConstantPoolGen cp ) {
Method m = ((MethodGen) clone()).getMethod();
MethodGen mg = new MethodGen(m, class_name, super.getConstantPool());
if (super.getConstantPool() != cp) {
@@ -1069,7 +1069,7 @@ public class MethodGen extends FieldGenO
* Return a list of AnnotationGen objects representing parameter annotations
* @since 6.0
*/
- public List<AnnotationEntryGen> getAnnotationsOnParameter(int i) {
+ public List<AnnotationEntryGen> getAnnotationsOnParameter(final int i) {
ensureExistingParameterAnnotationsUnpacked();
if (!hasParameterAnnotations || i>arg_types.length) {
return null;
@@ -1135,7 +1135,7 @@ public class MethodGen extends FieldGenO
haveUnpackedParameterAnnotations = true;
}
- private List<AnnotationEntryGen> makeMutableVersion(AnnotationEntry[] mutableArray)
+ private List<AnnotationEntryGen> makeMutableVersion(final AnnotationEntry[] mutableArray)
{
List<AnnotationEntryGen> result = new ArrayList<>();
for (AnnotationEntry element : mutableArray) {
@@ -1145,8 +1145,8 @@ public class MethodGen extends FieldGenO
return result;
}
- public void addParameterAnnotation(int parameterIndex,
- AnnotationEntryGen annotation)
+ public void addParameterAnnotation(final int parameterIndex,
+ final AnnotationEntryGen annotation)
{
ensureExistingParameterAnnotationsUnpacked();
if (!hasParameterAnnotations)
@@ -1183,7 +1183,7 @@ public class MethodGen extends FieldGenO
/**
* @param comparator Comparison strategy object
*/
- public static void setComparator( BCELComparator comparator ) {
+ public static void setComparator( final BCELComparator comparator ) {
_cmp = comparator;
}
@@ -1196,7 +1196,7 @@ public class MethodGen extends FieldGenO
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
- public boolean equals( Object obj ) {
+ public boolean equals( final Object obj ) {
return _cmp.equals(this, obj);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEW.java Wed Jun 1 04:25:27 2016
@@ -36,7 +36,7 @@ public class NEW extends CPInstruction i
}
- public NEW(int index) {
+ public NEW(final int index) {
super(org.apache.commons.bcel6.Const.NEW, index);
}
@@ -50,7 +50,7 @@ public class NEW extends CPInstruction i
@Override
- public ObjectType getLoadClassType( ConstantPoolGen cpg ) {
+ public ObjectType getLoadClassType( final ConstantPoolGen cpg ) {
return (ObjectType) getType(cpg);
}
@@ -64,7 +64,7 @@ public class NEW extends CPInstruction i
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitLoadClass(this);
v.visitAllocationInstruction(this);
v.visitExceptionThrower(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java Wed Jun 1 04:25:27 2016
@@ -44,13 +44,13 @@ public class NEWARRAY extends Instructio
}
- public NEWARRAY(byte type) {
+ public NEWARRAY(final byte type) {
super(org.apache.commons.bcel6.Const.NEWARRAY, (short) 2);
this.type = type;
}
- public NEWARRAY(BasicType type) {
+ public NEWARRAY(final BasicType type) {
this(type.getType());
}
@@ -60,7 +60,7 @@ public class NEWARRAY extends Instructio
* @param out Output stream
*/
@Override
- public void dump( DataOutputStream out ) throws IOException {
+ public void dump( final DataOutputStream out ) throws IOException {
out.writeByte(super.getOpcode());
out.writeByte(type);
}
@@ -86,7 +86,7 @@ public class NEWARRAY extends Instructio
* @return mnemonic for instruction
*/
@Override
- public String toString( boolean verbose ) {
+ public String toString( final boolean verbose ) {
return super.toString(verbose) + " " + org.apache.commons.bcel6.Const.getTypeName(type);
}
@@ -95,7 +95,7 @@ public class NEWARRAY extends Instructio
* Read needed data (e.g. index) from file.
*/
@Override
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
+ protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException {
type = bytes.readByte();
super.setLength(2);
}
@@ -118,7 +118,7 @@ public class NEWARRAY extends Instructio
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitAllocationInstruction(this);
v.visitExceptionThrower(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NOP.java Wed Jun 1 04:25:27 2016
@@ -38,7 +38,7 @@ public class NOP extends Instruction {
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitNOP(this);
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java Wed Jun 1 04:25:27 2016
@@ -35,18 +35,18 @@ public abstract class NameSignatureInstr
super();
}
- public NameSignatureInstruction(short opcode, int index) {
+ public NameSignatureInstruction(final short opcode, final int index) {
super(opcode, index);
}
- public ConstantNameAndType getNameAndType(ConstantPoolGen cpg) {
+ public ConstantNameAndType getNameAndType(final ConstantPoolGen cpg) {
ConstantPool cp = cpg.getConstantPool();
ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex());
return (ConstantNameAndType) cp.getConstant(cmr.getNameAndTypeIndex());
}
/** @return signature of referenced method/field.
*/
- public String getSignature(ConstantPoolGen cpg) {
+ public String getSignature(final ConstantPoolGen cpg) {
ConstantPool cp = cpg.getConstantPool();
ConstantNameAndType cnat = getNameAndType(cpg);
return ((ConstantUtf8) cp.getConstant(cnat.getSignatureIndex())).getBytes();
@@ -54,7 +54,7 @@ public abstract class NameSignatureInstr
/** @return name of referenced method/field.
*/
- public String getName(ConstantPoolGen cpg) {
+ public String getName(final ConstantPoolGen cpg) {
ConstantPool cp = cpg.getConstantPool();
ConstantNameAndType cnat = getNameAndType(cpg);
return ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ObjectType.java Wed Jun 1 04:25:27 2016
@@ -33,14 +33,14 @@ public class ObjectType extends Referenc
/**
* @since 6.0
*/
- public static ObjectType getInstance(String class_name) {
+ public static ObjectType getInstance(final String class_name) {
return new ObjectType(class_name);
}
/**
* @param class_name fully qualified class name, e.g. java.lang.String
*/
- public ObjectType(String class_name) {
+ public ObjectType(final String class_name) {
super(Const.T_REFERENCE, "L" + class_name.replace('.', '/') + ";");
this.class_name = class_name.replace('/', '.');
}
@@ -64,7 +64,7 @@ public class ObjectType extends Referenc
/** @return true if both type objects refer to the same class.
*/
@Override
- public boolean equals( Object type ) {
+ public boolean equals( final Object type ) {
return (type instanceof ObjectType)
? ((ObjectType) type).class_name.equals(class_name)
: false;
@@ -140,7 +140,7 @@ public class ObjectType extends Referenc
* @throws ClassNotFoundException if any of this class's superclasses
* can't be found
*/
- public boolean subclassOf( ObjectType superclass ) throws ClassNotFoundException {
+ public boolean subclassOf( final ObjectType superclass ) throws ClassNotFoundException {
if (this.referencesInterfaceExact() || superclass.referencesInterfaceExact()) {
return false;
}
@@ -153,7 +153,7 @@ public class ObjectType extends Referenc
* @throws ClassNotFoundException if the class referenced by this type
* can't be found
*/
- public boolean accessibleTo( ObjectType accessor ) throws ClassNotFoundException {
+ public boolean accessibleTo( final ObjectType accessor ) throws ClassNotFoundException {
JavaClass jc = Repository.lookupClass(class_name);
if (jc.isPublic()) {
return true;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP.java Wed Jun 1 04:25:27 2016
@@ -40,7 +40,7 @@ public class POP extends StackInstructio
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitStackConsumer(this);
v.visitPopInstruction(this);
v.visitStackInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/POP2.java Wed Jun 1 04:25:27 2016
@@ -40,7 +40,7 @@ public class POP2 extends StackInstructi
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitStackConsumer(this);
v.visitPopInstruction(this);
v.visitStackInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java Wed Jun 1 04:25:27 2016
@@ -36,7 +36,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, int value) {
+ public PUSH(final ConstantPoolGen cp, final int value) {
if ((value >= -1) && (value <= 5)) {
instruction = InstructionConst.getInstruction(Const.ICONST_0 + value);
} else if (Instruction.isValidByte(value)) {
@@ -53,7 +53,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, boolean value) {
+ public PUSH(final ConstantPoolGen cp, final boolean value) {
instruction = InstructionConst.getInstruction(Const.ICONST_0 + (value ? 1 : 0));
}
@@ -62,7 +62,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, float value) {
+ public PUSH(final ConstantPoolGen cp, final float value) {
if (value == 0.0) {
instruction = InstructionConst.FCONST_0;
} else if (value == 1.0) {
@@ -79,7 +79,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, long value) {
+ public PUSH(final ConstantPoolGen cp, final long value) {
if (value == 0) {
instruction = InstructionConst.LCONST_0;
} else if (value == 1) {
@@ -94,7 +94,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, double value) {
+ public PUSH(final ConstantPoolGen cp, final double value) {
if (value == 0.0) {
instruction = InstructionConst.DCONST_0;
} else if (value == 1.0) {
@@ -109,7 +109,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, String value) {
+ public PUSH(final ConstantPoolGen cp, final String value) {
if (value == null) {
instruction = InstructionConst.ACONST_NULL;
} else {
@@ -123,7 +123,7 @@ public final class PUSH implements Compo
* @param value
* @since 6.0
*/
- public PUSH(ConstantPoolGen cp, ObjectType value) {
+ public PUSH(final ConstantPoolGen cp, final ObjectType value) {
if (value == null) {
instruction = InstructionConst.ACONST_NULL;
} else {
@@ -135,7 +135,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, Number value) {
+ public PUSH(final ConstantPoolGen cp, final Number value) {
if ((value instanceof Integer) || (value instanceof Short) || (value instanceof Byte)) {
instruction = new PUSH(cp, value.intValue()).instruction;
} else if (value instanceof Double) {
@@ -157,7 +157,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, Character value) {
+ public PUSH(final ConstantPoolGen cp, final Character value) {
this(cp, value.charValue());
}
@@ -166,7 +166,7 @@ public final class PUSH implements Compo
* @param cp Constant pool
* @param value to be pushed
*/
- public PUSH(ConstantPoolGen cp, Boolean value) {
+ public PUSH(final ConstantPoolGen cp, final Boolean value) {
this(cp, value.booleanValue());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTFIELD.java Wed Jun 1 04:25:27 2016
@@ -38,13 +38,13 @@ public class PUTFIELD extends FieldInstr
}
- public PUTFIELD(int index) {
+ public PUTFIELD(final int index) {
super(Const.PUTFIELD, index);
}
@Override
- public int consumeStack( ConstantPoolGen cpg ) {
+ public int consumeStack( final ConstantPoolGen cpg ) {
return getFieldSize(cpg) + 1;
}
@@ -66,7 +66,7 @@ public class PUTFIELD extends FieldInstr
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
v.visitPopInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUTSTATIC.java Wed Jun 1 04:25:27 2016
@@ -38,13 +38,13 @@ public class PUTSTATIC extends FieldInst
}
- public PUTSTATIC(int index) {
+ public PUTSTATIC(final int index) {
super(Const.PUTSTATIC, index);
}
@Override
- public int consumeStack( ConstantPoolGen cpg ) {
+ public int consumeStack( final ConstantPoolGen cpg ) {
return getFieldSize(cpg);
}
@@ -65,7 +65,7 @@ public class PUTSTATIC extends FieldInst
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
v.visitPopInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java Wed Jun 1 04:25:27 2016
@@ -43,7 +43,7 @@ public class RET extends Instruction imp
}
- public RET(int index) {
+ public RET(final int index) {
super(org.apache.commons.bcel6.Const.RET, (short) 2);
setIndex(index); // May set wide as side effect
}
@@ -54,7 +54,7 @@ public class RET extends Instruction imp
* @param out Output stream
*/
@Override
- public void dump( DataOutputStream out ) throws IOException {
+ public void dump( final DataOutputStream out ) throws IOException {
if (wide) {
out.writeByte(org.apache.commons.bcel6.Const.WIDE);
}
@@ -81,7 +81,7 @@ public class RET extends Instruction imp
* Read needed data (e.g. index) from file.
*/
@Override
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
+ protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException {
this.wide = wide;
if (wide) {
index = bytes.readUnsignedShort();
@@ -106,7 +106,7 @@ public class RET extends Instruction imp
* Set index of local variable containg the return address
*/
@Override
- public final void setIndex( int n ) {
+ public final void setIndex( final int n ) {
if (n < 0) {
throw new ClassGenException("Negative index value: " + n);
}
@@ -119,7 +119,7 @@ public class RET extends Instruction imp
* @return mnemonic for instruction
*/
@Override
- public String toString( boolean verbose ) {
+ public String toString( final boolean verbose ) {
return super.toString(verbose) + " " + index;
}
@@ -127,7 +127,7 @@ public class RET extends Instruction imp
/** @return return address type
*/
@Override
- public Type getType( ConstantPoolGen cp ) {
+ public Type getType( final ConstantPoolGen cp ) {
return ReturnaddressType.NO_TARGET;
}
@@ -141,7 +141,7 @@ public class RET extends Instruction imp
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitRET(this);
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RETURN.java Wed Jun 1 04:25:27 2016
@@ -39,7 +39,7 @@ public class RETURN extends ReturnInstru
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
v.visitStackConsumer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReferenceType.java Wed Jun 1 04:25:27 2016
@@ -28,7 +28,7 @@ import org.apache.commons.bcel6.classfil
*/
public abstract class ReferenceType extends Type {
- protected ReferenceType(byte t, String s) {
+ protected ReferenceType(final byte t, final String s) {
super(t, s);
}
@@ -51,7 +51,7 @@ public abstract class ReferenceType exte
* @throws ClassNotFoundException if any classes or interfaces required
* to determine assignment compatibility can't be found
*/
- public boolean isCastableTo( Type t ) throws ClassNotFoundException {
+ public boolean isCastableTo( final Type t ) throws ClassNotFoundException {
if (this.equals(Type.NULL)) {
return t instanceof ReferenceType; // If this is ever changed in isAssignmentCompatible()
}
@@ -69,7 +69,7 @@ public abstract class ReferenceType exte
* @throws ClassNotFoundException if any classes or interfaces required
* to determine assignment compatibility can't be found
*/
- public boolean isAssignmentCompatibleWith( Type t ) throws ClassNotFoundException {
+ public boolean isAssignmentCompatibleWith( final Type t ) throws ClassNotFoundException {
if (!(t instanceof ReferenceType)) {
return false;
}
@@ -190,7 +190,7 @@ public abstract class ReferenceType exte
* @throws ClassNotFoundException on failure to find superclasses of this
* type, or the type passed as a parameter
*/
- public ReferenceType getFirstCommonSuperclass( ReferenceType t ) throws ClassNotFoundException {
+ public ReferenceType getFirstCommonSuperclass( final ReferenceType t ) throws ClassNotFoundException {
if (this.equals(Type.NULL)) {
return t;
}
@@ -274,7 +274,7 @@ public abstract class ReferenceType exte
* type, or the type passed as a parameter
*/
@Deprecated
- public ReferenceType firstCommonSuperclass( ReferenceType t ) throws ClassNotFoundException {
+ public ReferenceType firstCommonSuperclass( final ReferenceType t ) throws ClassNotFoundException {
if (this.equals(Type.NULL)) {
return t;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java Wed Jun 1 04:25:27 2016
@@ -39,7 +39,7 @@ public abstract class ReturnInstruction
/**
* @param opcode of instruction
*/
- protected ReturnInstruction(short opcode) {
+ protected ReturnInstruction(final short opcode) {
super(opcode, (short) 1);
}
@@ -76,7 +76,7 @@ public abstract class ReturnInstruction
/** @return type associated with the instruction
*/
@Override
- public Type getType( ConstantPoolGen cp ) {
+ public Type getType( final ConstantPoolGen cp ) {
return getType();
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnaddressType.java Wed Jun 1 04:25:27 2016
@@ -42,7 +42,7 @@ public class ReturnaddressType extends T
/**
* Creates a ReturnaddressType object with a target.
*/
- public ReturnaddressType(InstructionHandle returnTarget) {
+ public ReturnaddressType(final InstructionHandle returnTarget) {
super(Const.T_ADDRESS, "<return address targeting " + returnTarget + ">");
this.returnTarget = returnTarget;
}
@@ -63,7 +63,7 @@ public class ReturnaddressType extends T
* Returns if the two Returnaddresses refer to the same target.
*/
@Override
- public boolean equals( Object rat ) {
+ public boolean equals( final Object rat ) {
if (!(rat instanceof ReturnaddressType)) {
return false;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SALOAD.java Wed Jun 1 04:25:27 2016
@@ -39,7 +39,7 @@ public class SALOAD extends ArrayInstruc
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitStackProducer(this);
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SASTORE.java Wed Jun 1 04:25:27 2016
@@ -39,7 +39,7 @@ public class SASTORE extends ArrayInstru
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitStackConsumer(this);
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java Wed Jun 1 04:25:27 2016
@@ -42,7 +42,7 @@ public class SIPUSH extends Instruction
}
- public SIPUSH(short b) {
+ public SIPUSH(final short b) {
super(org.apache.commons.bcel6.Const.SIPUSH, (short) 3);
this.b = b;
}
@@ -52,7 +52,7 @@ public class SIPUSH extends Instruction
* Dump instruction as short code to stream out.
*/
@Override
- public void dump( DataOutputStream out ) throws IOException {
+ public void dump( final DataOutputStream out ) throws IOException {
super.dump(out);
out.writeShort(b);
}
@@ -62,7 +62,7 @@ public class SIPUSH extends Instruction
* @return mnemonic for instruction
*/
@Override
- public String toString( boolean verbose ) {
+ public String toString( final boolean verbose ) {
return super.toString(verbose) + " " + b;
}
@@ -71,7 +71,7 @@ public class SIPUSH extends Instruction
* Read needed data (e.g. index) from file.
*/
@Override
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
+ protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException {
super.setLength(3);
b = bytes.readShort();
}
@@ -86,7 +86,7 @@ public class SIPUSH extends Instruction
/** @return Type.SHORT
*/
@Override
- public Type getType( ConstantPoolGen cp ) {
+ public Type getType( final ConstantPoolGen cp ) {
return Type.SHORT;
}
@@ -100,7 +100,7 @@ public class SIPUSH extends Instruction
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitPushInstruction(this);
v.visitStackProducer(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWAP.java Wed Jun 1 04:25:27 2016
@@ -39,7 +39,7 @@ public class SWAP extends StackInstructi
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitStackConsumer(this);
v.visitStackProducer(this);
v.visitStackInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SWITCH.java Wed Jun 1 04:25:27 2016
@@ -47,7 +47,7 @@ public final class SWITCH implements Com
* @param target the default target
* @param max_gap maximum gap that may between case branches
*/
- public SWITCH(int[] match, InstructionHandle[] targets, InstructionHandle target, int max_gap) {
+ public SWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle target, final int max_gap) {
this.match = match.clone();
this.targets = targets.clone();
if ((match_length = match.length) < 2) {
@@ -64,12 +64,12 @@ public final class SWITCH implements Com
}
- public SWITCH(int[] match, InstructionHandle[] targets, InstructionHandle target) {
+ public SWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle target) {
this(match, targets, target, 1);
}
- private void fillup( int max_gap, InstructionHandle target ) {
+ private void fillup( final int max_gap, final InstructionHandle target ) {
int max_size = match_length + match_length * max_gap;
int[] m_vec = new int[max_size];
InstructionHandle[] t_vec = new InstructionHandle[max_size];
@@ -98,7 +98,7 @@ public final class SWITCH implements Com
/**
* Sort match and targets array with QuickSort.
*/
- private void sort( int l, int r ) {
+ private void sort( final int l, final int r ) {
int i = l;
int j = r;
int h;
@@ -134,7 +134,7 @@ public final class SWITCH implements Com
/**
* @return match is sorted in ascending order with no gap bigger than max_gap?
*/
- private boolean matchIsOrdered( int max_gap ) {
+ private boolean matchIsOrdered( final int max_gap ) {
for (int i = 1; i < match_length; i++) {
if (match[i] - match[i - 1] > max_gap) {
return false;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java Wed Jun 1 04:25:27 2016
@@ -88,7 +88,7 @@ public abstract class Select extends Bra
* @param targets instruction targets
* @param defaultTarget default instruction target
*/
- Select(short opcode, int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
+ Select(final short opcode, final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) {
// don't set default target before instuction is built
super(opcode, null);
this.match = match;
@@ -120,7 +120,7 @@ public abstract class Select extends Bra
* @return additional offset caused by possible change of this instruction's length
*/
@Override
- protected int updatePosition( int offset, int max_offset ) {
+ protected int updatePosition( final int offset, final int max_offset ) {
setPosition(getPosition() + offset); // Additional offset caused by preceding SWITCHs, GOTOs, etc.
short old_length = (short) super.getLength();
/* Alignment on 4-byte-boundary, + 1, because of tag byte.
@@ -136,7 +136,7 @@ public abstract class Select extends Bra
* @param out Output stream
*/
@Override
- public void dump( DataOutputStream out ) throws IOException {
+ public void dump( final DataOutputStream out ) throws IOException {
out.writeByte(super.getOpcode());
for (int i = 0; i < padding; i++) {
out.writeByte(0);
@@ -150,7 +150,7 @@ public abstract class Select extends Bra
* Read needed data (e.g. index) from file.
*/
@Override
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
+ protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException {
padding = (4 - (bytes.getIndex() % 4)) % 4; // Compute number of pad bytes
for (int i = 0; i < padding; i++) {
bytes.readByte();
@@ -164,7 +164,7 @@ public abstract class Select extends Bra
* @return mnemonic for instruction
*/
@Override
- public String toString( boolean verbose ) {
+ public String toString( final boolean verbose ) {
StringBuilder buf = new StringBuilder(super.toString(verbose));
if (verbose) {
for (int i = 0; i < match_length; i++) {
@@ -185,7 +185,7 @@ public abstract class Select extends Bra
/**
* Set branch target for `i'th case
*/
- public void setTarget( int i, InstructionHandle target ) { // TODO could be package-protected?
+ public void setTarget( final int i, final InstructionHandle target ) { // TODO could be package-protected?
notifyTarget(targets[i], target, this);
targets[i] = target;
}
@@ -196,7 +196,7 @@ public abstract class Select extends Bra
* @param new_ih new target
*/
@Override
- public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
+ public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) {
boolean targeted = false;
if (super.getTarget() == old_ih) {
targeted = true;
@@ -218,7 +218,7 @@ public abstract class Select extends Bra
* @return true, if ih is target of this instruction
*/
@Override
- public boolean containsTarget( InstructionHandle ih ) {
+ public boolean containsTarget( final InstructionHandle ih ) {
if (super.getTarget() == ih) {
return true;
}
@@ -280,7 +280,7 @@ public abstract class Select extends Bra
* @return match entry
* @since 6.0
*/
- final int getMatch(int index) {
+ final int getMatch(final int index) {
return match[index];
}
@@ -289,7 +289,7 @@ public abstract class Select extends Bra
* @return index entry from indices
* @since 6.0
*/
- final int getIndices(int index) {
+ final int getIndices(final int index) {
return indices[index];
}
@@ -297,7 +297,7 @@ public abstract class Select extends Bra
* @return target entry
* @since 6.0
*/
- final InstructionHandle getTarget(int index) {
+ final InstructionHandle getTarget(final int index) {
return targets[index];
}
@@ -315,7 +315,7 @@ public abstract class Select extends Bra
* @param fixed_length the fixed_length to set
* @since 6.0
*/
- final void setFixed_length(int fixed_length) {
+ final void setFixed_length(final int fixed_length) {
this.fixed_length = fixed_length;
}
@@ -333,7 +333,7 @@ public abstract class Select extends Bra
* @param match_length the match_length to set
* @since 6.0
*/
- final int setMatch_length(int match_length) {
+ final int setMatch_length(final int match_length) {
this.match_length = match_length;
return match_length;
}
@@ -344,7 +344,7 @@ public abstract class Select extends Bra
* @param value
* @since 6.0
*/
- final void setMatch(int index, int value) {
+ final void setMatch(final int index, final int value) {
match[index] = value;
}
@@ -353,7 +353,7 @@ public abstract class Select extends Bra
* @param array
* @since 6.0
*/
- final void setIndices(int[] array) {
+ final void setIndices(final int[] array) {
indices = array;
}
@@ -362,7 +362,7 @@ public abstract class Select extends Bra
* @param array
* @since 6.0
*/
- final void setMatches(int[] array) {
+ final void setMatches(final int[] array) {
match = array;
}
@@ -371,7 +371,7 @@ public abstract class Select extends Bra
* @param array
* @since 6.0
*/
- final void setTargets(InstructionHandle[] array) {
+ final void setTargets(final InstructionHandle[] array) {
targets = array;
}
@@ -386,7 +386,7 @@ public abstract class Select extends Bra
/** @since 6.0 */
- final int setIndices(int i, int value) {
+ final int setIndices(final int i, final int value) {
indices[i] = value;
return value; // Allow use in nested calls
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java Wed Jun 1 04:25:27 2016
@@ -44,55 +44,55 @@ public class SimpleElementValueGen exten
* Protected ctor used for deserialization, doesn't *put* an entry in the
* constant pool, assumes the one at the supplied index is correct.
*/
- protected SimpleElementValueGen(int type, int idx, ConstantPoolGen cpGen)
+ protected SimpleElementValueGen(final int type, final int idx, final ConstantPoolGen cpGen)
{
super(type, cpGen);
this.idx = idx;
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, int value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final int value)
{
super(type, cpGen);
idx = getConstantPool().addInteger(value);
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, long value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final long value)
{
super(type, cpGen);
idx = getConstantPool().addLong(value);
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, double value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final double value)
{
super(type, cpGen);
idx = getConstantPool().addDouble(value);
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, float value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final float value)
{
super(type, cpGen);
idx = getConstantPool().addFloat(value);
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, short value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final short value)
{
super(type, cpGen);
idx = getConstantPool().addInteger(value);
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, byte value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final byte value)
{
super(type, cpGen);
idx = getConstantPool().addInteger(value);
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, char value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final char value)
{
super(type, cpGen);
idx = getConstantPool().addInteger(value);
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, boolean value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final boolean value)
{
super(type, cpGen);
if (value) {
@@ -102,7 +102,7 @@ public class SimpleElementValueGen exten
}
}
- public SimpleElementValueGen(int type, ConstantPoolGen cpGen, String value)
+ public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final String value)
{
super(type, cpGen);
idx = getConstantPool().addUtf8(value);
@@ -113,8 +113,8 @@ public class SimpleElementValueGen exten
* the 'new'. You need to use this ctor if the annotation is being copied
* from one file to another.
*/
- public SimpleElementValueGen(SimpleElementValue value,
- ConstantPoolGen cpool, boolean copyPoolEntries)
+ public SimpleElementValueGen(final SimpleElementValue value,
+ final ConstantPoolGen cpool, final boolean copyPoolEntries)
{
super(value.getElementValueType(), cpool);
if (!copyPoolEntries)
@@ -245,7 +245,7 @@ public class SimpleElementValueGen exten
}
@Override
- public void dump(DataOutputStream dos) throws IOException
+ public void dump(final DataOutputStream dos) throws IOException
{
dos.writeByte(super.getElementValueType()); // u1 kind of value
switch (super.getElementValueType())
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StackInstruction.java Wed Jun 1 04:25:27 2016
@@ -35,14 +35,14 @@ public abstract class StackInstruction e
/**
* @param opcode instruction opcode
*/
- protected StackInstruction(short opcode) {
+ protected StackInstruction(final short opcode) {
super(opcode, (short) 1);
}
/** @return Type.UNKNOWN
*/
- public Type getType( ConstantPoolGen cp ) {
+ public Type getType( final ConstantPoolGen cp ) {
return Type.UNKNOWN;
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/StoreInstruction.java Wed Jun 1 04:25:27 2016
@@ -30,7 +30,7 @@ public abstract class StoreInstruction e
* Instruction.readInstruction(). Not to be used otherwise.
* tag and length are defined in readInstruction and initFromFile, respectively.
*/
- StoreInstruction(short canon_tag, short c_tag) {
+ StoreInstruction(final short canon_tag, final short c_tag) {
super(canon_tag, c_tag);
}
@@ -40,7 +40,7 @@ public abstract class StoreInstruction e
* @param c_tag Instruction number for compact version, ASTORE_0, e.g.
* @param n local variable index (unsigned short)
*/
- protected StoreInstruction(short opcode, short c_tag, int n) {
+ protected StoreInstruction(final short opcode, final short c_tag, final int n) {
super(opcode, c_tag, n);
}
@@ -54,7 +54,7 @@ public abstract class StoreInstruction e
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitStackConsumer(this);
v.visitPopInstruction(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TABLESWITCH.java Wed Jun 1 04:25:27 2016
@@ -44,7 +44,7 @@ public class TABLESWITCH extends Select
* @param targets where to branch for matched values
* @param defaultTarget default branch
*/
- public TABLESWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
+ public TABLESWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) {
super(org.apache.commons.bcel6.Const.TABLESWITCH, match, targets, defaultTarget);
/* Alignment remainder assumed 0 here, until dump time */
final short _length = (short) (13 + getMatch_length() * 4);
@@ -58,7 +58,7 @@ public class TABLESWITCH extends Select
* @param out Output stream
*/
@Override
- public void dump( DataOutputStream out ) throws IOException {
+ public void dump( final DataOutputStream out ) throws IOException {
super.dump(out);
final int _match_length = getMatch_length();
int low = (_match_length > 0) ? super.getMatch(0) : 0;
@@ -75,7 +75,7 @@ public class TABLESWITCH extends Select
* Read needed data (e.g. index) from file.
*/
@Override
- protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
+ protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException {
super.initFromFile(bytes, wide);
int low = bytes.readInt();
int high = bytes.readInt();
@@ -103,7 +103,7 @@ public class TABLESWITCH extends Select
* @param v Visitor object
*/
@Override
- public void accept( Visitor v ) {
+ public void accept( final Visitor v ) {
v.visitVariableLengthInstruction(this);
v.visitStackConsumer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/TargetLostException.java Wed Jun 1 04:25:27 2016
@@ -51,7 +51,7 @@ public final class TargetLostException e
private final InstructionHandle[] targets;
- TargetLostException(InstructionHandle[] t, String mesg) {
+ TargetLostException(final InstructionHandle[] t, final String mesg) {
super(mesg);
targets = t;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java?rev=1746378&r1=1746377&r2=1746378&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java Wed Jun 1 04:25:27 2016
@@ -66,7 +66,7 @@ public abstract class Type {
};
- protected Type(byte t, String s) {
+ protected Type(final byte t, final String s) {
type = t;
signature = s;
}
@@ -85,7 +85,7 @@ public abstract class Type {
* @return whether the Types are equal
*/
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (o instanceof Type) {
Type t = (Type)o;
return (type == t.type) && signature.equals(t.signature);
@@ -158,7 +158,7 @@ public abstract class Type {
* @param arg_types what are the argument types
* @return method signature for given type(s).
*/
- public static String getMethodSignature( Type return_type, Type[] arg_types ) {
+ public static String getMethodSignature( final Type return_type, final Type[] arg_types ) {
StringBuilder buf = new StringBuilder("(");
if (arg_types != null) {
for (Type arg_type : arg_types) {
@@ -179,12 +179,12 @@ public abstract class Type {
};//int consumed_chars=0; // Remember position in string, see getArgumentTypes
- private static int unwrap( ThreadLocal<Integer> tl ) {
+ private static int unwrap( final ThreadLocal<Integer> tl ) {
return tl.get().intValue();
}
- private static void wrap( ThreadLocal<Integer> tl, int value ) {
+ private static void wrap( final ThreadLocal<Integer> tl, final int value ) {
tl.set(Integer.valueOf(value));
}
@@ -195,7 +195,7 @@ public abstract class Type {
* @return type object
*/
// @since 6.0 no longer final
- public static Type getType( String signature ) throws StringIndexOutOfBoundsException {
+ public static Type getType( final String signature ) throws StringIndexOutOfBoundsException {
byte type = Utility.typeOfSignature(signature);
if (type <= Const.T_VOID) {
//corrected concurrent private static field acess
@@ -231,7 +231,7 @@ public abstract class Type {
* @param signature signature string such as (Ljava/lang/String;)V
* @return return type
*/
- public static Type getReturnType( String signature ) {
+ public static Type getReturnType( final String signature ) {
try {
// Read return type after `)'
int index = signature.lastIndexOf(')') + 1;
@@ -247,7 +247,7 @@ public abstract class Type {
* @param signature signature string such as (Ljava/lang/String;)V
* @return array of argument types
*/
- public static Type[] getArgumentTypes( String signature ) {
+ public static Type[] getArgumentTypes( final String signature ) {
List<Type> vec = new ArrayList<>();
int index;
Type[] types;
@@ -274,7 +274,7 @@ public abstract class Type {
* @param cl Java class
* @return corresponding Type object
*/
- public static Type getType( java.lang.Class<?> cl ) {
+ public static Type getType( final java.lang.Class<?> cl ) {
if (cl == null) {
throw new IllegalArgumentException("Class must not be null");
}
@@ -318,7 +318,7 @@ public abstract class Type {
* @param classes an array of runtime class objects
* @return array of corresponding Type objects
*/
- public static Type[] getTypes( java.lang.Class<?>[] classes ) {
+ public static Type[] getTypes( final java.lang.Class<?>[] classes ) {
Type[] ret = new Type[classes.length];
for (int i = 0; i < ret.length; i++) {
ret[i] = getType(classes[i]);
@@ -327,7 +327,7 @@ public abstract class Type {
}
- public static String getSignature( java.lang.reflect.Method meth ) {
+ public static String getSignature( final java.lang.reflect.Method meth ) {
StringBuilder sb = new StringBuilder("(");
Class<?>[] params = meth.getParameterTypes(); // avoid clone
for (Class<?> param : params) {
@@ -338,19 +338,19 @@ public abstract class Type {
return sb.toString();
}
- static int size(int coded) {
+ static int size(final int coded) {
return coded & 3;
}
- static int consumed(int coded) {
+ static int consumed(final int coded) {
return coded >> 2;
}
- static int encode(int size, int consumed) {
+ static int encode(final int size, final int consumed) {
return consumed << 2 | size;
}
- static int getArgumentTypesSize( String signature ) {
+ static int getArgumentTypesSize( final String signature ) {
int res = 0;
int index;
try { // Read all declarations between for `(' and `)'
@@ -369,7 +369,7 @@ public abstract class Type {
return res;
}
- static int getTypeSize( String signature ) throws StringIndexOutOfBoundsException {
+ static int getTypeSize( final String signature ) throws StringIndexOutOfBoundsException {
byte type = Utility.typeOfSignature(signature);
if (type <= Const.T_VOID) {
return encode(BasicType.getType(type).getSize(), 1);
@@ -391,7 +391,7 @@ public abstract class Type {
}
- static int getReturnTypeSize(String signature) {
+ static int getReturnTypeSize(final String signature) {
int index = signature.lastIndexOf(')') + 1;
return Type.size(getTypeSize(signature.substring(index)));
}
@@ -402,7 +402,7 @@ public abstract class Type {
* The signature has a complicated dependency on other parameter
* so it's tricky to do it in a call to the super ctor.
*/
- void setSignature(String signature) {
+ void setSignature(final String signature) {
this.signature = signature;
}
}
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=1746378&r1=1746377&r2=1746378&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 Wed Jun 1 04:25:27 2016
@@ -53,8 +53,8 @@ final class AttributeHTML {
private final ConstantPool constant_pool;
- AttributeHTML(String dir, String class_name, ConstantPool constant_pool,
- ConstantHTML constant_html) throws IOException {
+ AttributeHTML(final String dir, final String class_name, final ConstantPool constant_pool,
+ final ConstantHTML constant_html) throws IOException {
this.class_name = class_name;
this.constant_pool = constant_pool;
this.constant_html = constant_html;
@@ -63,7 +63,7 @@ final class AttributeHTML {
}
- private String codeLink( int link, int method_number ) {
+ private String codeLink( final int link, final int method_number ) {
return "<A HREF=\"" + class_name + "_code.html#code" + method_number + "@" + link
+ "\" TARGET=Code>" + link + "</A>";
}
@@ -75,12 +75,12 @@ final class AttributeHTML {
}
- final void writeAttribute( Attribute attribute, String anchor ) {
+ final void writeAttribute( final Attribute attribute, final String anchor ) {
writeAttribute(attribute, anchor, 0);
}
- final void writeAttribute( Attribute attribute, String anchor, int method_number ) {
+ final void writeAttribute( final Attribute attribute, final String anchor, final int method_number ) {
byte tag = attribute.getTag();
int index;
if (tag == Const.ATTR_UNKNOWN) {