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/13 00:34:54 UTC
svn commit: r1695618 -
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/
Author: sebb
Date: Wed Aug 12 22:34:54 2015
New Revision: 1695618
URL: http://svn.apache.org/r1695618
Log:
BCEL-232 Make mutable fields private.
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchHandle.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/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/IFEQ.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionComparator.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchHandle.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchHandle.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchHandle.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchHandle.java Wed Aug 12 22:34:54 2015
@@ -70,20 +70,20 @@ public final class BranchHandle extends
*/
@Override
public int getPosition() {
- return bi.position;
+ return bi.getPosition();
}
@Override
void setPosition( int pos ) {
- i_position = bi.position = pos;
+ i_position = bi.setGetPosition(pos);
}
@Override
protected int updatePosition( int offset, int max_offset ) {
int x = bi.updatePosition(offset, max_offset);
- i_position = bi.position;
+ i_position = bi.getPosition();
return x;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/BranchInstruction.java Wed Aug 12 22:34:54 2015
@@ -33,9 +33,9 @@ import org.apache.commons.bcel6.util.Byt
public abstract class BranchInstruction extends Instruction implements InstructionTargeter {
private static final long serialVersionUID = 3225905281842405051L;
- protected int index; // Branch target relative to this instruction
- protected InstructionHandle target; // Target object in instruction list
- protected int position; // Byte code offset
+ private int index; // Branch target relative to this instruction
+ private InstructionHandle target; // Target object in instruction list
+ private int position; // Byte code offset
/**
@@ -233,4 +233,31 @@ public abstract class BranchInstruction
index = -1;
position = -1;
}
+
+
+ /**
+ * @return the position
+ */
+ public int getPosition() {
+ return position;
+ }
+
+
+ /**
+ * @param position the position to set
+ * @return the new position
+ */
+ public int setGetPosition(int position) {
+ this.position = position;
+ return position;
+ }
+
+
+ /**
+ * @param index the index to set
+ */
+ protected void setIndex(int index) {
+ this.index = index;
+ }
+
}
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=1695618&r1=1695617&r2=1695618&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 Wed Aug 12 22:34:54 2015
@@ -49,13 +49,13 @@ public class GOTO extends GotoInstructio
*/
@Override
public void dump( DataOutputStream out ) throws IOException {
- index = getTargetOffset();
+ super.setIndex(getTargetOffset());
if (opcode == org.apache.commons.bcel6.Constants.GOTO) {
super.dump(out);
} else { // GOTO_W
- index = getTargetOffset();
+ super.setIndex(getTargetOffset());
out.writeByte(opcode);
- out.writeInt(index);
+ out.writeInt(super.getIndex());
}
}
@@ -66,7 +66,7 @@ public class GOTO extends GotoInstructio
@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
+ setGetPosition(getPosition() + offset); // Position may be shifted by preceding expansions
if (Math.abs(i) >= (32767 - max_offset)) { // to large for short (estimate)
opcode = org.apache.commons.bcel6.Constants.GOTO_W;
short old_length = length;
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=1695618&r1=1695617&r2=1695618&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 Wed Aug 12 22:34:54 2015
@@ -52,9 +52,9 @@ public class GOTO_W extends GotoInstruct
*/
@Override
public void dump( DataOutputStream out ) throws IOException {
- index = getTargetOffset();
+ super.setIndex(getTargetOffset());
out.writeByte(opcode);
- out.writeInt(index);
+ out.writeInt(super.getIndex());
}
@@ -63,7 +63,7 @@ public class GOTO_W extends GotoInstruct
*/
@Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
- index = bytes.readInt();
+ super.setIndex(bytes.readInt());
length = 5;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFEQ.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFEQ.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFEQ.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFEQ.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFEQ extends IfInstruction
*/
@Override
public IfInstruction negate() {
- return new IFNE(target);
+ return new IFNE(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGE.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFGE extends IfInstruction
*/
@Override
public IfInstruction negate() {
- return new IFLT(target);
+ return new IFLT(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFGT.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFGT extends IfInstruction
*/
@Override
public IfInstruction negate() {
- return new IFLE(target);
+ return new IFLE(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLE.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFLE extends IfInstruction
*/
@Override
public IfInstruction negate() {
- return new IFGT(target);
+ return new IFGT(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFLT.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFLT extends IfInstruction
*/
@Override
public IfInstruction negate() {
- return new IFGE(target);
+ return new IFGE(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNE.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFNE extends IfInstruction
*/
@Override
public IfInstruction negate() {
- return new IFEQ(target);
+ return new IFEQ(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNONNULL.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFNONNULL extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IFNULL(target);
+ return new IFNULL(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IFNULL.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IFNULL extends IfInstructio
*/
@Override
public IfInstruction negate() {
- return new IFNONNULL(target);
+ return new IFNONNULL(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPEQ.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ACMPEQ extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ACMPNE(target);
+ return new IF_ACMPNE(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ACMPNE.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ACMPNE extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ACMPEQ(target);
+ return new IF_ACMPEQ(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPEQ.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ICMPEQ extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ICMPNE(target);
+ return new IF_ICMPNE(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGE.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ICMPGE extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ICMPLT(target);
+ return new IF_ICMPLT(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPGT.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ICMPGT extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ICMPLE(target);
+ return new IF_ICMPLE(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLE.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ICMPLE extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ICMPGT(target);
+ return new IF_ICMPGT(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPLT.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ICMPLT extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ICMPGE(target);
+ return new IF_ICMPGE(super.getTarget());
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/IF_ICMPNE.java Wed Aug 12 22:34:54 2015
@@ -47,7 +47,7 @@ public class IF_ICMPNE extends IfInstruc
*/
@Override
public IfInstruction negate() {
- return new IF_ICMPEQ(target);
+ return new IF_ICMPEQ(super.getTarget());
}
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=1695618&r1=1695617&r2=1695618&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 Wed Aug 12 22:34:54 2015
@@ -47,7 +47,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());
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java Wed Aug 12 22:34:54 2015
@@ -196,7 +196,7 @@ public class InstructionList implements
for (int i = 0; i < count; i++) {
if (ihs[i] instanceof BranchHandle) {
BranchInstruction bi = (BranchInstruction) ihs[i].instruction;
- int target = bi.position + bi.getIndex(); /* Byte code position:
+ int target = bi.getPosition() + bi.getIndex(); /* Byte code position:
* relative -> absolute. */
// Search for target position
InstructionHandle ih = findHandle(ihs, pos, count, target);
@@ -209,7 +209,7 @@ public class InstructionList implements
Select s = (Select) bi;
int[] indices = s.getIndices();
for (int j = 0; j < indices.length; j++) {
- target = bi.position + indices[j];
+ target = bi.getPosition() + indices[j];
ih = findHandle(ihs, pos, count, target);
if (ih == null) {
throw new ClassGenException("Couldn't find target for switch: " + bi);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR.java Wed Aug 12 22:34:54 2015
@@ -49,13 +49,13 @@ public class JSR extends JsrInstruction
*/
@Override
public void dump( DataOutputStream out ) throws IOException {
- index = getTargetOffset();
+ super.setIndex(getTargetOffset());
if (opcode == org.apache.commons.bcel6.Constants.JSR) {
super.dump(out);
} else { // JSR_W
- index = getTargetOffset();
+ super.setIndex(getTargetOffset());
out.writeByte(opcode);
- out.writeInt(index);
+ out.writeInt(super.getIndex());
}
}
@@ -63,7 +63,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
+ setGetPosition(getPosition() + offset); // Position may be shifted by preceding expansions
if (Math.abs(i) >= (32767 - max_offset)) { // to large for short (estimate)
opcode = org.apache.commons.bcel6.Constants.JSR_W;
short old_length = length;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JSR_W.java Wed Aug 12 22:34:54 2015
@@ -52,9 +52,9 @@ public class JSR_W extends JsrInstructio
*/
@Override
public void dump( DataOutputStream out ) throws IOException {
- index = getTargetOffset();
+ super.setIndex(getTargetOffset());
out.writeByte(opcode);
- out.writeInt(index);
+ out.writeInt(super.getIndex());
}
@@ -63,7 +63,7 @@ public class JSR_W extends JsrInstructio
*/
@Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException {
- index = bytes.readInt();
+ super.setIndex(bytes.readInt());
length = 5;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java?rev=1695618&r1=1695617&r2=1695618&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/JsrInstruction.java Wed Aug 12 22:34:54 2015
@@ -60,7 +60,7 @@ public abstract class JsrInstruction ext
* will be executed when RETurned from a subroutine.
*/
public InstructionHandle physicalSuccessor() {
- InstructionHandle ih = this.target;
+ InstructionHandle ih = super.getTarget();
// Rewind!
while (ih.getPrev() != null) {
ih = ih.getPrev();
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=1695618&r1=1695617&r2=1695618&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 Aug 12 22:34:54 2015
@@ -89,11 +89,11 @@ public abstract class Select extends Bra
*/
@Override
protected int updatePosition( int offset, int max_offset ) {
- position += offset; // Additional offset caused by preceding SWITCHs, GOTOs, etc.
+ setGetPosition(getPosition() + offset); // Additional offset caused by preceding SWITCHs, GOTOs, etc.
short old_length = length;
/* Alignment on 4-byte-boundary, + 1, because of tag byte.
*/
- padding = (4 - ((position + 1) % 4)) % 4;
+ padding = (4 - ((getPosition() + 1) % 4)) % 4;
length = (short) (fixed_length + padding); // Update length
return length - old_length;
}
@@ -109,8 +109,8 @@ public abstract class Select extends Bra
for (int i = 0; i < padding; i++) {
out.writeByte(0);
}
- index = getTargetOffset(); // Write default target offset
- out.writeInt(index);
+ super.setIndex(getTargetOffset()); // Write default target offset
+ out.writeInt(super.getIndex());
}
@@ -124,7 +124,7 @@ public abstract class Select extends Bra
bytes.readByte();
}
// Default branch target common for both cases (TABLESWITCH, LOOKUPSWITCH)
- index = bytes.readInt();
+ super.setIndex(bytes.readInt());
}
@@ -166,7 +166,7 @@ public abstract class Select extends Bra
@Override
public void updateTarget( InstructionHandle old_ih, InstructionHandle new_ih ) {
boolean targeted = false;
- if (target == old_ih) {
+ if (super.getTarget() == old_ih) {
targeted = true;
setTarget(new_ih);
}
@@ -187,7 +187,7 @@ public abstract class Select extends Bra
*/
@Override
public boolean containsTarget( InstructionHandle ih ) {
- if (target == ih) {
+ if (super.getTarget() == ih) {
return true;
}
for (InstructionHandle target2 : targets) {