You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/25 17:34:01 UTC
svn commit: r1697704 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic:
GOTO.java GOTO_W.java ICONST.java IINC.java InstructionComparator.java
Author: sebb
Date: Tue Aug 25 15:34:01 2015
New Revision: 1697704
URL: http://svn.apache.org/r1697704
Log:
Replace direct use of external fields with getter/setter
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java?rev=1697704&r1=1697703&r2=1697704&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO.java Tue Aug 25 15:34:01 2015
@@ -47,11 +47,12 @@ public class GOTO extends GotoInstructio
@Override
public void dump( DataOutputStream out ) throws IOException {
super.setIndex(getTargetOffset());
- if (opcode == org.apache.commons.bcel6.Constants.GOTO) {
+ final short _opcode = getOpcode();
+ if (_opcode == org.apache.commons.bcel6.Constants.GOTO) {
super.dump(out);
} else { // GOTO_W
super.setIndex(getTargetOffset());
- out.writeByte(opcode);
+ out.writeByte(_opcode);
out.writeInt(super.getIndex());
}
}
@@ -70,10 +71,10 @@ public class GOTO extends GotoInstructio
int i = getTargetOffset(); // Depending on old position value
setPosition(getPosition() + offset); // Position may be shifted by preceding expansions
if (Math.abs(i) >= (Short.MAX_VALUE - max_offset)) { // to large for short (estimate)
- opcode = org.apache.commons.bcel6.Constants.GOTO_W;
- short old_length = length;
- length = 5;
- return length - old_length;
+ super.setOpcode(org.apache.commons.bcel6.Constants.GOTO_W);
+ short old_length = (short) super.getLength();
+ super.setLength(5);
+ return super.getLength() - old_length;
}
return 0;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java?rev=1697704&r1=1697703&r2=1697704&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/GOTO_W.java Tue Aug 25 15:34:01 2015
@@ -39,7 +39,7 @@ public class GOTO_W extends GotoInstruct
public GOTO_W(InstructionHandle target) {
super(org.apache.commons.bcel6.Constants.GOTO_W, target);
- length = 5;
+ super.setLength(5);
}
@@ -50,7 +50,7 @@ public class GOTO_W extends GotoInstruct
@Override
public void dump( DataOutputStream out ) throws IOException {
super.setIndex(getTargetOffset());
- out.writeByte(opcode);
+ out.writeByte(super.getOpcode());
out.writeInt(super.getIndex());
}
@@ -61,7 +61,7 @@ public class GOTO_W extends GotoInstruct
@Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
super.setIndex(bytes.readInt());
- length = 5;
+ super.setLength(5);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java?rev=1697704&r1=1697703&r2=1697704&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ICONST.java Tue Aug 25 15:34:01 2015
@@ -40,7 +40,7 @@ public class ICONST extends Instruction
public ICONST(int i) {
super(org.apache.commons.bcel6.Constants.ICONST_0, (short) 1);
if ((i >= -1) && (i <= 5)) {
- opcode = (short) (org.apache.commons.bcel6.Constants.ICONST_0 + i); // Even works for i == -1
+ super.setOpcode((short) (org.apache.commons.bcel6.Constants.ICONST_0 + i)); // Even works for i == -1
} else {
throw new ClassGenException("ICONST can be used only for value between -1 and 5: " + i);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java?rev=1697704&r1=1697703&r2=1697704&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IINC.java Tue Aug 25 15:34:01 2015
@@ -47,8 +47,8 @@ public class IINC extends LocalVariableI
*/
public IINC(int n, int c) {
super(); // Default behaviour of LocalVariableInstruction causes error
- this.opcode = org.apache.commons.bcel6.Constants.IINC;
- this.length = (short) 3;
+ super.setOpcode(org.apache.commons.bcel6.Constants.IINC);
+ super.setLength((short) 3);
setIndex(n); // May set wide as side effect
setIncrement(c);
}
@@ -63,23 +63,23 @@ public class IINC extends LocalVariableI
if (wide) {
out.writeByte(org.apache.commons.bcel6.Constants.WIDE);
}
- out.writeByte(opcode);
+ out.writeByte(super.getOpcode());
if (wide) {
- out.writeShort(n);
+ out.writeShort(super.getIndex());
out.writeShort(c);
} else {
- out.writeByte(n);
+ out.writeByte(super.getIndex());
out.writeByte(c);
}
}
private void setWide() {
- wide = (n > org.apache.commons.bcel6.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE);
+ wide = (super.getIndex() > org.apache.commons.bcel6.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE);
if (wide) {
- length = 6; // wide byte included
+ super.setLength(6); // wide byte included
} else {
- length = 3;
+ super.setLength(3);
}
}
@@ -91,12 +91,12 @@ public class IINC extends LocalVariableI
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
this.wide = wide;
if (wide) {
- length = 6;
- n = bytes.readUnsignedShort();
+ super.setLength(6);
+ super.setIndex(bytes.readUnsignedShort());
c = bytes.readShort();
} else {
- length = 3;
- n = bytes.readUnsignedByte();
+ super.setLength(3);
+ super.setIndex(bytes.readUnsignedByte());
c = bytes.readByte();
}
}
@@ -119,7 +119,7 @@ public class IINC extends LocalVariableI
if (n < 0) {
throw new ClassGenException("Negative index value: " + n);
}
- this.n = n;
+ super.setIndex(n);
setWide();
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java?rev=1697704&r1=1697703&r2=1697704&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java Tue Aug 25 15:34:01 2015
@@ -35,7 +35,7 @@ public interface InstructionComparator {
@Override
public boolean equals( Instruction i1, Instruction i2 ) {
- if (i1.opcode == i2.opcode) {
+ if (i1.getOpcode() == i2.getOpcode()) {
if (i1 instanceof Select) {
InstructionHandle[] t1 = ((Select) i1).getTargets();
InstructionHandle[] t2 = ((Select) i2).getTargets();
@@ -48,7 +48,7 @@ public interface InstructionComparator {
return true;
}
} else if (i1 instanceof BranchInstruction) {
- return ((BranchInstruction) i1).target == ((BranchInstruction) i2).target;
+ return ((BranchInstruction) i1).getTarget() == ((BranchInstruction) i2).getTarget();
} else if (i1 instanceof ConstantPushInstruction) {
return ((ConstantPushInstruction) i1).getValue().equals(
((ConstantPushInstruction) i2).getValue());