You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by db...@apache.org on 2011/07/29 03:54:56 UTC
svn commit: r1152072 [3/5] - in
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel: classfile/
generic/ util/ verifier/ verifier/exc/ verifier/statics/
verifier/structurals/
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPEQ.java Fri Jul 29 01:54:05 2011
@@ -46,6 +46,7 @@ public class IF_ICMPEQ extends IfInstruc
/**
* @return negation of instruction
*/
+ @Override
public IfInstruction negate() {
return new IF_ICMPNE(target);
}
@@ -59,6 +60,7 @@ public class IF_ICMPEQ extends IfInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGE.java Fri Jul 29 01:54:05 2011
@@ -46,6 +46,7 @@ public class IF_ICMPGE extends IfInstruc
/**
* @return negation of instruction
*/
+ @Override
public IfInstruction negate() {
return new IF_ICMPLT(target);
}
@@ -59,6 +60,7 @@ public class IF_ICMPGE extends IfInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPGT.java Fri Jul 29 01:54:05 2011
@@ -46,6 +46,7 @@ public class IF_ICMPGT extends IfInstruc
/**
* @return negation of instruction
*/
+ @Override
public IfInstruction negate() {
return new IF_ICMPLE(target);
}
@@ -59,6 +60,7 @@ public class IF_ICMPGT extends IfInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLE.java Fri Jul 29 01:54:05 2011
@@ -46,6 +46,7 @@ public class IF_ICMPLE extends IfInstruc
/**
* @return negation of instruction
*/
+ @Override
public IfInstruction negate() {
return new IF_ICMPGT(target);
}
@@ -59,6 +60,7 @@ public class IF_ICMPLE extends IfInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPLT.java Fri Jul 29 01:54:05 2011
@@ -46,6 +46,7 @@ public class IF_ICMPLT extends IfInstruc
/**
* @return negation of instruction
*/
+ @Override
public IfInstruction negate() {
return new IF_ICMPGE(target);
}
@@ -59,6 +60,7 @@ public class IF_ICMPLT extends IfInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IF_ICMPNE.java Fri Jul 29 01:54:05 2011
@@ -46,6 +46,7 @@ public class IF_ICMPNE extends IfInstruc
/**
* @return negation of instruction
*/
+ @Override
public IfInstruction negate() {
return new IF_ICMPEQ(target);
}
@@ -59,6 +60,7 @@ public class IF_ICMPNE extends IfInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IINC.java Fri Jul 29 01:54:05 2011
@@ -59,6 +59,7 @@ public class IINC extends LocalVariableI
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
if (wide) {
out.writeByte(org.apache.bcel.Constants.WIDE);
@@ -87,6 +88,7 @@ public class IINC extends LocalVariableI
/**
* Read needed data (e.g. index) from file.
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
this.wide = wide;
if (wide) {
@@ -104,6 +106,7 @@ public class IINC extends LocalVariableI
/**
* @return mnemonic for instruction
*/
+ @Override
public String toString( boolean verbose ) {
return super.toString(verbose) + " " + c;
}
@@ -112,6 +115,7 @@ public class IINC extends LocalVariableI
/**
* Set index of local variable.
*/
+ @Override
public final void setIndex( int n ) {
if (n < 0) {
throw new ClassGenException("Negative index value: " + n);
@@ -140,6 +144,7 @@ public class IINC extends LocalVariableI
/** @return int type
*/
+ @Override
public Type getType( ConstantPoolGen cp ) {
return Type.INT;
}
@@ -153,6 +158,7 @@ public class IINC extends LocalVariableI
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitLocalVariableInstruction(this);
v.visitIINC(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ILOAD.java Fri Jul 29 01:54:05 2011
@@ -54,6 +54,7 @@ public class ILOAD extends LoadInstructi
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
super.accept(v);
v.visitILOAD(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP1.java Fri Jul 29 01:54:05 2011
@@ -41,6 +41,7 @@ public class IMPDEP1 extends Instruction
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitIMPDEP1(this);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMPDEP2.java Fri Jul 29 01:54:05 2011
@@ -41,6 +41,7 @@ public class IMPDEP2 extends Instruction
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitIMPDEP2(this);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IMUL.java Fri Jul 29 01:54:05 2011
@@ -44,6 +44,7 @@ public class IMUL extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INEG.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class INEG extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INSTANCEOF.java Fri Jul 29 01:54:05 2011
@@ -65,6 +65,7 @@ public class INSTANCEOF extends CPInstru
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitLoadClass(this);
v.visitExceptionThrower(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java Fri Jul 29 01:54:05 2011
@@ -59,6 +59,7 @@ public final class INVOKEINTERFACE exten
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
out.writeShort(index);
@@ -79,6 +80,7 @@ public final class INVOKEINTERFACE exten
/**
* Read needed data (i.e., index) from file.
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
super.initFromFile(bytes, wide);
length = 5;
@@ -90,11 +92,13 @@ public final class INVOKEINTERFACE exten
/**
* @return mnemonic for instruction with symbolic references resolved
*/
+ @Override
public String toString( ConstantPool cp ) {
return super.toString(cp) + " " + nargs;
}
+ @Override
public int consumeStack( ConstantPoolGen cpg ) { // nargs is given in byte-code
return nargs; // nargs includes this reference
}
@@ -120,6 +124,7 @@ public final class INVOKEINTERFACE exten
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java Fri Jul 29 01:54:05 2011
@@ -67,6 +67,7 @@ public class INVOKESPECIAL extends Invok
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java Fri Jul 29 01:54:05 2011
@@ -64,6 +64,7 @@ public class INVOKESTATIC extends Invoke
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java Fri Jul 29 01:54:05 2011
@@ -66,6 +66,7 @@ public class INVOKEVIRTUAL extends Invok
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IOR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class IOR extends ArithmeticInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IREM.java Fri Jul 29 01:54:05 2011
@@ -53,6 +53,7 @@ public class IREM extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IRETURN.java Fri Jul 29 01:54:05 2011
@@ -44,6 +44,7 @@ public class IRETURN extends ReturnInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHL.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class ISHL extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISHR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class ISHR extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISTORE.java Fri Jul 29 01:54:05 2011
@@ -54,6 +54,7 @@ public class ISTORE extends StoreInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
super.accept(v);
v.visitISTORE(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ISUB.java Fri Jul 29 01:54:05 2011
@@ -44,6 +44,7 @@ public class ISUB extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IUSHR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class IUSHR extends ArithmeticIns
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IXOR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class IXOR extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java Fri Jul 29 01:54:05 2011
@@ -89,6 +89,7 @@ public abstract class Instruction implem
/**
* @return mnemonic for instruction in verbose format
*/
+ @Override
public String toString() {
return toString(true);
}
@@ -529,6 +530,7 @@ public abstract class Instruction implem
* @return currently used comparator for equals()
* @deprecated use the built in comparator, or wrap this class in another object that implements these methods
*/
+ @Deprecated
public static InstructionComparator getComparator() {
return cmp;
}
@@ -537,6 +539,7 @@ public abstract class Instruction implem
/** Set comparator to be used for equals().
* @deprecated use the built in comparator, or wrap this class in another object that implements these methods
*/
+ @Deprecated
public static void setComparator( InstructionComparator c ) {
cmp = c;
}
@@ -545,6 +548,7 @@ public abstract class Instruction implem
/** Check for equality, delegated to comparator
* @return true if that is an Instruction and has the same opcode
*/
+ @Override
public boolean equals( Object that ) {
return (that instanceof Instruction) ? cmp.equals(this, (Instruction) that) : false;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionHandle.java Fri Jul 29 01:54:05 2011
@@ -231,6 +231,7 @@ public class InstructionHandle implement
/** @return a string representation of the contained instruction.
*/
+ @Override
public String toString() {
return toString(true);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java Fri Jul 29 01:54:05 2011
@@ -976,6 +976,7 @@ public class InstructionList implements
}
+ @Override
public String toString() {
return toString(true);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InvokeInstruction.java Fri Jul 29 01:54:05 2011
@@ -53,6 +53,7 @@ public abstract class InvokeInstruction
/**
* @return mnemonic for instruction with symbolic references resolved
*/
+ @Override
public String toString( ConstantPool cp ) {
Constant c = cp.getConstant(index);
StringTokenizer tok = new StringTokenizer(cp.constantToString(c));
@@ -66,6 +67,7 @@ public abstract class InvokeInstruction
* constant pool entry they reference.
* @return Number of words consumed from stack by this instruction
*/
+ @Override
public int consumeStack( ConstantPoolGen cpg ) {
int sum;
if (opcode == Constants.INVOKESTATIC) {
@@ -85,6 +87,7 @@ public abstract class InvokeInstruction
* constant pool entry they reference.
* @return Number of words produced onto stack by this instruction
*/
+ @Override
public int produceStack( ConstantPoolGen cpg ) {
String signature = getSignature(cpg);
return Type.getReturnTypeSize(signature);
@@ -93,6 +96,7 @@ public abstract class InvokeInstruction
/** @return return type of referenced method.
*/
+ @Override
public Type getType( ConstantPoolGen cpg ) {
return getReturnType(cpg);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR.java Fri Jul 29 01:54:05 2011
@@ -48,6 +48,7 @@ public class JSR extends JsrInstruction
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
index = getTargetOffset();
if (opcode == org.apache.bcel.Constants.JSR) {
@@ -60,6 +61,7 @@ public class JSR extends JsrInstruction
}
+ @Override
protected int updatePosition( int offset, int max_offset ) {
int i = getTargetOffset(); // Depending on old position value
position += offset; // Position may be shifted by preceding expansions
@@ -81,6 +83,7 @@ public class JSR extends JsrInstruction
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackProducer(this);
v.visitVariableLengthInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR_W.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR_W.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR_W.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/JSR_W.java Fri Jul 29 01:54:05 2011
@@ -50,6 +50,7 @@ public class JSR_W extends JsrInstructio
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
index = getTargetOffset();
out.writeByte(opcode);
@@ -60,6 +61,7 @@ public class JSR_W extends JsrInstructio
/**
* Read needed data (e.g. index) from file.
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
index = bytes.readInt();
length = 5;
@@ -74,6 +76,7 @@ public class JSR_W extends JsrInstructio
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackProducer(this);
v.visitBranchInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2D.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class L2D extends ConversionInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2F.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class L2F extends ConversionInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/L2I.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class L2I extends ConversionInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LADD.java Fri Jul 29 01:54:05 2011
@@ -43,6 +43,7 @@ public class LADD extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LALOAD.java Fri Jul 29 01:54:05 2011
@@ -44,6 +44,7 @@ public class LALOAD extends ArrayInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackProducer(this);
v.visitExceptionThrower(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LAND.java Fri Jul 29 01:54:05 2011
@@ -43,6 +43,7 @@ public class LAND extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LASTORE.java Fri Jul 29 01:54:05 2011
@@ -44,6 +44,7 @@ public class LASTORE extends ArrayInstru
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitExceptionThrower(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCMP.java Fri Jul 29 01:54:05 2011
@@ -50,6 +50,7 @@ public class LCMP extends Instruction im
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LCONST.java Fri Jul 29 01:54:05 2011
@@ -72,6 +72,7 @@ public class LCONST extends Instruction
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitPushInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC.java Fri Jul 29 01:54:05 2011
@@ -65,6 +65,7 @@ public class LDC extends CPInstruction i
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
if (length == 2) {
@@ -78,6 +79,7 @@ public class LDC extends CPInstruction i
/**
* Set the index to constant pool and adjust size.
*/
+ @Override
public final void setIndex( int index ) {
super.setIndex(index);
setSize();
@@ -87,6 +89,7 @@ public class LDC extends CPInstruction i
/**
* Read needed data (e.g. index) from file.
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
length = 2;
index = bytes.readUnsignedByte();
@@ -114,6 +117,7 @@ public class LDC extends CPInstruction i
}
+ @Override
public Type getType( ConstantPoolGen cpg ) {
switch (cpg.getConstantPool().getConstant(index).getTag()) {
case org.apache.bcel.Constants.CONSTANT_String:
@@ -143,6 +147,7 @@ public class LDC extends CPInstruction i
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackProducer(this);
v.visitPushInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC2_W.java Fri Jul 29 01:54:05 2011
@@ -43,6 +43,7 @@ public class LDC2_W extends CPInstructio
}
+ @Override
public Type getType( ConstantPoolGen cpg ) {
switch (cpg.getConstantPool().getConstant(index).getTag()) {
case org.apache.bcel.Constants.CONSTANT_Long:
@@ -76,6 +77,7 @@ public class LDC2_W extends CPInstructio
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackProducer(this);
v.visitPushInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC_W.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC_W.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC_W.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDC_W.java Fri Jul 29 01:54:05 2011
@@ -49,6 +49,7 @@ public class LDC_W extends LDC {
/**
* Read needed data (i.e., index) from file.
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
setIndex(bytes.readUnsignedShort());
// Override just in case it has been changed
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LDIV.java Fri Jul 29 01:54:05 2011
@@ -50,6 +50,7 @@ public class LDIV extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LLOAD.java Fri Jul 29 01:54:05 2011
@@ -51,6 +51,7 @@ public class LLOAD extends LoadInstructi
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
super.accept(v);
v.visitLLOAD(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LMUL.java Fri Jul 29 01:54:05 2011
@@ -43,6 +43,7 @@ public class LMUL extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LNEG.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class LNEG extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOOKUPSWITCH.java Fri Jul 29 01:54:05 2011
@@ -53,6 +53,7 @@ public class LOOKUPSWITCH extends Select
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
super.dump(out);
out.writeInt(match_length); // npairs
@@ -66,6 +67,7 @@ public class LOOKUPSWITCH extends Select
/**
* Read needed data (e.g. index) from file.
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
super.initFromFile(bytes, wide); // reads padding
match_length = bytes.readInt();
@@ -89,6 +91,7 @@ public class LOOKUPSWITCH extends Select
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitVariableLengthInstruction(this);
v.visitStackConsumer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LOR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class LOR extends ArithmeticInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LREM.java Fri Jul 29 01:54:05 2011
@@ -49,6 +49,7 @@ public class LREM extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LRETURN.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class LRETURN extends ReturnInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHL.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class LSHL extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSHR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class LSHR extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSTORE.java Fri Jul 29 01:54:05 2011
@@ -51,6 +51,7 @@ public class LSTORE extends StoreInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
super.accept(v);
v.visitLSTORE(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LSUB.java Fri Jul 29 01:54:05 2011
@@ -43,6 +43,7 @@ public class LSUB extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LUSHR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class LUSHR extends ArithmeticIns
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LXOR.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class LXOR extends ArithmeticInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitTypedInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java Fri Jul 29 01:54:05 2011
@@ -84,6 +84,7 @@ public class LineNumberGen implements In
}
+ @Override
public Object clone() {
try {
return super.clone();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LoadInstruction.java Fri Jul 29 01:54:05 2011
@@ -57,6 +57,7 @@ public abstract class LoadInstruction ex
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackProducer(this);
v.visitPushInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java Fri Jul 29 01:54:05 2011
@@ -174,6 +174,7 @@ public class LocalVariableGen implements
/** @return a hash code value for the object.
*/
+ @Override
public int hashCode() {
//If the user changes the name or type, problems with the targeter hashmap will occur
int hc = index ^ name.hashCode() ^ type.hashCode();
@@ -185,6 +186,7 @@ public class LocalVariableGen implements
* We consider to local variables to be equal, if the use the same index and
* are valid in the same range.
*/
+ @Override
public boolean equals( Object o ) {
if (!(o instanceof LocalVariableGen)) {
return false;
@@ -194,11 +196,13 @@ public class LocalVariableGen implements
}
+ @Override
public String toString() {
return "LocalVariableGen(" + name + ", " + type + ", " + start + ", " + end + ")";
}
+ @Override
public Object clone() {
try {
return super.clone();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableInstruction.java Fri Jul 29 01:54:05 2011
@@ -79,6 +79,7 @@ public abstract class LocalVariableInstr
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
if (wide()) {
out.writeByte(Constants.WIDE);
@@ -103,6 +104,7 @@ public abstract class LocalVariableInstr
* @param verbose long/short format switch
* @return mnemonic for instruction
*/
+ @Override
public String toString( boolean verbose ) {
if (((opcode >= Constants.ILOAD_0) && (opcode <= Constants.ALOAD_3))
|| ((opcode >= Constants.ISTORE_0) && (opcode <= Constants.ASTORE_3))) {
@@ -117,6 +119,7 @@ public abstract class LocalVariableInstr
* Read needed data (e.g. index) from file.
* PRE: (ILOAD <= tag <= ALOAD_3) || (ISTORE <= tag <= ASTORE_3)
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
if (wide) {
n = bytes.readUnsignedShort();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITORENTER.java Fri Jul 29 01:54:05 2011
@@ -49,6 +49,7 @@ public class MONITORENTER extends Instru
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MONITOREXIT.java Fri Jul 29 01:54:05 2011
@@ -49,6 +49,7 @@ public class MONITOREXIT extends Instruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MULTIANEWARRAY.java Fri Jul 29 01:54:05 2011
@@ -59,6 +59,7 @@ public class MULTIANEWARRAY extends CPIn
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
out.writeShort(index);
@@ -69,6 +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 {
super.initFromFile(bytes, wide);
dimensions = bytes.readByte();
@@ -87,6 +89,7 @@ public class MULTIANEWARRAY extends CPIn
/**
* @return mnemonic for instruction
*/
+ @Override
public String toString( boolean verbose ) {
return super.toString(verbose) + " " + index + " " + dimensions;
}
@@ -95,6 +98,7 @@ public class MULTIANEWARRAY extends CPIn
/**
* @return mnemonic for instruction with symbolic references resolved
*/
+ @Override
public String toString( ConstantPool cp ) {
return super.toString(cp) + " " + dimensions;
}
@@ -105,6 +109,7 @@ public class MULTIANEWARRAY extends CPIn
* constant pool entry they reference.
* @return Number of words consumed from stack by this instruction
*/
+ @Override
public int consumeStack( ConstantPoolGen cpg ) {
return dimensions;
}
@@ -137,6 +142,7 @@ public class MULTIANEWARRAY extends CPIn
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitLoadClass(this);
v.visitAllocationInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java Fri Jul 29 01:54:05 2011
@@ -856,6 +856,7 @@ public class MethodGen extends FieldGenO
}
+ @Override
public String getSignature() {
return Type.getMethodSignature(type, arg_types);
}
@@ -1073,6 +1074,7 @@ public class MethodGen extends FieldGenO
*
* @return String representation of the method.
*/
+ @Override
public final String toString() {
String access = Utility.accessToString(access_flags);
String signature = Type.getMethodSignature(type, arg_types);
@@ -1230,6 +1232,7 @@ public class MethodGen extends FieldGenO
*
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals( Object obj ) {
return _cmp.equals(this, obj);
}
@@ -1241,6 +1244,7 @@ public class MethodGen extends FieldGenO
*
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return _cmp.hashCode(this);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEW.java Fri Jul 29 01:54:05 2011
@@ -68,6 +68,7 @@ public class NEW extends CPInstruction i
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitLoadClass(this);
v.visitAllocationInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NEWARRAY.java Fri Jul 29 01:54:05 2011
@@ -59,6 +59,7 @@ public class NEWARRAY extends Instructio
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
out.writeByte(type);
@@ -84,6 +85,7 @@ public class NEWARRAY extends Instructio
/**
* @return mnemonic for instruction
*/
+ @Override
public String toString( boolean verbose ) {
return super.toString(verbose) + " " + org.apache.bcel.Constants.TYPE_NAMES[type];
}
@@ -92,6 +94,7 @@ public class NEWARRAY extends Instructio
/**
* Read needed data (e.g. index) from file.
*/
+ @Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
type = bytes.readByte();
length = 2;
@@ -113,6 +116,7 @@ public class NEWARRAY extends Instructio
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitAllocationInstruction(this);
v.visitExceptionThrower(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NOP.java Fri Jul 29 01:54:05 2011
@@ -41,6 +41,7 @@ public class NOP extends Instruction {
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitNOP(this);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java Fri Jul 29 01:54:05 2011
@@ -51,6 +51,7 @@ public class ObjectType extends Referenc
/** @return a hash code value for the object.
*/
+ @Override
public int hashCode() {
return class_name.hashCode();
}
@@ -58,6 +59,7 @@ public class ObjectType extends Referenc
/** @return true if both type objects refer to the same class.
*/
+ @Override
public boolean equals( Object type ) {
return (type instanceof ObjectType)
? ((ObjectType) type).class_name.equals(class_name)
@@ -72,6 +74,7 @@ public class ObjectType extends Referenc
* if the class or interface referenced cannot
* be found: use referencesClassExact() instead
*/
+ @Deprecated
public boolean referencesClass() {
try {
JavaClass jc = Repository.lookupClass(class_name);
@@ -89,6 +92,7 @@ public class ObjectType extends Referenc
* if the class or interface referenced cannot
* be found: use referencesInterfaceExact() instead
*/
+ @Deprecated
public boolean referencesInterface() {
try {
JavaClass jc = Repository.lookupClass(class_name);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP.java Fri Jul 29 01:54:05 2011
@@ -43,6 +43,7 @@ public class POP extends StackInstructio
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitPopInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/POP2.java Fri Jul 29 01:54:05 2011
@@ -43,6 +43,7 @@ public class POP2 extends StackInstructi
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitPopInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUSH.java Fri Jul 29 01:54:05 2011
@@ -185,6 +185,7 @@ public final class PUSH implements Compo
/**
* @return mnemonic for instruction
*/
+ @Override
public String toString() {
return instruction.toString() + " (PUSH)";
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java Fri Jul 29 01:54:05 2011
@@ -47,6 +47,7 @@ public class PUTFIELD extends FieldInstr
}
+ @Override
public int consumeStack( ConstantPoolGen cpg ) {
return getFieldSize(cpg) + 1;
}
@@ -70,6 +71,7 @@ public class PUTFIELD extends FieldInstr
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java Fri Jul 29 01:54:05 2011
@@ -47,6 +47,7 @@ public class PUTSTATIC extends FieldInst
}
+ @Override
public int consumeStack( ConstantPoolGen cpg ) {
return getFieldSize(cpg);
}
@@ -69,6 +70,7 @@ public class PUTSTATIC extends FieldInst
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitStackConsumer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RET.java Fri Jul 29 01:54:05 2011
@@ -54,6 +54,7 @@ public class RET extends Instruction imp
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
if (wide) {
out.writeByte(org.apache.bcel.Constants.WIDE);
@@ -80,6 +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 {
this.wide = wide;
if (wide) {
@@ -115,6 +117,7 @@ public class RET extends Instruction imp
/**
* @return mnemonic for instruction
*/
+ @Override
public String toString( boolean verbose ) {
return super.toString(verbose) + " " + index;
}
@@ -135,6 +138,7 @@ public class RET extends Instruction imp
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitRET(this);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/RETURN.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class RETURN extends ReturnInstru
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitExceptionThrower(this);
v.visitTypedInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java Fri Jul 29 01:54:05 2011
@@ -278,6 +278,7 @@ public abstract class ReferenceType exte
* @throws ClassNotFoundException on failure to find superclasses of this
* type, or the type passed as a parameter
*/
+ @Deprecated
public ReferenceType firstCommonSuperclass( ReferenceType t ) throws ClassNotFoundException {
if (this.equals(Type.NULL)) {
return t;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReturnaddressType.java Fri Jul 29 01:54:05 2011
@@ -52,6 +52,7 @@ public class ReturnaddressType extends T
/** @return a hash code value for the object.
*/
+ @Override
public int hashCode() {
if (returnTarget == null) {
return 0;
@@ -63,6 +64,7 @@ public class ReturnaddressType extends T
/**
* Returns if the two Returnaddresses refer to the same target.
*/
+ @Override
public boolean equals( Object rat ) {
if (!(rat instanceof ReturnaddressType)) {
return false;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SALOAD.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class SALOAD extends ArrayInstruc
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackProducer(this);
v.visitExceptionThrower(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SASTORE.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class SASTORE extends ArrayInstru
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitExceptionThrower(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SIPUSH.java Fri Jul 29 01:54:05 2011
@@ -52,6 +52,7 @@ public class SIPUSH extends Instruction
/**
* Dump instruction as short code to stream out.
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
super.dump(out);
out.writeShort(b);
@@ -61,6 +62,7 @@ public class SIPUSH extends Instruction
/**
* @return mnemonic for instruction
*/
+ @Override
public String toString( boolean verbose ) {
return super.toString(verbose) + " " + b;
}
@@ -69,6 +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 {
length = 3;
b = bytes.readShort();
@@ -95,6 +98,7 @@ public class SIPUSH extends Instruction
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitPushInstruction(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SWAP.java Fri Jul 29 01:54:05 2011
@@ -42,6 +42,7 @@ public class SWAP extends StackInstructi
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitStackProducer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java Fri Jul 29 01:54:05 2011
@@ -87,6 +87,7 @@ public abstract class Select extends Bra
* @param max_offset the maximum offset that may be caused by these instructions
* @return additional offset caused by possible change of this instruction's length
*/
+ @Override
protected int updatePosition( int offset, int max_offset ) {
position += offset; // Additional offset caused by preceding SWITCHs, GOTOs, etc.
short old_length = length;
@@ -102,6 +103,7 @@ public abstract class Select extends Bra
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
for (int i = 0; i < padding; i++) {
@@ -115,6 +117,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 {
padding = (4 - (bytes.getIndex() % 4)) % 4; // Compute number of pad bytes
for (int i = 0; i < padding; i++) {
@@ -128,6 +131,7 @@ public abstract class Select extends Bra
/**
* @return mnemonic for instruction
*/
+ @Override
public String toString( boolean verbose ) {
StringBuffer buf = new StringBuffer(super.toString(verbose));
if (verbose) {
@@ -159,6 +163,7 @@ public abstract class Select extends Bra
* @param old_ih old target
* @param new_ih new target
*/
+ @Override
public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
boolean targeted = false;
if (target == old_ih) {
@@ -180,6 +185,7 @@ public abstract class Select extends Bra
/**
* @return true, if ih is target of this instruction
*/
+ @Override
public boolean containsTarget( InstructionHandle ih ) {
if (target == ih) {
return true;
@@ -193,6 +199,7 @@ public abstract class Select extends Bra
}
+ @Override
protected Object clone() throws CloneNotSupportedException {
Select copy = (Select) super.clone();
copy.match = match.clone();
@@ -205,6 +212,7 @@ public abstract class Select extends Bra
/**
* Inform targets that they're not targeted anymore.
*/
+ @Override
void dispose() {
super.dispose();
for (int i = 0; i < targets.length; i++) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/SimpleElementValueGen.java Fri Jul 29 01:54:05 2011
@@ -167,7 +167,8 @@ public class SimpleElementValueGen exten
/**
* Return immutable variant
*/
- public ElementValue getElementValue()
+ @Override
+ public ElementValue getElementValue()
{
return new SimpleElementValue(type, idx, cpGen.getConstantPool());
}
@@ -196,7 +197,8 @@ public class SimpleElementValueGen exten
}
// Whatever kind of value it is, return it as a string
- public String stringifyValue()
+ @Override
+ public String stringifyValue()
{
switch (type)
{
@@ -237,7 +239,8 @@ public class SimpleElementValueGen exten
}
}
- public void dump(DataOutputStream dos) throws IOException
+ @Override
+ public void dump(DataOutputStream dos) throws IOException
{
dos.writeByte(type); // u1 kind of value
switch (type)
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StoreInstruction.java Fri Jul 29 01:54:05 2011
@@ -57,6 +57,7 @@ public abstract class StoreInstruction e
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitStackConsumer(this);
v.visitPopInstruction(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TABLESWITCH.java Fri Jul 29 01:54:05 2011
@@ -59,6 +59,7 @@ public class TABLESWITCH extends Select
* Dump instruction as byte code to stream out.
* @param out Output stream
*/
+ @Override
public void dump( DataOutputStream out ) throws IOException {
super.dump(out);
int low = (match_length > 0) ? match[0] : 0;
@@ -74,6 +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 {
super.initFromFile(bytes, wide);
int low = bytes.readInt();
@@ -99,6 +101,7 @@ public class TABLESWITCH extends Select
*
* @param v Visitor object
*/
+ @Override
public void accept( Visitor v ) {
v.visitVariableLengthInstruction(this);
v.visitStackConsumer(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java?rev=1152072&r1=1152071&r2=1152072&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java Fri Jul 29 01:54:05 2011
@@ -72,6 +72,7 @@ public abstract class Type implements ja
/**
* @return hashcode of Type
*/
+ @Override
public int hashCode() {
return type ^ signature.hashCode();
}
@@ -80,6 +81,7 @@ public abstract class Type implements ja
/**
* @return whether the Types are equal
*/
+ @Override
public boolean equals(Object o) {
if (o instanceof Type) {
Type t = (Type)o;
@@ -124,6 +126,7 @@ public abstract class Type implements ja
/**
* @return Type string, e.g. `int[]'
*/
+ @Override
public String toString() {
return ((this.equals(Type.NULL) || (type >= Constants.T_UNKNOWN))) ? signature : Utility
.signatureToString(signature, false);
@@ -151,6 +154,7 @@ public abstract class Type implements ja
private static final ThreadLocal<Integer> consumed_chars = new ThreadLocal<Integer>() {
+ @Override
protected Integer initialValue() {
return Integer.valueOf(0);
}