Author: sjanuary
Date: Wed Aug 18 09:13:22 2010
New Revision: 986603
URL: http://svn.apache.org/viewvc?rev=986603&view=rev
Log:
Pack200 - remove some unused methods and fields
Modified:
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
Wed Aug 18 09:13:22 2010
@@ -100,10 +100,6 @@ public class ByteCode extends ClassFileE
return getByteCodeForm().getOpcode();
}
- public int getOperandType() {
- return getByteCodeForm().getOperandType();
- }
-
private boolean hashcodeComputed;
private int cachedHashCode;
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
Wed Aug 18 09:13:22 2010
@@ -23,39 +23,7 @@ import org.apache.harmony.unpack200.byte
import org.apache.harmony.unpack200.bytecode.CodeAttribute;
import org.apache.harmony.unpack200.bytecode.OperandManager;
-public class ByteCodeForm {
-
- // Operand types. Those with no operands and
- // those with operands on the operand stack are
- // treated similarly. These types are used to
- // distinguish different kinds of non-stack
- // bytecode operands
- protected static final int TYPE_NONE = 0;
- protected static final int TYPE_BYTE = 1;
- protected static final int TYPE_SHORT = 2;
- protected static final int TYPE_INTREF = 3;
- protected static final int TYPE_FLOATREF = 4;
- protected static final int TYPE_STRINGREF = 5;
- protected static final int TYPE_CLASSREF = 6;
- protected static final int TYPE_LONG = 7;
- protected static final int TYPE_DOUBLE = 8;
- protected static final int TYPE_LOCAL = 9;
- protected static final int TYPE_LABEL = 10;
- protected static final int TYPE_FIELDREF = 11;
- protected static final int TYPE_METHODREF = 12;
- protected static final int TYPE_IMETHODREF = 13;
- protected static final int TYPE_WIDE = 14;
- protected static final int TYPE_IINC = 15;
- protected static final int TYPE_SWITCH = 16;
- protected static final int TYPE_MULTIANEWARRAY = 17;
- protected static final int TYPE_THISFIELDREF = 18;
- protected static final int TYPE_THISMETHODREF = 19;
- protected static final int TYPE_SUPERFIELDREF = 20;
- protected static final int TYPE_SUPERMETHODREF = 21;
- protected static final int TYPE_THISINITMETHODREF = 22;
- protected static final int TYPE_SUPERINITMETHODREF = 23;
- protected static final int TYPE_NEWINITMETHODREF = 24;
- protected static final int TYPE_NEWCLASSREF = 25;
+public abstract class ByteCodeForm {
protected static final boolean WIDENED = true;
@@ -480,13 +448,8 @@ public class ByteCodeForm {
return (ByteCodeForm) byteCodeArray[opcode];
}
- public static ByteCodeForm get(String name) {
- return (ByteCodeForm) byteCodesByName.get(name);
- }
-
public String toString() {
- return this.getClass().getName() + "(" + getName() + ":"
- + getOperandType() + ")";
+ return this.getClass().getName() + "(" + getName() + ")";
}
public int getOpcode() {
@@ -497,10 +460,6 @@ public class ByteCodeForm {
return name;
}
- public int getOperandType() {
- return -1;
- }
-
public int[] getRewrite() {
return rewrite;
}
@@ -523,106 +482,6 @@ public class ByteCodeForm {
return false;
}
- public boolean hasByteOperand() {
- return false;
- }
-
- public boolean hasShortOperand() {
- return false;
- }
-
- public boolean hasIntRefOperand() {
- return false;
- }
-
- public boolean hasFloatRefOperand() {
- return false;
- }
-
- public boolean hasStringRefOperand() {
- return false;
- }
-
- public boolean hasClassRefOperand() {
- return false;
- }
-
- public boolean hasLongOperand() {
- return false;
- }
-
- public boolean hasDoubleOperand() {
- return false;
- }
-
- public boolean hasLocalOperand() {
- return false;
- }
-
- public boolean hasLabelOperand() {
- return false;
- }
-
- public boolean hasFieldRefOperand() {
- return false;
- }
-
- public boolean hasMethodRefOperand() {
- return false;
- }
-
- public boolean hasIMethodRefOperand() {
- return false;
- }
-
- public boolean hasWideOperand() {
- return false;
- }
-
- public boolean hasIincOperand() {
- return false;
- }
-
- public boolean hasSwitchOperand() {
- return false;
- }
-
- public boolean hasMultianewarrayOperand() {
- return false;
- }
-
- public boolean hasThisFieldRefOperand() {
- return false;
- }
-
- public boolean hasThisMethodRefOperand() {
- return false;
- }
-
- public boolean hasSuperFieldRefOperand() {
- return false;
- }
-
- public boolean hasSuperMethodRefOperand() {
- return false;
- }
-
- public boolean hasThisInitMethodRefOperand() {
- return false;
- }
-
- public boolean hasSuperInitMethodRefOperand() {
- return false;
- }
-
- public boolean hasNewInitMethodRefOperand() {
- return false;
- }
-
- public boolean hasInitMethodRefOperand() {
- return false;
- }
-
/**
* This method will answer true if the receiver is a multi-bytecode
* instruction (such as aload0_putfield_super); otherwise, it will answer
@@ -657,10 +516,8 @@ public class ByteCodeForm {
* of the method. Used in calculating padding for some
* variable-length bytecodes (such as lookupswitch, tableswitch).
*/
- public void setByteCodeOperands(ByteCode byteCode,
- OperandManager operandManager, int codeLength) {
- throw new Error("My subclass should have implemented this");
- }
+ public abstract void setByteCodeOperands(ByteCode byteCode,
+ OperandManager operandManager, int codeLength);
/**
* The ByteCodeForm knows how to fix up a bytecode if it needs to be fixed
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
Wed Aug 18 09:13:22 2010
@@ -28,14 +28,6 @@ public class ByteForm extends ByteCodeFo
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_BYTE;
- }
-
- public boolean hasByteOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
Wed Aug 18 09:13:22 2010
@@ -61,14 +61,6 @@ public class ClassRefForm extends Refere
byteCode.setNestedPositions(new int[][] { { 0, 2 } });
}
- public int getOperandType() {
- return TYPE_CLASSREF;
- }
-
- public boolean hasClassRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextClassRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
Wed Aug 18 09:13:22 2010
@@ -29,14 +29,6 @@ public class DoubleForm extends Referenc
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_DOUBLE;
- }
-
- public boolean hasDoubleOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextDoubleRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
Wed Aug 18 09:13:22 2010
@@ -29,14 +29,6 @@ public class FieldRefForm extends Refere
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_FIELDREF;
- }
-
- public boolean hasFieldRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextFieldRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
Wed Aug 18 09:13:22 2010
@@ -33,14 +33,6 @@ public class FloatRefForm extends Single
this.widened = widened;
}
- public int getOperandType() {
- return TYPE_FLOATREF;
- }
-
- public boolean hasFloatRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextFloatRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
Wed Aug 18 09:13:22 2010
@@ -31,14 +31,6 @@ public class IMethodRefForm extends Refe
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_IMETHODREF;
- }
-
- public boolean hasIMethodRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextIMethodRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
Wed Aug 18 09:13:22 2010
@@ -29,14 +29,6 @@ public class IincForm extends ByteCodeFo
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_IINC;
- }
-
- public boolean hasIincOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
Wed Aug 18 09:13:22 2010
@@ -35,10 +35,6 @@ public abstract class InitMethodReferenc
protected abstract String context(OperandManager operandManager);
- public boolean hasInitMethodRefOperand() {
- return true;
- }
-
protected int getPoolID() {
return SegmentConstantPool.CP_METHOD;
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
Wed Aug 18 09:13:22 2010
@@ -34,14 +34,6 @@ public class IntRefForm extends SingleBy
this.widened = widened;
}
- public int getOperandType() {
- return TYPE_INTREF;
- }
-
- public boolean hasIntRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextIntRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
Wed Aug 18 09:13:22 2010
@@ -37,14 +37,6 @@ public class LabelForm extends ByteCodeF
this.widened = widened;
}
- public int getOperandType() {
- return TYPE_LABEL;
- }
-
- public boolean hasLabelOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
Wed Aug 18 09:13:22 2010
@@ -34,14 +34,6 @@ public class LocalForm extends ByteCodeF
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_LOCAL;
- }
-
- public boolean hasLocalOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
Wed Aug 18 09:13:22 2010
@@ -29,14 +29,6 @@ public class LongForm extends ReferenceF
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_LONG;
- }
-
- public boolean hasLongOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextLongRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
Wed Aug 18 09:13:22 2010
@@ -31,14 +31,6 @@ public class MethodRefForm extends Refer
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_METHODREF;
- }
-
- public boolean hasMethodRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextMethodRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
Wed Aug 18 09:13:22 2010
@@ -31,18 +31,6 @@ public class MultiANewArrayForm extends
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_MULTIANEWARRAY;
- }
-
- public boolean hasMultianewarrayOperand() {
- return true;
- }
-
- public boolean hasClassRefOperand() {
- return false;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
Wed Aug 18 09:13:22 2010
@@ -32,14 +32,6 @@ public class NewInitMethodRefForm extend
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_NEWINITMETHODREF;
- }
-
- public boolean hasNewInitMethodRefOperand() {
- return true;
- }
-
protected String context(OperandManager operandManager) {
final String result = operandManager.getNewClass();
return result;
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
Wed Aug 18 09:13:22 2010
@@ -30,14 +30,6 @@ public class NoArgumentForm extends Byte
super(opcode, name);
}
- public int getOperandType() {
- return TYPE_NONE;
- }
-
- public boolean hasNoOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
Wed Aug 18 09:13:22 2010
@@ -28,14 +28,6 @@ public class ShortForm extends ByteCodeF
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_SHORT;
- }
-
- public boolean hasShortOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
Wed Aug 18 09:13:22 2010
@@ -38,14 +38,6 @@ public class StringRefForm extends Singl
this.widened = widened;
}
- public int getOperandType() {
- return TYPE_STRINGREF;
- }
-
- public boolean hasStringRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextStringRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
Wed Aug 18 09:13:22 2010
@@ -31,14 +31,6 @@ public class SuperFieldRefForm extends C
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_SUPERFIELDREF;
- }
-
- public boolean hasSuperFieldRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextSuperFieldRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
Wed Aug 18 09:13:22 2010
@@ -26,14 +26,6 @@ public class SuperInitMethodRefForm exte
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_SUPERINITMETHODREF;
- }
-
- public boolean hasSuperInitMethodRefOperand() {
- return true;
- }
-
protected String context(
org.apache.harmony.unpack200.bytecode.OperandManager operandManager) {
return operandManager.getSuperClass();
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
Wed Aug 18 09:13:22 2010
@@ -31,14 +31,6 @@ public class SuperMethodRefForm extends
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_SUPERMETHODREF;
- }
-
- public boolean hasSuperMethodRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextSuperMethodRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
Wed Aug 18 09:13:22 2010
@@ -30,14 +30,6 @@ public abstract class SwitchForm extends
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_SWITCH;
- }
-
- public boolean hasSwitchOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
Wed Aug 18 09:13:22 2010
@@ -31,14 +31,6 @@ public class ThisFieldRefForm extends Cl
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_THISFIELDREF;
- }
-
- public boolean hasThisFieldRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextThisFieldRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
Wed Aug 18 09:13:22 2010
@@ -28,14 +28,6 @@ public class ThisInitMethodRefForm exten
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_THISINITMETHODREF;
- }
-
- public boolean hasThisInitMethodRefOperand() {
- return true;
- }
-
protected String context(OperandManager operandManager) {
return operandManager.getCurrentClass();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
Wed Aug 18 09:13:22 2010
@@ -31,14 +31,6 @@ public class ThisMethodRefForm extends C
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_THISMETHODREF;
- }
-
- public boolean hasThisMethodRefOperand() {
- return true;
- }
-
protected int getOffset(OperandManager operandManager) {
return operandManager.nextThisMethodRef();
}
Modified: harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java?rev=986603&r1=986602&r2=986603&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
Wed Aug 18 09:13:22 2010
@@ -34,14 +34,6 @@ public class WideForm extends VariableIn
super(opcode, name, rewrite);
}
- public int getOperandType() {
- return TYPE_WIDE;
- }
-
- public boolean hasWideOperand() {
- return true;
- }
-
/*
* (non-Javadoc)
*
|