Author: sebb
Date: Tue Aug 25 16:31:01 2015
New Revision: 1697724
URL: http://svn.apache.org/r1697724
Log:
Replace direct use of external fields with getter/setter
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java?rev=1697724&r1=1697723&r2=1697724&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
Tue Aug 25 16:31:01 2015
@@ -50,7 +50,7 @@ public class MULTIANEWARRAY extends CPIn
throw new ClassGenException("Invalid dimensions value: " +
dimensions);
}
this.dimensions = dimensions;
- length = 4;
+ super.setLength(4);
}
@@ -60,7 +60,7 @@ public class MULTIANEWARRAY extends CPIn
*/
@Override
public void dump( DataOutputStream out ) throws IOException {
- out.writeByte(opcode);
+ out.writeByte(super.getOpcode());
out.writeShort(super.getIndex());
out.writeByte(dimensions);
}
@@ -73,7 +73,7 @@ public class MULTIANEWARRAY extends CPIn
protected void initFromFile( ByteSequence bytes, boolean wide ) throws
IOException {
super.initFromFile(bytes, wide);
dimensions = bytes.readByte();
- length = 4;
+ super.setLength(4);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java?rev=1697724&r1=1697723&r2=1697724&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NEWARRAY.java
Tue Aug 25 16:31:01 2015
@@ -60,7 +60,7 @@ public class NEWARRAY extends Instructio
*/
@Override
public void dump( DataOutputStream out ) throws IOException {
- out.writeByte(opcode);
+ out.writeByte(super.getOpcode());
out.writeByte(type);
}
@@ -96,7 +96,7 @@ public class NEWARRAY extends Instructio
@Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws
IOException {
type = bytes.readByte();
- length = 2;
+ super.setLength(2);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java?rev=1697724&r1=1697723&r2=1697724&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/RET.java
Tue Aug 25 16:31:01 2015
@@ -58,7 +58,7 @@ public class RET extends Instruction imp
if (wide) {
out.writeByte(org.apache.commons.bcel6.Constants.WIDE);
}
- out.writeByte(opcode);
+ out.writeByte(super.getOpcode());
if (wide) {
out.writeShort(index);
} else {
@@ -70,9 +70,9 @@ public class RET extends Instruction imp
private void setWide() {
wide = index > org.apache.commons.bcel6.Constants.MAX_BYTE;
if (wide) {
- length = 4; // Including the wide byte
+ super.setLength(4); // Including the wide byte
} else {
- length = 2;
+ super.setLength(2);
}
}
@@ -85,10 +85,10 @@ public class RET extends Instruction imp
this.wide = wide;
if (wide) {
index = bytes.readUnsignedShort();
- length = 4;
+ super.setLength(4);
} else {
index = bytes.readUnsignedByte();
- length = 2;
+ super.setLength(2);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java?rev=1697724&r1=1697723&r2=1697724&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ReturnInstruction.java
Tue Aug 25 16:31:01 2015
@@ -45,7 +45,8 @@ public abstract class ReturnInstruction
public Type getType() {
- switch (opcode) {
+ final short _opcode = super.getOpcode();
+ switch (_opcode) {
case Constants.IRETURN:
return Type.INT;
case Constants.LRETURN:
@@ -59,7 +60,7 @@ public abstract class ReturnInstruction
case Constants.RETURN:
return Type.VOID;
default: // Never reached
- throw new ClassGenException("Unknown type " + opcode);
+ throw new ClassGenException("Unknown type " + _opcode);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java?rev=1697724&r1=1697723&r2=1697724&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SIPUSH.java
Tue Aug 25 16:31:01 2015
@@ -72,7 +72,7 @@ public class SIPUSH extends Instruction
*/
@Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws
IOException {
- length = 3;
+ super.setLength(3);
b = bytes.readShort();
}
