Author: sebb
Date: Wed Aug 12 23:30:09 2015
New Revision: 1695625
URL: http://svn.apache.org/r1695625
Log:
BCEL-232 Make mutable fields private.
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java
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/NameSignatureInstruction.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CPInstruction.java
Wed Aug 12 23:30:09 2015
@@ -39,7 +39,8 @@ public abstract class CPInstruction exte
IndexedInstruction {
private static final long serialVersionUID = 2968547649792233082L;
- protected int index; // index to constant pool
+
+ private int index; // index to constant pool
/**
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ConstantPoolGen.java
Wed Aug 12 23:30:09 2015
@@ -53,9 +53,9 @@ import org.apache.commons.bcel6.classfil
public class ConstantPoolGen implements java.io.Serializable {
private static final long serialVersionUID = 6664071417323174824L;
- protected int size;
+ private int size;
private Constant[] constants;
- protected int index = 1; // First entry (0) used by JVM
+ private int index = 1; // First entry (0) used by JVM
private static final String METHODREF_DELIM = ":";
private static final String IMETHODREF_DELIM = "#";
private static final String FIELDREF_DELIM = "&";
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldInstruction.java
Wed Aug 12 23:30:09 2015
@@ -51,7 +51,7 @@ public abstract class FieldInstruction e
@Override
public String toString( ConstantPool cp ) {
return org.apache.commons.bcel6.Constants.OPCODE_NAMES[opcode] + " "
- + cp.constantToString(index,
org.apache.commons.bcel6.Constants.CONSTANT_Fieldref);
+ + cp.constantToString(super.getIndex(),
org.apache.commons.bcel6.Constants.CONSTANT_Fieldref);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldOrMethod.java
Wed Aug 12 23:30:09 2015
@@ -56,7 +56,7 @@ public abstract class FieldOrMethod exte
*/
public String getSignature( ConstantPoolGen cpg ) {
ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
+ ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex());
ConstantNameAndType cnat = (ConstantNameAndType)
cp.getConstant(cmr.getNameAndTypeIndex());
return ((ConstantUtf8)
cp.getConstant(cnat.getSignatureIndex())).getBytes();
}
@@ -66,7 +66,7 @@ public abstract class FieldOrMethod exte
*/
public String getName( ConstantPoolGen cpg ) {
ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
+ ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex());
ConstantNameAndType cnat = (ConstantNameAndType)
cp.getConstant(cmr.getNameAndTypeIndex());
return ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes();
}
@@ -84,7 +84,7 @@ public abstract class FieldOrMethod exte
// @Deprecated
public String getClassName( ConstantPoolGen cpg ) {
ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
+ ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex());
String className = cp.getConstantString(cmr.getClassIndex(),
org.apache.commons.bcel6.Constants.CONSTANT_Class);
if (className.startsWith("[")) {
@@ -105,7 +105,7 @@ public abstract class FieldOrMethod exte
*/
public ReferenceType getReferenceType( ConstantPoolGen cpg ) {
ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
+ ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex());
String className = cp.getConstantString(cmr.getClassIndex(),
org.apache.commons.bcel6.Constants.CONSTANT_Class);
if (className.startsWith("[")) {
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEDYNAMIC.java
Wed Aug 12 23:30:09 2015
@@ -58,7 +58,7 @@ public class INVOKEDYNAMIC extends Invok
@Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
- out.writeShort(index);
+ out.writeShort(super.getIndex());
out.writeByte(0);
out.writeByte(0);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/INVOKEINTERFACE.java
Wed Aug 12 23:30:09 2015
@@ -62,7 +62,7 @@ public final class INVOKEINTERFACE exten
@Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
- out.writeShort(index);
+ out.writeShort(super.getIndex());
out.writeByte(nargs);
out.writeByte(0);
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java
Wed Aug 12 23:30:09 2015
@@ -55,7 +55,7 @@ public abstract class InvokeInstruction
*/
@Override
public String toString( ConstantPool cp ) {
- Constant c = cp.getConstant(index);
+ Constant c = cp.getConstant(super.getIndex());
StringTokenizer tok = new StringTokenizer(cp.constantToString(c));
return Constants.OPCODE_NAMES[opcode] + " " +
tok.nextToken().replace('.', '/')
+ tok.nextToken();
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java
Wed Aug 12 23:30:09 2015
@@ -51,7 +51,7 @@ public class LDC extends CPInstruction i
// Adjust to proper size
protected final void setSize() {
- if (index <= org.apache.commons.bcel6.Constants.MAX_BYTE) { // Fits in
one byte?
+ if (super.getIndex() <= org.apache.commons.bcel6.Constants.MAX_BYTE) {
// Fits in one byte?
opcode = org.apache.commons.bcel6.Constants.LDC;
length = 2;
} else {
@@ -69,9 +69,9 @@ public class LDC extends CPInstruction i
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
if (length == 2) {
- out.writeByte(index);
+ out.writeByte(super.getIndex());
} else {
- out.writeShort(index);
+ out.writeShort(super.getIndex());
}
}
@@ -92,12 +92,12 @@ public class LDC extends CPInstruction i
@Override
protected void initFromFile( ByteSequence bytes, boolean wide ) throws
IOException {
length = 2;
- index = bytes.readUnsignedByte();
+ super.setIndex(bytes.readUnsignedByte());
}
public Object getValue( ConstantPoolGen cpg ) {
- org.apache.commons.bcel6.classfile.Constant c =
cpg.getConstantPool().getConstant(index);
+ org.apache.commons.bcel6.classfile.Constant c =
cpg.getConstantPool().getConstant(super.getIndex());
switch (c.getTag()) {
case org.apache.commons.bcel6.Constants.CONSTANT_String:
int i = ((org.apache.commons.bcel6.classfile.ConstantString)
c).getStringIndex();
@@ -112,14 +112,14 @@ public class LDC extends CPInstruction i
c = cpg.getConstantPool().getConstant(nameIndex);
return new
ObjectType(((org.apache.commons.bcel6.classfile.ConstantUtf8) c).getBytes());
default: // Never reached
- throw new RuntimeException("Unknown or invalid constant type
at " + index);
+ throw new RuntimeException("Unknown or invalid constant type
at " + super.getIndex());
}
}
@Override
public Type getType( ConstantPoolGen cpg ) {
- switch (cpg.getConstantPool().getConstant(index).getTag()) {
+ switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) {
case org.apache.commons.bcel6.Constants.CONSTANT_String:
return Type.STRING;
case org.apache.commons.bcel6.Constants.CONSTANT_Float:
@@ -129,7 +129,7 @@ public class LDC extends CPInstruction i
case org.apache.commons.bcel6.Constants.CONSTANT_Class:
return Type.CLASS;
default: // Never reached
- throw new RuntimeException("Unknown or invalid constant type
at " + index);
+ throw new RuntimeException("Unknown or invalid constant type
at " + super.getIndex());
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC2_W.java
Wed Aug 12 23:30:09 2015
@@ -44,7 +44,7 @@ public class LDC2_W extends CPInstructio
@Override
public Type getType( ConstantPoolGen cpg ) {
- switch (cpg.getConstantPool().getConstant(index).getTag()) {
+ switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) {
case org.apache.commons.bcel6.Constants.CONSTANT_Long:
return Type.LONG;
case org.apache.commons.bcel6.Constants.CONSTANT_Double:
@@ -56,14 +56,14 @@ public class LDC2_W extends CPInstructio
public Number getValue( ConstantPoolGen cpg ) {
- org.apache.commons.bcel6.classfile.Constant c =
cpg.getConstantPool().getConstant(index);
+ org.apache.commons.bcel6.classfile.Constant c =
cpg.getConstantPool().getConstant(super.getIndex());
switch (c.getTag()) {
case org.apache.commons.bcel6.Constants.CONSTANT_Long:
return
Long.valueOf(((org.apache.commons.bcel6.classfile.ConstantLong) c).getBytes());
case org.apache.commons.bcel6.Constants.CONSTANT_Double:
return new
Double(((org.apache.commons.bcel6.classfile.ConstantDouble) c).getBytes());
default: // Never reached
- throw new RuntimeException("Unknown or invalid constant type
at " + index);
+ throw new RuntimeException("Unknown or invalid constant type
at " + super.getIndex());
}
}
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=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MULTIANEWARRAY.java
Wed Aug 12 23:30:09 2015
@@ -62,7 +62,7 @@ public class MULTIANEWARRAY extends CPIn
@Override
public void dump( DataOutputStream out ) throws IOException {
out.writeByte(opcode);
- out.writeShort(index);
+ out.writeShort(super.getIndex());
out.writeByte(dimensions);
}
@@ -91,7 +91,7 @@ public class MULTIANEWARRAY extends CPIn
*/
@Override
public String toString( boolean verbose ) {
- return super.toString(verbose) + " " + index + " " + dimensions;
+ return super.toString(verbose) + " " + super.getIndex() + " " +
dimensions;
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java?rev=1695625&r1=1695624&r2=1695625&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/NameSignatureInstruction.java
Wed Aug 12 23:30:09 2015
@@ -43,7 +43,7 @@ public abstract class NameSignatureInstr
public ConstantNameAndType getNameAndType(ConstantPoolGen cpg) {
ConstantPool cp = cpg.getConstantPool();
- ConstantCP cmr = (ConstantCP) cp.getConstant(index);
+ ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex());
return (ConstantNameAndType)
cp.getConstant(cmr.getNameAndTypeIndex());
}
/** @return signature of referenced method/field.
