You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sj...@apache.org on 2008/04/10 11:55:41 UTC
svn commit: r646721 -
/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/
Author: sjanuary
Date: Thu Apr 10 02:55:30 2008
New Revision: 646721
URL: http://svn.apache.org/viewvc?rev=646721&view=rev
Log:
Apply patch for HARMONY-5710 ([classlib][pack200] Code cleanup for pack200.bytecode.forms)
Modified:
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FloatRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewClassRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisInitMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteCodeForm.java Thu Apr 10 02:55:30 2008
@@ -61,7 +61,7 @@
protected static final Map byteCodes = new HashMap();
static {
- ByteCodeForm[] byteCodeArray = new ByteCodeForm[256];
+ final ByteCodeForm[] byteCodeArray = new ByteCodeForm[256];
byteCodeArray[0] = new NoArgumentForm(0, "nop");
byteCodeArray[1] = new NoArgumentForm(1, "aconst_null");
byteCodeArray[2] = new NoArgumentForm(2, "iconst_m1");
@@ -316,7 +316,7 @@
// Put all the bytecodes in a HashMap so we can
// get them by either name or number
for (int i = 0; i < byteCodeArray.length; i++) {
- ByteCodeForm byteCode = byteCodeArray[i];
+ final ByteCodeForm byteCode = byteCodeArray[i];
if (byteCode != null) {
byteCodes.put(new Integer(i), byteCode);
byteCodes.put(byteCode.getName(), byteCode);
@@ -387,7 +387,7 @@
}
// Now we have the first index and the last index.
- int difference = lastOperandIndex - firstOperandIndex;
+ final int difference = lastOperandIndex - firstOperandIndex;
// If last < first, something is wrong.
if(difference < 0) {
@@ -425,7 +425,7 @@
}
public int[] getRewriteCopy() {
- int[] result = new int[rewrite.length];
+ final int[] result = new int[rewrite.length];
System.arraycopy(rewrite, 0, result, 0, rewrite.length);
return result;
}
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassRefForm.java Thu Apr 10 02:55:30 2008
@@ -33,7 +33,6 @@
public ClassRefForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public ClassRefForm(int opcode, String name, int[] rewrite, boolean widened) {
@@ -52,7 +51,7 @@
// (This is true for all bc_classref forms in
// the spec except for multianewarray, which has
// its own form.)
- SegmentConstantPool globalPool = operandManager.globalConstantPool();
+ final SegmentConstantPool globalPool = operandManager.globalConstantPool();
ClassFileEntry[] nested = null;
// How do I get this class?
nested = new ClassFileEntry[] {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ClassSpecificReferenceForm.java Thu Apr 10 02:55:30 2008
@@ -34,7 +34,6 @@
public ClassSpecificReferenceForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
protected abstract int getOffset(OperandManager operandManager);
@@ -42,7 +41,7 @@
protected abstract String context(OperandManager operandManager);
protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
- SegmentConstantPool globalPool = operandManager.globalConstantPool();
+ final SegmentConstantPool globalPool = operandManager.globalConstantPool();
ClassFileEntry[] nested = null;
nested = new ClassFileEntry[] {
globalPool.getClassSpecificPoolEntry(getPoolID(), offset, context(operandManager))
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/DoubleForm.java Thu Apr 10 02:55:30 2008
@@ -28,7 +28,6 @@
public DoubleForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FieldRefForm.java Thu Apr 10 02:55:30 2008
@@ -28,7 +28,6 @@
public FieldRefForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FloatRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FloatRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FloatRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/FloatRefForm.java Thu Apr 10 02:55:30 2008
@@ -27,7 +27,6 @@
public FloatRefForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public FloatRefForm(int opcode, String name, int[] rewrite, boolean widened) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IMethodRefForm.java Thu Apr 10 02:55:30 2008
@@ -55,7 +55,7 @@
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
super.setByteCodeOperands(byteCode, operandManager, codeLength);
- int count=((CPInterfaceMethodRef)byteCode.getNestedClassFileEntries()[0]).invokeInterfaceCount();
+ final int count=((CPInterfaceMethodRef)byteCode.getNestedClassFileEntries()[0]).invokeInterfaceCount();
byteCode.getRewrite()[3] = count;
}
}
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IincForm.java Thu Apr 10 02:55:30 2008
@@ -42,8 +42,8 @@
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
- int local = operandManager.nextLocal();
- int constant = operandManager.nextByte();
+ final int local = operandManager.nextLocal();
+ final int constant = operandManager.nextByte();
byteCode.setOperandBytes(new int[]{local, constant});
}
}
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/InitMethodReferenceForm.java Thu Apr 10 02:55:30 2008
@@ -32,7 +32,6 @@
public InitMethodReferenceForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
protected abstract String context(OperandManager operandManager);
@@ -50,7 +49,7 @@
}
protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
- SegmentConstantPool globalPool = operandManager.globalConstantPool();
+ final SegmentConstantPool globalPool = operandManager.globalConstantPool();
ClassFileEntry[] nested = null;
nested = new ClassFileEntry[] {
globalPool.getInitMethodPoolEntry(SegmentConstantPool.CP_METHOD, offset, context(operandManager))
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/IntRefForm.java Thu Apr 10 02:55:30 2008
@@ -28,7 +28,6 @@
public IntRefForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public IntRefForm(int opcode, String name, int[] rewrite, boolean widened) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LabelForm.java Thu Apr 10 02:55:30 2008
@@ -31,7 +31,6 @@
public LabelForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public LabelForm(int opcode, String name, int[] rewrite, boolean widened) {
@@ -52,11 +51,11 @@
*/
public void fixUpByteCodeTargets(ByteCode byteCode, CodeAttribute codeAttribute) {
// LabelForms need to fix up the target of label operations
- int originalTarget = byteCode.getByteCodeTargets()[0];
- int sourceIndex = byteCode.getByteCodeIndex();
- int absoluteInstructionTargetIndex = sourceIndex + originalTarget;
- int targetValue = ((Integer)codeAttribute.byteCodeOffsets.get(absoluteInstructionTargetIndex)).intValue();
- int sourceValue = ((Integer)codeAttribute.byteCodeOffsets.get(sourceIndex)).intValue();
+ final int originalTarget = byteCode.getByteCodeTargets()[0];
+ final int sourceIndex = byteCode.getByteCodeIndex();
+ final int absoluteInstructionTargetIndex = sourceIndex + originalTarget;
+ final int targetValue = ((Integer)codeAttribute.byteCodeOffsets.get(absoluteInstructionTargetIndex)).intValue();
+ final int sourceValue = ((Integer)codeAttribute.byteCodeOffsets.get(sourceIndex)).intValue();
// The operand is the difference between the source instruction
// and the destination instruction.
byteCode.setOperandSigned2Bytes(targetValue - sourceValue, 0);
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LocalForm.java Thu Apr 10 02:55:30 2008
@@ -29,7 +29,6 @@
public LocalForm(int opcode, String name) {
super(opcode, name);
- // TODO Auto-generated constructor stub
}
public LocalForm(int opcode, String name, int[] rewrite) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LongForm.java Thu Apr 10 02:55:30 2008
@@ -28,7 +28,6 @@
public LongForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/LookupSwitchForm.java Thu Apr 10 02:55:30 2008
@@ -34,18 +34,18 @@
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
- int case_count = operandManager.nextCaseCount();
- int default_pc = operandManager.nextLabel();
- int case_values[] = new int[case_count];
+ final int case_count = operandManager.nextCaseCount();
+ final int default_pc = operandManager.nextLabel();
+ final int case_values[] = new int[case_count];
for(int index=0; index < case_count; index++) {
case_values[index] = operandManager.nextCaseValues();
}
- int case_pcs[] = new int[case_count];
+ final int case_pcs[] = new int[case_count];
for(int index=0; index < case_count; index++) {
case_pcs[index] = operandManager.nextLabel();
}
- int[] labelsArray = new int[case_count + 1];
+ final int[] labelsArray = new int[case_count + 1];
labelsArray[0] = default_pc;
for(int index=1; index < case_count + 1; index++) {
labelsArray[index] = case_pcs[index-1];
@@ -66,13 +66,13 @@
// First, there's the bytecode. Then there are 0-3
// bytes of padding so that the first (default)
// label is on a 4-byte offset.
- int padLength = 3 - (codeLength % 4);
- int rewriteSize = 1 + padLength + 4 // defaultbytes
+ final int padLength = 3 - (codeLength % 4);
+ final int rewriteSize = 1 + padLength + 4 // defaultbytes
+ 4 // npairs
+ (4 * case_values.length)
+ (4 * case_pcs.length);
- int[] newRewrite = new int[rewriteSize];
+ final int[] newRewrite = new int[rewriteSize];
int rewriteIndex = 0;
// Fill in what we can now
@@ -92,7 +92,7 @@
newRewrite[rewriteIndex++] = -1;
// npairs
- int npairsIndex = rewriteIndex;
+ final int npairsIndex = rewriteIndex;
setRewrite4Bytes(case_values.length, npairsIndex, newRewrite);
rewriteIndex += 4;
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MethodRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MethodRefForm.java Thu Apr 10 02:55:30 2008
@@ -33,7 +33,6 @@
public MethodRefForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/MultiANewArrayForm.java Thu Apr 10 02:55:30 2008
@@ -32,7 +32,6 @@
public MultiANewArrayForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
@@ -57,7 +56,7 @@
super.setByteCodeOperands(byteCode, operandManager, codeLength);
// We have to handle the dimension.
- int dimension = operandManager.nextByte();
+ final int dimension = operandManager.nextByte();
byteCode.setOperandByte(dimension, 2);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewClassRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewClassRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewClassRefForm.java Thu Apr 10 02:55:30 2008
@@ -37,7 +37,6 @@
public NewClassRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
/* (non-Javadoc)
@@ -46,10 +45,10 @@
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
ClassFileEntry[] nested = null;
- int offset = getOffset(operandManager);
+ final int offset = getOffset(operandManager);
if(offset == 0) {
// Use current class
- SegmentConstantPool globalPool = operandManager.globalConstantPool();
+ final SegmentConstantPool globalPool = operandManager.globalConstantPool();
nested = new ClassFileEntry[] {
globalPool.getClassPoolEntry(operandManager.getCurrentClass())
};
@@ -61,7 +60,7 @@
// Parent takes care of subtracting one from offset
// to adjust for 1-based global pool
setNestedEntries(byteCode, operandManager, offset);
- } catch (Pack200Exception ex) {
+ } catch (final Pack200Exception ex) {
throw new Error("Got a pack200 exception. What to do?");
}
}
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NewInitMethodRefForm.java Thu Apr 10 02:55:30 2008
@@ -32,7 +32,6 @@
public NewInitMethodRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
@@ -44,12 +43,12 @@
}
protected String context(OperandManager operandManager) {
- String result = operandManager.getNewClass();
+ final String result = operandManager.getNewClass();
return result;
}
protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
- SegmentConstantPool globalPool = operandManager.globalConstantPool();
+ final SegmentConstantPool globalPool = operandManager.globalConstantPool();
ClassFileEntry[] nested = null;
nested = new ClassFileEntry[] {
globalPool.getInitMethodPoolEntry(SegmentConstantPool.CP_METHOD, offset, context(operandManager))
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NoArgumentForm.java Thu Apr 10 02:55:30 2008
@@ -29,7 +29,6 @@
public NoArgumentForm(int opcode, String name) {
super(opcode, name);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ReferenceForm.java Thu Apr 10 02:55:30 2008
@@ -30,14 +30,13 @@
public ReferenceForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
protected abstract int getPoolID();
protected abstract int getOffset(OperandManager operandManager);
protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
- SegmentConstantPool globalPool = operandManager.globalConstantPool();
+ final SegmentConstantPool globalPool = operandManager.globalConstantPool();
ClassFileEntry[] nested = null;
nested = new ClassFileEntry[] {
globalPool.getConstantPoolEntry(getPoolID(), offset)
@@ -51,10 +50,10 @@
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
- int offset = getOffset(operandManager);
+ final int offset = getOffset(operandManager);
try {
setNestedEntries(byteCode, operandManager, offset);
- } catch (Pack200Exception ex) {
+ } catch (final Pack200Exception ex) {
throw new Error("Got a pack200 exception. What to do?");
}
}
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ShortForm.java Thu Apr 10 02:55:30 2008
@@ -27,7 +27,6 @@
public ShortForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SingleByteReferenceForm.java Thu Apr 10 02:55:30 2008
@@ -33,7 +33,6 @@
public SingleByteReferenceForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
protected abstract int getOffset(OperandManager operandManager);
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/StringRefForm.java Thu Apr 10 02:55:30 2008
@@ -32,7 +32,6 @@
public StringRefForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public StringRefForm(int opcode, String name, int[] rewrite, boolean widened) {
@@ -57,7 +56,7 @@
}
protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
- SegmentConstantPool globalPool = operandManager.globalConstantPool();
+ final SegmentConstantPool globalPool = operandManager.globalConstantPool();
ClassFileEntry[] nested = null;
nested = new ClassFileEntry[] {
((CPString)globalPool.getValue(getPoolID(), offset))
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperFieldRefForm.java Thu Apr 10 02:55:30 2008
@@ -31,7 +31,6 @@
public SuperFieldRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperInitMethodRefForm.java Thu Apr 10 02:55:30 2008
@@ -26,7 +26,6 @@
public SuperInitMethodRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SuperMethodRefForm.java Thu Apr 10 02:55:30 2008
@@ -31,7 +31,6 @@
public SuperMethodRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/SwitchForm.java Thu Apr 10 02:55:30 2008
@@ -24,12 +24,10 @@
public SwitchForm(int opcode, String name) {
super(opcode, name);
- // TODO Auto-generated constructor stub
}
public SwitchForm(int opcode, String name, int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
@@ -52,18 +50,18 @@
*/
public void fixUpByteCodeTargets(ByteCode byteCode, CodeAttribute codeAttribute) {
// SwitchForms need to fix up the target of label operations
- int[] originalTargets = byteCode.getByteCodeTargets();
- int numberOfLabels = originalTargets.length;
- int[] replacementTargets = new int[numberOfLabels];
+ final int[] originalTargets = byteCode.getByteCodeTargets();
+ final int numberOfLabels = originalTargets.length;
+ final int[] replacementTargets = new int[numberOfLabels];
- int sourceIndex = byteCode.getByteCodeIndex();
- int sourceValue = ((Integer)codeAttribute.byteCodeOffsets.get(sourceIndex)).intValue();
+ final int sourceIndex = byteCode.getByteCodeIndex();
+ final int sourceValue = ((Integer)codeAttribute.byteCodeOffsets.get(sourceIndex)).intValue();
for(int index=0; index < numberOfLabels; index++) {
- int absoluteInstructionTargetIndex = sourceIndex + originalTargets[index];
- int targetValue = ((Integer)codeAttribute.byteCodeOffsets.get(absoluteInstructionTargetIndex)).intValue();
+ final int absoluteInstructionTargetIndex = sourceIndex + originalTargets[index];
+ final int targetValue = ((Integer)codeAttribute.byteCodeOffsets.get(absoluteInstructionTargetIndex)).intValue();
replacementTargets[index] = targetValue - sourceValue;
}
- int[] rewriteArray = byteCode.getRewrite();
+ final int[] rewriteArray = byteCode.getRewrite();
for(int index=0; index < numberOfLabels; index++) {
setRewrite4Bytes(replacementTargets[index], rewriteArray);
}
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/TableSwitchForm.java Thu Apr 10 02:55:30 2008
@@ -35,25 +35,25 @@
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
- int case_count = operandManager.nextCaseCount();
- int default_pc = operandManager.nextLabel();
+ final int case_count = operandManager.nextCaseCount();
+ final int default_pc = operandManager.nextLabel();
int case_value = -1;
case_value = operandManager.nextCaseValues();
- int case_pcs[] = new int[case_count];
+ final int case_pcs[] = new int[case_count];
for(int index=0; index < case_count; index++) {
case_pcs[index] = operandManager.nextLabel();
}
- int[] labelsArray = new int[case_count + 1];
+ final int[] labelsArray = new int[case_count + 1];
labelsArray[0] = default_pc;
for(int index=1; index < case_count + 1; index++) {
labelsArray[index] = case_pcs[index-1];
}
byteCode.setByteCodeTargets(labelsArray);
- int lowValue = case_value;
- int highValue = lowValue + case_count - 1;
+ final int lowValue = case_value;
+ final int highValue = lowValue + case_count - 1;
// All this gets dumped into the rewrite bytes of the
// poor bytecode.
@@ -67,13 +67,13 @@
// First, there's the bytecode. Then there are 0-3
// bytes of padding so that the first (default)
// label is on a 4-byte offset.
- int padLength = 3 - (codeLength % 4);
- int rewriteSize = 1 + padLength + 4 // defaultbytes
+ final int padLength = 3 - (codeLength % 4);
+ final int rewriteSize = 1 + padLength + 4 // defaultbytes
+ 4 // lowbyte
+ 4 // highbyte
+ (4 * case_pcs.length);
- int[] newRewrite = new int[rewriteSize];
+ final int[] newRewrite = new int[rewriteSize];
int rewriteIndex = 0;
// Fill in what we can now
@@ -93,12 +93,12 @@
newRewrite[rewriteIndex++] = -1;
// lowbyte
- int lowbyteIndex = rewriteIndex;
+ final int lowbyteIndex = rewriteIndex;
setRewrite4Bytes(lowValue, lowbyteIndex, newRewrite);
rewriteIndex += 4;
// highbyte
- int highbyteIndex = rewriteIndex;
+ final int highbyteIndex = rewriteIndex;
setRewrite4Bytes(highValue, highbyteIndex, newRewrite);
rewriteIndex += 4;
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisFieldRefForm.java Thu Apr 10 02:55:30 2008
@@ -31,7 +31,6 @@
public ThisFieldRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisInitMethodRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisInitMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisInitMethodRefForm.java Thu Apr 10 02:55:30 2008
@@ -27,7 +27,6 @@
public ThisInitMethodRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ThisMethodRefForm.java Thu Apr 10 02:55:30 2008
@@ -31,7 +31,6 @@
public ThisMethodRefForm(int opcode, String name,
int[] rewrite) {
super(opcode, name, rewrite);
- // TODO Auto-generated constructor stub
}
public int getOperandType() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/VariableInstructionForm.java Thu Apr 10 02:55:30 2008
@@ -120,7 +120,7 @@
throw new Error("Trying to rewrite " + this + " but there is no room for 4 bytes");
}
- int byteCodeRewriteLength = rewrite.length;
+ final int byteCodeRewriteLength = rewrite.length;
if(absPosition + 3 > byteCodeRewriteLength) {
throw new Error("Trying to rewrite " + this + " with an int at position " + absPosition + " but this won't fit in the rewrite array");
@@ -146,7 +146,7 @@
throw new Error("Trying to rewrite " + this + " but there is no room for 4 bytes");
}
- int byteCodeRewriteLength = rewrite.length;
+ final int byteCodeRewriteLength = rewrite.length;
if(absPosition + 1 > byteCodeRewriteLength) {
throw new Error("Trying to rewrite " + this + " with an int at position " + absPosition + " but this won't fit in the rewrite array");
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java?rev=646721&r1=646720&r2=646721&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/WideForm.java Thu Apr 10 02:55:30 2008
@@ -48,7 +48,7 @@
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
- int instruction = operandManager.nextWideByteCode();
+ final int instruction = operandManager.nextWideByteCode();
if(instruction == 132) {
setByteCodeOperandsFormat2(instruction, byteCode, operandManager, codeLength);
} else {
@@ -75,7 +75,7 @@
// there's a good chance that the formats will
// differ, so an updater will not have to disentangle
// it.
- int local = operandManager.nextLocal();
+ final int local = operandManager.nextLocal();
// Unlike most byte codes, the wide bytecode is a
// variable-sized bytecode. Because of this, the
@@ -83,7 +83,7 @@
// for each bytecode, rather than in the ByteCodeForm
// class.
- int[] newRewrite = new int[4];
+ final int[] newRewrite = new int[4];
int rewriteIndex = 0;
// Fill in what we can now
@@ -113,8 +113,8 @@
protected void setByteCodeOperandsFormat2(int instruction, ByteCode byteCode,
OperandManager operandManager, int codeLength) {
- int local = operandManager.nextLocal();
- int constWord = operandManager.nextShort();
+ final int local = operandManager.nextLocal();
+ final int constWord = operandManager.nextShort();
// Unlike most byte codes, the wide bytecode is a
// variable-sized bytecode. Because of this, the
@@ -122,7 +122,7 @@
// for each bytecode, rather than in the ByteCodeForm
// class.
- int[] newRewrite = new int[6];
+ final int[] newRewrite = new int[6];
int rewriteIndex = 0;
// Fill in what we can now