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/18 12:17:54 UTC
svn commit: r1696385 - in /commons/proper/bcel/trunk/src: changes/
main/java/org/apache/commons/bcel6/classfile/
main/java/org/apache/commons/bcel6/generic/
Author: sebb
Date: Tue Aug 18 10:17:53 2015
New Revision: 1696385
URL: http://svn.apache.org/r1696385
Log:
Revert most of BCEL-232
Re-instate "unused" setters; revert protections on mutable fields for now.
Modified:
commons/proper/bcel/trunk/src/changes/changes.xml
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.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/CPInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassElementValueGen.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/ElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/EnumElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.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/LDC.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
Modified: commons/proper/bcel/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/changes/changes.xml?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/changes/changes.xml (original)
+++ commons/proper/bcel/trunk/src/changes/changes.xml Tue Aug 18 10:17:53 2015
@@ -72,7 +72,6 @@ The <action> type attribute can be add,u
<action issue="BCEL-217" type="fix">long type instructions are not searched by InstructionFinder using regular expression</action>
<action issue="BCEL-244" type="update" dev="ggregory">Update Java requirement from 5 to 7</action>
<action issue="BCEL-239" type="fix">Interfaces should not be used to define constants</action>
- <action issue="BCEL-232" type="fix">Make mutable fields private</action>
<action issue="BCEL-234" type="fix">Code must not swallow Throwable</action>
<action issue="BCEL-222" type="update">
Major release of BCEL requires updating package name and maven coordinates.
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java Tue Aug 18 10:17:53 2015
@@ -52,13 +52,13 @@ public abstract class Attribute implemen
{
private static final long serialVersionUID = -1707826820310002955L;
- private int name_index; // Points to attribute name in constant pool
+ protected int name_index; // Points to attribute name in constant pool TODO make private (has getter & setter)
- private int length; // Content length of attribute field
+ protected int length; // Content length of attribute field TODO make private (has getter & setter)
- private final byte tag; // Tag to distinguish subclasses
+ protected byte tag; // Tag to distinguish subclasses TODO make private & final; supposed to be immutable
- private ConstantPool constant_pool;
+ protected ConstantPool constant_pool; // TODO make private (has getter & setter)
protected Attribute(byte tag, int name_index, int length, ConstantPool constant_pool)
{
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java Tue Aug 18 10:17:53 2015
@@ -59,7 +59,7 @@ public abstract class Constant implement
* need the tag as an index to select the corresponding class name from the
* `CONSTANT_NAMES' array.
*/
- private final byte tag;
+ protected byte tag; // TODO should be private & final
Constant(byte tag) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ConstantCP.java Tue Aug 18 10:17:53 2015
@@ -40,9 +40,9 @@ public abstract class ConstantCP extends
*/
// Note that this field is used to store the
// bootstrap_method_attr_index of a ConstantInvokeDynamic.
- private final int class_index;
+ protected int class_index; // TODO make private (has getter & setter)
// This field has the same meaning for all subclasses.
- private final int name_and_type_index;
+ protected int name_and_type_index; // TODO make private (has getter & setter)
/**
@@ -110,6 +110,25 @@ public abstract class ConstantCP extends
/**
+ * @param class_index points to Constant_class
+ */
+ public final void setClassIndex( int class_index ) {
+ this.class_index = class_index;
+ }
+
+
+ /**
+ * @param bootstrap_method_attr_index points to a BootstrapMethod.
+ *
+ * Note that this method is a functional duplicate of setClassIndex
+ * for use by ConstantInvokeDynamic.
+ */
+ public final void setBootstrapMethodAttrIndex(int bootstrap_method_attr_index) {
+ this.class_index = bootstrap_method_attr_index;
+ }
+
+
+ /**
* @return Reference (index) to signature of the field.
*/
public final int getNameAndTypeIndex() {
@@ -117,6 +136,14 @@ public abstract class ConstantCP extends
}
+ /**
+ * @param name_and_type_index points to Constant_NameAndType
+ */
+ public final void setNameAndTypeIndex( int name_and_type_index ) {
+ this.name_and_type_index = name_and_type_index;
+ }
+
+
/**
* @return Class this field belongs to.
*/
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValue.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ElementValue.java Tue Aug 18 10:17:53 2015
@@ -27,9 +27,9 @@ import java.io.IOException;
*/
public abstract class ElementValue
{
- protected final int type;
+ protected int type; // TODO should be final
- protected final ConstantPool cpool;
+ protected ConstantPool cpool; // TODO should be final
@Override
public String toString()
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/FieldOrMethod.java Tue Aug 18 10:17:53 2015
@@ -32,11 +32,12 @@ public abstract class FieldOrMethod exte
private static final long serialVersionUID = -1833306330869469714L;
- private int name_index; // Points to field name in constant pool
- private int signature_index; // Points to encoded signature
- private Attribute[] attributes; // Collection of attributes
- private AnnotationEntry[] annotationEntries; // annotations defined on the field or method
- private ConstantPool constant_pool;
+ // TODO should be made private
+ protected int name_index; // Points to field name in constant pool
+ protected int signature_index; // Points to encoded signature
+ protected Attribute[] attributes; // Collection of attributes
+ protected AnnotationEntry[] annotationEntries; // annotations defined on the field or method
+ protected ConstantPool constant_pool;
private String signatureAttributeString = null;
private boolean searchedForSignatureAttribute = false;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationElementValueGen.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationElementValueGen.java Tue Aug 18 10:17:53 2015
@@ -74,8 +74,9 @@ public class AnnotationElementValueGen e
@Override
public ElementValue getElementValue()
{
- return new AnnotationElementValue(super.getElementValueType(), a.getAnnotation(), getConstantPoolgen()
- .getConstantPool());
+ return new AnnotationElementValue(super.getElementValueType(),
+ a.getAnnotation(),
+ getConstantPool().getConstantPool());
}
public AnnotationEntryGen getAnnotation()
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayElementValueGen.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayElementValueGen.java Tue Aug 18 10:17:53 2015
@@ -65,8 +65,9 @@ public class ArrayElementValueGen extend
for (ElementValueGen element : evalues) {
immutableData[i++] = element.getElementValue();
}
- return new ArrayElementValue(super.getElementValueType(), immutableData, getConstantPoolgen()
- .getConstantPool());
+ return new ArrayElementValue(super.getElementValueType(),
+ immutableData,
+ getConstantPool().getConstantPool());
}
/**
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ArrayType.java Tue Aug 18 10:17:53 2015
@@ -79,7 +79,7 @@ public final class ArrayType extends Ref
buf.append('[');
}
buf.append(basic_type.getSignature());
- setSignature(buf.toString());
+ super.setSignature(buf.toString());
}
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=1696385&r1=1696384&r2=1696385&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 Tue Aug 18 10:17:53 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;
- private int index; // Branch target relative to this instruction
- private InstructionHandle target; // Target object in instruction list
- private int position; // Byte code offset
+ protected int index; // Branch target relative to this instruction
+ protected InstructionHandle target; // Target object in instruction list
+ protected int position; // Byte code offset
/**
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=1696385&r1=1696384&r2=1696385&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 Tue Aug 18 10:17:53 2015
@@ -40,7 +40,7 @@ public abstract class CPInstruction exte
private static final long serialVersionUID = 2968547649792233082L;
- private int index; // index to constant pool
+ protected int index; // index to constant pool
/**
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassElementValueGen.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassElementValueGen.java Tue Aug 18 10:17:53 2015
@@ -56,7 +56,9 @@ public class ClassElementValueGen extend
@Override
public ElementValue getElementValue()
{
- return new ClassElementValue(super.getElementValueType(), idx, getConstantPoolgen().getConstantPool());
+ return new ClassElementValue(super.getElementValueType(),
+ idx,
+ getConstantPool().getConstantPool());
}
public ClassElementValueGen(ClassElementValue value, ConstantPoolGen cpool,
@@ -81,7 +83,7 @@ public class ClassElementValueGen extend
public String getClassString()
{
- ConstantUtf8 cu8 = (ConstantUtf8) getConstantPoolgen().getConstant(idx);
+ ConstantUtf8 cu8 = (ConstantUtf8) getConstantPool().getConstant(idx);
return cu8.getBytes();
// ConstantClass c = (ConstantClass)getConstantPool().getConstant(idx);
// ConstantUtf8 utf8 =
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=1696385&r1=1696384&r2=1696385&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 Tue Aug 18 10:17:53 2015
@@ -53,9 +53,9 @@ import org.apache.commons.bcel6.classfil
public class ConstantPoolGen implements java.io.Serializable {
private static final long serialVersionUID = 6664071417323174824L;
- private int size;
+ protected int size;
protected Constant[] constants;
- private int index = 1; // First entry (0) used by JVM
+ protected 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/ElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ElementValueGen.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ElementValueGen.java Tue Aug 18 10:17:53 2015
@@ -34,9 +34,9 @@ import org.apache.commons.bcel6.classfil
*/
public abstract class ElementValueGen
{
- private final int type;
+ protected int type;
- private final ConstantPoolGen cpGen;
+ protected ConstantPoolGen cpGen;
protected ElementValueGen(int type, ConstantPoolGen cpGen)
{
@@ -143,7 +143,7 @@ public abstract class ElementValueGen
}
}
- protected ConstantPoolGen getConstantPoolgen()
+ protected ConstantPoolGen getConstantPool()
{
return cpGen;
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/EnumElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/EnumElementValueGen.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/EnumElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/EnumElementValueGen.java Tue Aug 18 10:17:53 2015
@@ -59,8 +59,8 @@ public class EnumElementValueGen extends
{
System.err.println("Duplicating value: " + getEnumTypeString() + ":"
+ getEnumValueString());
- return new EnumElementValue(super.getElementValueType(), typeIdx, valueIdx, getConstantPoolgen()
- .getConstantPool());
+ return new EnumElementValue(super.getElementValueType(), typeIdx, valueIdx,
+ getConstantPool().getConstantPool());
}
public EnumElementValueGen(ObjectType t, String value, ConstantPoolGen cpool)
@@ -99,8 +99,7 @@ public class EnumElementValueGen extends
@Override
public String stringifyValue()
{
- ConstantUtf8 cu8 = (ConstantUtf8) getConstantPoolgen().getConstant(
- valueIdx);
+ ConstantUtf8 cu8 = (ConstantUtf8) getConstantPool().getConstant(valueIdx);
return cu8.getBytes();
// ConstantString cu8 =
// (ConstantString)getConstantPool().getConstant(valueIdx);
@@ -117,15 +116,14 @@ public class EnumElementValueGen extends
// (ConstantClass)getConstantPool().getConstant(typeIdx);
// return
// ((ConstantUtf8)getConstantPool().getConstant(cu8.getNameIndex())).getBytes();
- return ((ConstantUtf8) getConstantPoolgen().getConstant(typeIdx))
+ return ((ConstantUtf8) getConstantPool().getConstant(typeIdx))
.getBytes();
// return Utility.signatureToString(cu8.getBytes());
}
public String getEnumValueString()
{
- return ((ConstantUtf8) getConstantPoolgen().getConstant(valueIdx))
- .getBytes();
+ return ((ConstantUtf8) getConstantPool().getConstant(valueIdx)).getBytes();
// ConstantString cu8 =
// (ConstantString)getConstantPool().getConstant(valueIdx);
// return
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Instruction.java Tue Aug 18 10:17:53 2015
@@ -504,9 +504,9 @@ public abstract class Instruction implem
/**
- * Needed in readInstruction.
+ * Needed in readInstruction and subclasses in this package
*/
- private void setOpcode( short opcode ) {
+ void setOpcode( short opcode ) {
this.opcode = opcode;
}
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=1696385&r1=1696384&r2=1696385&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 18 10:17:53 2015
@@ -48,7 +48,7 @@ public interface InstructionComparator {
return true;
}
} else if (i1 instanceof BranchInstruction) {
- return ((BranchInstruction) i1).getTarget() == ((BranchInstruction) i2).getTarget();
+ return ((BranchInstruction) i1).target == ((BranchInstruction) i2).target;
} 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/LDC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LDC.java?rev=1696385&r1=1696384&r2=1696385&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 Tue Aug 18 10:17:53 2015
@@ -52,10 +52,10 @@ public class LDC extends CPInstruction i
// Adjust to proper size
protected final void setSize() {
if (super.getIndex() <= org.apache.commons.bcel6.Constants.MAX_BYTE) { // Fits in one byte?
- opcode = org.apache.commons.bcel6.Constants.LDC;
+ super.setOpcode(org.apache.commons.bcel6.Constants.LDC);
length = 2;
} else {
- opcode = org.apache.commons.bcel6.Constants.LDC_W;
+ super.setOpcode(org.apache.commons.bcel6.Constants.LDC_W);
length = 3;
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/SimpleElementValueGen.java Tue Aug 18 10:17:53 2015
@@ -53,59 +53,59 @@ public class SimpleElementValueGen exten
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, int value)
{
super(type, cpGen);
- idx = cpGen.addInteger(value);
+ idx = getConstantPool().addInteger(value);
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, long value)
{
super(type, cpGen);
- idx = cpGen.addLong(value);
+ idx = getConstantPool().addLong(value);
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, double value)
{
super(type, cpGen);
- idx = cpGen.addDouble(value);
+ idx = getConstantPool().addDouble(value);
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, float value)
{
super(type, cpGen);
- idx = cpGen.addFloat(value);
+ idx = getConstantPool().addFloat(value);
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, short value)
{
super(type, cpGen);
- idx = cpGen.addInteger(value);
+ idx = getConstantPool().addInteger(value);
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, byte value)
{
super(type, cpGen);
- idx = cpGen.addInteger(value);
+ idx = getConstantPool().addInteger(value);
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, char value)
{
super(type, cpGen);
- idx = cpGen.addInteger(value);
+ idx = getConstantPool().addInteger(value);
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, boolean value)
{
super(type, cpGen);
if (value) {
- idx = cpGen.addInteger(1);
+ idx = getConstantPool().addInteger(1);
} else {
- idx = cpGen.addInteger(0);
+ idx = getConstantPool().addInteger(0);
}
}
public SimpleElementValueGen(int type, ConstantPoolGen cpGen, String value)
{
super(type, cpGen);
- idx = cpGen.addUtf8(value);
+ idx = getConstantPool().addUtf8(value);
}
/**
@@ -175,7 +175,7 @@ public class SimpleElementValueGen exten
@Override
public ElementValue getElementValue()
{
- return new SimpleElementValue(super.getElementValueType(), idx, getConstantPoolgen().getConstantPool());
+ return new SimpleElementValue(super.getElementValueType(), idx, getConstantPool().getConstantPool());
}
public int getIndex()
@@ -189,7 +189,7 @@ public class SimpleElementValueGen exten
throw new RuntimeException(
"Dont call getValueString() on a non STRING ElementValue");
}
- ConstantUtf8 c = (ConstantUtf8) getConstantPoolgen().getConstant(idx);
+ ConstantUtf8 c = (ConstantUtf8) getConstantPool().getConstant(idx);
return c.getBytes();
}
@@ -199,7 +199,7 @@ public class SimpleElementValueGen exten
throw new RuntimeException(
"Dont call getValueString() on a non STRING ElementValue");
}
- ConstantInteger c = (ConstantInteger) getConstantPoolgen().getConstant(idx);
+ ConstantInteger c = (ConstantInteger) getConstantPool().getConstant(idx);
return c.getBytes();
}
@@ -210,34 +210,34 @@ public class SimpleElementValueGen exten
switch (super.getElementValueType())
{
case PRIMITIVE_INT:
- ConstantInteger c = (ConstantInteger) getConstantPoolgen().getConstant(idx);
+ ConstantInteger c = (ConstantInteger) getConstantPool().getConstant(idx);
return Integer.toString(c.getBytes());
case PRIMITIVE_LONG:
- ConstantLong j = (ConstantLong) getConstantPoolgen().getConstant(idx);
+ ConstantLong j = (ConstantLong) getConstantPool().getConstant(idx);
return Long.toString(j.getBytes());
case PRIMITIVE_DOUBLE:
- ConstantDouble d = (ConstantDouble) getConstantPoolgen().getConstant(idx);
+ ConstantDouble d = (ConstantDouble) getConstantPool().getConstant(idx);
return Double.toString(d.getBytes());
case PRIMITIVE_FLOAT:
- ConstantFloat f = (ConstantFloat) getConstantPoolgen().getConstant(idx);
+ ConstantFloat f = (ConstantFloat) getConstantPool().getConstant(idx);
return Float.toString(f.getBytes());
case PRIMITIVE_SHORT:
- ConstantInteger s = (ConstantInteger) getConstantPoolgen().getConstant(idx);
+ ConstantInteger s = (ConstantInteger) getConstantPool().getConstant(idx);
return Integer.toString(s.getBytes());
case PRIMITIVE_BYTE:
- ConstantInteger b = (ConstantInteger) getConstantPoolgen().getConstant(idx);
+ ConstantInteger b = (ConstantInteger) getConstantPool().getConstant(idx);
return Integer.toString(b.getBytes());
case PRIMITIVE_CHAR:
- ConstantInteger ch = (ConstantInteger) getConstantPoolgen().getConstant(idx);
+ ConstantInteger ch = (ConstantInteger) getConstantPool().getConstant(idx);
return Integer.toString(ch.getBytes());
case PRIMITIVE_BOOLEAN:
- ConstantInteger bo = (ConstantInteger) getConstantPoolgen().getConstant(idx);
+ ConstantInteger bo = (ConstantInteger) getConstantPool().getConstant(idx);
if (bo.getBytes() == 0) {
return "false";
}
return "true";
case STRING:
- ConstantUtf8 cu8 = (ConstantUtf8) getConstantPoolgen().getConstant(idx);
+ ConstantUtf8 cu8 = (ConstantUtf8) getConstantPool().getConstant(idx);
return cu8.getBytes();
default:
throw new RuntimeException(
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java?rev=1696385&r1=1696384&r2=1696385&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Type.java Tue Aug 18 10:17:53 2015
@@ -35,8 +35,8 @@ import org.apache.commons.bcel6.verifier
public abstract class Type implements java.io.Serializable {
private static final long serialVersionUID = -1985077286871826895L;
- private final byte type;
- private String signature; // signature for the type
+ protected byte type; // TODO should be final (and private)
+ protected String signature; // signature for the type TODO should be private
/** Predefined constants
*/
public static final BasicType VOID = new BasicType(Constants.T_VOID);