harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjanu...@apache.org
Subject svn commit: r647100 [7/9] - in /harmony/enhanced/classlib/trunk/modules/pack200/src: main/java/org/apache/harmony/pack200/ main/java/org/apache/harmony/pack200/bytecode/ main/java/org/apache/harmony/pack200/bytecode/forms/ test/java/org/apache/harmony/...
Date Fri, 11 Apr 2008 10:10:00 GMT
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java?rev=647100&r1=647099&r2=647100&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java Fri Apr 11 03:09:38 2008
@@ -24,23 +24,25 @@
  * RuntimeVisibleParamenterAnnotations attribute or a
  * RuntimeInvisibleParameterAnnotations attribute.
  */
-public class RuntimeVisibleorInvisibleParameterAnnotationsAttribute extends AnnotationsAttribute {
+public class RuntimeVisibleorInvisibleParameterAnnotationsAttribute extends
+        AnnotationsAttribute {
 
     private final int num_parameters;
     private final ParameterAnnotation[] parameter_annotations;
 
-    public RuntimeVisibleorInvisibleParameterAnnotationsAttribute(CPUTF8 name, ParameterAnnotation[] parameter_annotations) {
+    public RuntimeVisibleorInvisibleParameterAnnotationsAttribute(CPUTF8 name,
+            ParameterAnnotation[] parameter_annotations) {
         super(name);
         this.num_parameters = parameter_annotations.length;
         this.parameter_annotations = parameter_annotations;
     }
 
     protected int getLength() {
-       int length = 1;
-       for (int i = 0; i < num_parameters; i++) {
-           length += parameter_annotations[i].getLength();
-       }
-       return length;
+        int length = 1;
+        for (int i = 0; i < num_parameters; i++) {
+            length += parameter_annotations[i].getLength();
+        }
+        return length;
     }
 
     protected void resolve(ClassConstantPool pool) {
@@ -58,9 +60,9 @@
     }
 
     public String toString() {
-        return attributeName.underlyingString() + ": " + num_parameters + " parameter annotations";
+        return attributeName.underlyingString() + ": " + num_parameters
+                + " parameter annotations";
     }
-
 
     /**
      * ParameterAnnotation represents the annotations on a single parameter.

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java?rev=647100&r1=647099&r2=647100&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SignatureAttribute.java Fri Apr 11 03:09:38 2008
@@ -27,14 +27,17 @@
     private int signature_index;
     private final CPUTF8 signature;
 
-    private static final CPUTF8 attributeName = new CPUTF8("Signature", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ);
+    private static final CPUTF8 attributeName = new CPUTF8("Signature",
+            ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ);
 
     public SignatureAttribute(CPUTF8 value) {
         super(attributeName);
         this.signature = value;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.harmony.pack200.bytecode.Attribute#getLength()
      */
     protected int getLength() {
@@ -47,14 +50,18 @@
         signature_index = pool.indexOf(signature);
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.harmony.pack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
      */
     protected void writeBody(DataOutputStream dos) throws IOException {
         dos.writeShort(signature_index);
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.harmony.pack200.bytecode.ClassFileEntry#toString()
      */
     public String toString() {

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SourceFileAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SourceFileAttribute.java?rev=647100&r1=647099&r2=647100&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SourceFileAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SourceFileAttribute.java Fri Apr 11 03:09:38 2008
@@ -24,65 +24,66 @@
  */
 public class SourceFileAttribute extends Attribute {
 
-	private final CPUTF8 name;
-	private int nameIndex;
+    private final CPUTF8 name;
+    private int nameIndex;
     private static final CPUTF8 attributeName = new CPUTF8(
             "SourceFile", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ); //$NON-NLS-1$
 
+    public SourceFileAttribute(CPUTF8 name) {
+        super(attributeName);
+        this.name = name;
+    }
 
-	public SourceFileAttribute(CPUTF8 name) {
-		super(attributeName);
-		this.name = name;
-	}
-
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!super.equals(obj))
-			return false;
-		if (this.getClass() != obj.getClass())
-			return false;
-		final SourceFileAttribute other = (SourceFileAttribute) obj;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		return true;
-	}
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (this.getClass() != obj.getClass())
+            return false;
+        final SourceFileAttribute other = (SourceFileAttribute) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.harmony.pack200.bytecode.Attribute#isSourceFileAttribute()
      */
     public boolean isSourceFileAttribute() {
         return true;
     }
 
-	protected int getLength() {
-		return 2;
-	}
-
-	protected ClassFileEntry[] getNestedClassFileEntries() {
-		return new ClassFileEntry[] { getAttributeName(), name };
-	}
-
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = super.hashCode();
-		result = PRIME * result + ((name == null) ? 0 : name.hashCode());
-		return result;
-	}
-
-	protected void resolve(ClassConstantPool pool) {
-		super.resolve(pool);
-		nameIndex = pool.indexOf(name);
-	}
-
-	public String toString() {
-		return "SourceFile: " + name;
-	}
-
-	protected void writeBody(DataOutputStream dos) throws IOException {
-		dos.writeShort(nameIndex);
-	}
+    protected int getLength() {
+        return 2;
+    }
+
+    protected ClassFileEntry[] getNestedClassFileEntries() {
+        return new ClassFileEntry[] { getAttributeName(), name };
+    }
+
+    public int hashCode() {
+        final int PRIME = 31;
+        int result = super.hashCode();
+        result = PRIME * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    protected void resolve(ClassConstantPool pool) {
+        super.resolve(pool);
+        nameIndex = pool.indexOf(name);
+    }
+
+    public String toString() {
+        return "SourceFile: " + name;
+    }
+
+    protected void writeBody(DataOutputStream dos) throws IOException {
+        dos.writeShort(nameIndex);
+    }
 }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -36,26 +36,26 @@
     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;
+    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;
 
     protected static final boolean WIDENED = true;
 
@@ -78,16 +78,18 @@
         byteCodeArray[13] = new NoArgumentForm(13, "fconst_2");
         byteCodeArray[14] = new NoArgumentForm(14, "dconst_0");
         byteCodeArray[15] = new NoArgumentForm(15, "dconst_1");
-        byteCodeArray[16] = new ByteForm(16, "bipush", new int[]{16, -1});
-        byteCodeArray[17] = new ShortForm(17, "sipush", new int[]{17, -1, -1});
-        byteCodeArray[18] = new StringRefForm(18, "ldc", new int[]{18, -1});
-        byteCodeArray[19] = new StringRefForm(19, "ldc_w", new int[]{19, -1, -1}, WIDENED);
-        byteCodeArray[20] = new LongForm(20, "ldc2_w", new int[]{20, -1, -1});
-        byteCodeArray[21] = new LocalForm(21, "iload", new int[]{21, -1});
-        byteCodeArray[22] = new LocalForm(22, "lload", new int[]{22, -1});
-        byteCodeArray[23] = new LocalForm(23, "fload", new int[]{23, -1});
-        byteCodeArray[24] = new LocalForm(24, "dload", new int[]{24, -1});
-        byteCodeArray[25] = new LocalForm(25, "aload", new int[]{25, -1});
+        byteCodeArray[16] = new ByteForm(16, "bipush", new int[] { 16, -1 });
+        byteCodeArray[17] = new ShortForm(17, "sipush",
+                new int[] { 17, -1, -1 });
+        byteCodeArray[18] = new StringRefForm(18, "ldc", new int[] { 18, -1 });
+        byteCodeArray[19] = new StringRefForm(19, "ldc_w", new int[] { 19, -1,
+                -1 }, WIDENED);
+        byteCodeArray[20] = new LongForm(20, "ldc2_w", new int[] { 20, -1, -1 });
+        byteCodeArray[21] = new LocalForm(21, "iload", new int[] { 21, -1 });
+        byteCodeArray[22] = new LocalForm(22, "lload", new int[] { 22, -1 });
+        byteCodeArray[23] = new LocalForm(23, "fload", new int[] { 23, -1 });
+        byteCodeArray[24] = new LocalForm(24, "dload", new int[] { 24, -1 });
+        byteCodeArray[25] = new LocalForm(25, "aload", new int[] { 25, -1 });
         byteCodeArray[26] = new NoArgumentForm(26, "iload_0");
         byteCodeArray[27] = new NoArgumentForm(27, "iload_1");
         byteCodeArray[28] = new NoArgumentForm(28, "iload_2");
@@ -116,11 +118,11 @@
         byteCodeArray[51] = new NoArgumentForm(51, "baload");
         byteCodeArray[52] = new NoArgumentForm(52, "caload");
         byteCodeArray[53] = new NoArgumentForm(53, "saload");
-        byteCodeArray[54] = new LocalForm(54, "istore", new int[]{54, -1});
-        byteCodeArray[55] = new LocalForm(55, "lstore", new int[]{55, -1});
-        byteCodeArray[56] = new LocalForm(56, "fstore", new int[]{56, -1});
-        byteCodeArray[57] = new LocalForm(57, "dstore", new int[]{57, -1});
-        byteCodeArray[58] = new LocalForm(58, "astore", new int[]{58, -1});
+        byteCodeArray[54] = new LocalForm(54, "istore", new int[] { 54, -1 });
+        byteCodeArray[55] = new LocalForm(55, "lstore", new int[] { 55, -1 });
+        byteCodeArray[56] = new LocalForm(56, "fstore", new int[] { 56, -1 });
+        byteCodeArray[57] = new LocalForm(57, "dstore", new int[] { 57, -1 });
+        byteCodeArray[58] = new LocalForm(58, "astore", new int[] { 58, -1 });
         byteCodeArray[59] = new NoArgumentForm(59, "istore_0");
         byteCodeArray[60] = new NoArgumentForm(60, "istore_1");
         byteCodeArray[61] = new NoArgumentForm(61, "istore_2");
@@ -194,7 +196,8 @@
         byteCodeArray[129] = new NoArgumentForm(129, "lor");
         byteCodeArray[130] = new NoArgumentForm(130, "ixor");
         byteCodeArray[131] = new NoArgumentForm(131, "lxor");
-        byteCodeArray[132] = new IincForm(132, "iinc", new int[] {132, -1, -1});
+        byteCodeArray[132] = new IincForm(132, "iinc",
+                new int[] { 132, -1, -1 });
         byteCodeArray[133] = new NoArgumentForm(133, "i2l");
         byteCodeArray[134] = new NoArgumentForm(134, "i2f");
         byteCodeArray[135] = new NoArgumentForm(135, "i2d");
@@ -215,23 +218,39 @@
         byteCodeArray[150] = new NoArgumentForm(150, "fcmpg");
         byteCodeArray[151] = new NoArgumentForm(151, "dcmpl");
         byteCodeArray[152] = new NoArgumentForm(152, "dcmpg");
-        byteCodeArray[153] = new LabelForm(153, "ifeq", new int[] {153, -1, -1});
-        byteCodeArray[154] = new LabelForm(154, "ifne", new int[] {154, -1, -1});
-        byteCodeArray[155] = new LabelForm(155, "iflt", new int[] {155, -1, -1});
-        byteCodeArray[156] = new LabelForm(156, "ifge", new int[] {156, -1, -1});
-        byteCodeArray[157] = new LabelForm(157, "ifgt", new int[] {157, -1, -1});
-        byteCodeArray[158] = new LabelForm(158, "ifle", new int[] {158, -1, -1});
-        byteCodeArray[159] = new LabelForm(159, "if_icmpeq", new int[] {159, -1, -1});
-        byteCodeArray[160] = new LabelForm(160, "if_icmpne", new int[] {160, -1, -1});
-        byteCodeArray[161] = new LabelForm(161, "if_icmplt", new int[] {161, -1, -1});
-        byteCodeArray[162] = new LabelForm(162, "if_icmpge", new int[] {162, -1, -1});
-        byteCodeArray[163] = new LabelForm(163, "if_icmpgt", new int[] {163, -1, -1});
-        byteCodeArray[164] = new LabelForm(164, "if_icmple", new int[] {164, -1, -1});
-        byteCodeArray[165] = new LabelForm(165, "if_acmpeq", new int[] {165, -1, -1});
-        byteCodeArray[166] = new LabelForm(166, "if_acmpne", new int[] {166, -1, -1});
-        byteCodeArray[167] = new LabelForm(167, "goto", new int[] {167, -1, -1});
-        byteCodeArray[168] = new LabelForm(168, "jsr", new int[] {168, -1, -1});
-        byteCodeArray[169] = new LocalForm(169, "ret", new int[] {169, -1});
+        byteCodeArray[153] = new LabelForm(153, "ifeq",
+                new int[] { 153, -1, -1 });
+        byteCodeArray[154] = new LabelForm(154, "ifne",
+                new int[] { 154, -1, -1 });
+        byteCodeArray[155] = new LabelForm(155, "iflt",
+                new int[] { 155, -1, -1 });
+        byteCodeArray[156] = new LabelForm(156, "ifge",
+                new int[] { 156, -1, -1 });
+        byteCodeArray[157] = new LabelForm(157, "ifgt",
+                new int[] { 157, -1, -1 });
+        byteCodeArray[158] = new LabelForm(158, "ifle",
+                new int[] { 158, -1, -1 });
+        byteCodeArray[159] = new LabelForm(159, "if_icmpeq", new int[] { 159,
+                -1, -1 });
+        byteCodeArray[160] = new LabelForm(160, "if_icmpne", new int[] { 160,
+                -1, -1 });
+        byteCodeArray[161] = new LabelForm(161, "if_icmplt", new int[] { 161,
+                -1, -1 });
+        byteCodeArray[162] = new LabelForm(162, "if_icmpge", new int[] { 162,
+                -1, -1 });
+        byteCodeArray[163] = new LabelForm(163, "if_icmpgt", new int[] { 163,
+                -1, -1 });
+        byteCodeArray[164] = new LabelForm(164, "if_icmple", new int[] { 164,
+                -1, -1 });
+        byteCodeArray[165] = new LabelForm(165, "if_acmpeq", new int[] { 165,
+                -1, -1 });
+        byteCodeArray[166] = new LabelForm(166, "if_acmpne", new int[] { 166,
+                -1, -1 });
+        byteCodeArray[167] = new LabelForm(167, "goto",
+                new int[] { 167, -1, -1 });
+        byteCodeArray[168] = new LabelForm(168, "jsr",
+                new int[] { 168, -1, -1 });
+        byteCodeArray[169] = new LocalForm(169, "ret", new int[] { 169, -1 });
         byteCodeArray[170] = new TableSwitchForm(170, "tableswitch");
         byteCodeArray[171] = new LookupSwitchForm(171, "lookupswitch");
         byteCodeArray[172] = new NoArgumentForm(172, "ireturn");
@@ -240,70 +259,124 @@
         byteCodeArray[175] = new NoArgumentForm(175, "dreturn");
         byteCodeArray[176] = new NoArgumentForm(176, "areturn");
         byteCodeArray[177] = new NoArgumentForm(177, "return");
-        byteCodeArray[178] = new FieldRefForm(178, "getstatic", new int[] {178, -1, -1});
-        byteCodeArray[179] = new FieldRefForm(179, "putstatic", new int[] {179, -1, -1});
-        byteCodeArray[180] = new FieldRefForm(180, "getfield", new int[] {180, -1, -1});
-        byteCodeArray[181] = new FieldRefForm(181, "putfield", new int[] {181, -1, -1});
-        byteCodeArray[182] = new MethodRefForm(182, "invokevirtual", new int[] {182, -1, -1});
-        byteCodeArray[183] = new MethodRefForm(183, "invokespecial", new int[] {183, -1, -1});
-        byteCodeArray[184] = new MethodRefForm(184, "invokestatic", new int[] {184, -1, -1});
-        byteCodeArray[185] = new IMethodRefForm(185, "invokeinterface", new int[] {185, -1, -1, /* count */ -1, 0});
+        byteCodeArray[178] = new FieldRefForm(178, "getstatic", new int[] {
+                178, -1, -1 });
+        byteCodeArray[179] = new FieldRefForm(179, "putstatic", new int[] {
+                179, -1, -1 });
+        byteCodeArray[180] = new FieldRefForm(180, "getfield", new int[] { 180,
+                -1, -1 });
+        byteCodeArray[181] = new FieldRefForm(181, "putfield", new int[] { 181,
+                -1, -1 });
+        byteCodeArray[182] = new MethodRefForm(182, "invokevirtual", new int[] {
+                182, -1, -1 });
+        byteCodeArray[183] = new MethodRefForm(183, "invokespecial", new int[] {
+                183, -1, -1 });
+        byteCodeArray[184] = new MethodRefForm(184, "invokestatic", new int[] {
+                184, -1, -1 });
+        byteCodeArray[185] = new IMethodRefForm(185, "invokeinterface",
+                new int[] { 185, -1, -1, /* count */-1, 0 });
         byteCodeArray[186] = new NoArgumentForm(186, "xxxunusedxxx");
-        byteCodeArray[187] = new NewClassRefForm(187, "new", new int[] {187, -1, -1});
-        byteCodeArray[188] = new ByteForm(188, "newarray", new int[] {188, -1});
-        byteCodeArray[189] = new ClassRefForm(189, "anewarray", new int[] {189, -1, -1});
+        byteCodeArray[187] = new NewClassRefForm(187, "new", new int[] { 187,
+                -1, -1 });
+        byteCodeArray[188] = new ByteForm(188, "newarray",
+                new int[] { 188, -1 });
+        byteCodeArray[189] = new ClassRefForm(189, "anewarray", new int[] {
+                189, -1, -1 });
         byteCodeArray[190] = new NoArgumentForm(190, "arraylength");
         byteCodeArray[191] = new NoArgumentForm(191, "athrow");
-        byteCodeArray[192] = new ClassRefForm(192, "checkcast", new int[] {192, -1, -1});
-        byteCodeArray[193] = new ClassRefForm(193, "instanceof", new int[] {193, -1, -1});
+        byteCodeArray[192] = new ClassRefForm(192, "checkcast", new int[] {
+                192, -1, -1 });
+        byteCodeArray[193] = new ClassRefForm(193, "instanceof", new int[] {
+                193, -1, -1 });
         byteCodeArray[194] = new NoArgumentForm(194, "monitorenter");
         byteCodeArray[195] = new NoArgumentForm(195, "monitorexit");
         byteCodeArray[196] = new WideForm(196, "wide");
-        byteCodeArray[197] = new MultiANewArrayForm(197, "multianewarray", new int[]{197, -1, -1, -1});
-        byteCodeArray[198] = new LabelForm(198, "ifnull", new int[] {198, -1, -1});
-        byteCodeArray[199] = new LabelForm(199, "ifnonnull", new int[] {199, -1, -1});
-        byteCodeArray[200] = new LabelForm(200, "goto_w", new int[] {200, -1, -1, -1, -1}, WIDENED);
-        byteCodeArray[201] = new LabelForm(201, "jsr_w", new int[] {201, -1, -1, -1, -1}, WIDENED);
+        byteCodeArray[197] = new MultiANewArrayForm(197, "multianewarray",
+                new int[] { 197, -1, -1, -1 });
+        byteCodeArray[198] = new LabelForm(198, "ifnull", new int[] { 198, -1,
+                -1 });
+        byteCodeArray[199] = new LabelForm(199, "ifnonnull", new int[] { 199,
+                -1, -1 });
+        byteCodeArray[200] = new LabelForm(200, "goto_w", new int[] { 200, -1,
+                -1, -1, -1 }, WIDENED);
+        byteCodeArray[201] = new LabelForm(201, "jsr_w", new int[] { 201, -1,
+                -1, -1, -1 }, WIDENED);
 
         // Extra ones defined by pack200
-        byteCodeArray[202] = new ThisFieldRefForm(202, "getstatic_this", new int[] {178, -1, -1});
-        byteCodeArray[203] = new ThisFieldRefForm(203, "putstatic_this", new int[] {179, -1, -1});
-        byteCodeArray[204] = new ThisFieldRefForm(204, "getfield_this", new int[] {180, -1, -1});
-        byteCodeArray[205] = new ThisFieldRefForm(205, "putfield_this", new int[] {181, -1, -1});
-        byteCodeArray[206] = new ThisMethodRefForm(206, "invokevirtual_this", new int[] {182, -1, -1});
-        byteCodeArray[207] = new ThisMethodRefForm(207, "invokespecial_this", new int[] {183, -1, -1});
-        byteCodeArray[208] = new ThisMethodRefForm(208, "invokestatic_this", new int[] {184, -1, -1});
-        byteCodeArray[209] = new ThisFieldRefForm(209, "aload_0_getstatic_this", new int[] {42, 178, -1, -1});
-        byteCodeArray[210] = new ThisFieldRefForm(210, "aload_0_putstatic_this", new int[] {42, 179, -1, -1});
-        byteCodeArray[211] = new ThisFieldRefForm(211, "aload_0_getfield_this", new int[] {42, 180, -1, -1});
-        byteCodeArray[212] = new ThisFieldRefForm(212, "aload_0_putfield_this", new int[] {42, 181, -1, -1});
-        byteCodeArray[213] = new ThisMethodRefForm(213, "aload_0_invokevirtual_this", new int[] {42, 182, -1, -1});
-        byteCodeArray[214] = new ThisMethodRefForm(214, "aload_0_invokespecial_this", new int[] {42, 183, -1, -1});
-        byteCodeArray[215] = new ThisMethodRefForm(215, "aload_0_invokestatic_this", new int[] {42, 184, -1, -1});
-        byteCodeArray[216] = new SuperFieldRefForm(216, "getstatic_super", new int[] {178, -1, -1});
-        byteCodeArray[217] = new SuperFieldRefForm(217, "putstatic_super", new int[] {179, -1, -1});
-        byteCodeArray[218] = new SuperFieldRefForm(218, "getfield_super", new int[] {180, -1, -1});
-        byteCodeArray[219] = new SuperFieldRefForm(219, "putfield_super", new int[] {181, -1, -1});
-        byteCodeArray[220] = new SuperMethodRefForm(220, "invokevirtual_super", new int[] {182, -1, -1});
-        byteCodeArray[221] = new SuperMethodRefForm(221, "invokespecial_super", new int[] {183, -1, -1});
-        byteCodeArray[222] = new SuperMethodRefForm(222, "invokestatic_super", new int[] {184, -1, -1});
-        byteCodeArray[223] = new SuperFieldRefForm(223, "aload_0_getstatic_super", new int[] {42, 178, -1, -1});
-        byteCodeArray[224] = new SuperFieldRefForm(224, "aload_0_putstatic_super", new int[] {42, 179, -1, -1});
-        byteCodeArray[225] = new SuperFieldRefForm(225, "aload_0_getfield_super", new int[] {42, 180, -1, -1});
-        byteCodeArray[226] = new SuperFieldRefForm(226, "aload_0_putfield_super", new int[] {42, 181, -1, -1});
-        byteCodeArray[227] = new SuperMethodRefForm(227, "aload_0_invokevirtual_super", new int[] {42, 182, -1, -1});
-        byteCodeArray[228] = new SuperMethodRefForm(228, "aload_0_invokespecial_super", new int[] {42, 183, -1, -1});
-        byteCodeArray[229] = new SuperMethodRefForm(229, "aload_0_invokestatic_super", new int[] {42, 184, -1, -1});
-        byteCodeArray[230] = new ThisInitMethodRefForm(230, "invokespecial_this_init", new int[] {183, -1, -1});
-        byteCodeArray[231] = new SuperInitMethodRefForm(231, "invokespecial_super_init", new int[] {183, -1, -1});
-        byteCodeArray[232] = new NewInitMethodRefForm(232, "invokespecial_new_init", new int[] {183, -1, -1});
-        byteCodeArray[233] = new NarrowClassRefForm(233, "cldc", new int[] {18, -1});
-        byteCodeArray[234] = new IntRefForm(234, "ildc", new int[] {18, -1});
-        byteCodeArray[235] = new FloatRefForm(235, "fldc", new int[] {18, -1});
-        byteCodeArray[236] = new NarrowClassRefForm(236, "cldc_w", new int[] {19, -1, -1}, WIDENED);
-        byteCodeArray[237] = new IntRefForm(237, "ildc_w", new int[] {19, -1, -1}, WIDENED);
-        byteCodeArray[238] = new FloatRefForm(238, "fldc_w", new int[] {19, -1, -1}, WIDENED);
-        byteCodeArray[239] = new DoubleForm(239, "dldc2_w", new int[] {20, -1, -1});
+        byteCodeArray[202] = new ThisFieldRefForm(202, "getstatic_this",
+                new int[] { 178, -1, -1 });
+        byteCodeArray[203] = new ThisFieldRefForm(203, "putstatic_this",
+                new int[] { 179, -1, -1 });
+        byteCodeArray[204] = new ThisFieldRefForm(204, "getfield_this",
+                new int[] { 180, -1, -1 });
+        byteCodeArray[205] = new ThisFieldRefForm(205, "putfield_this",
+                new int[] { 181, -1, -1 });
+        byteCodeArray[206] = new ThisMethodRefForm(206, "invokevirtual_this",
+                new int[] { 182, -1, -1 });
+        byteCodeArray[207] = new ThisMethodRefForm(207, "invokespecial_this",
+                new int[] { 183, -1, -1 });
+        byteCodeArray[208] = new ThisMethodRefForm(208, "invokestatic_this",
+                new int[] { 184, -1, -1 });
+        byteCodeArray[209] = new ThisFieldRefForm(209,
+                "aload_0_getstatic_this", new int[] { 42, 178, -1, -1 });
+        byteCodeArray[210] = new ThisFieldRefForm(210,
+                "aload_0_putstatic_this", new int[] { 42, 179, -1, -1 });
+        byteCodeArray[211] = new ThisFieldRefForm(211, "aload_0_getfield_this",
+                new int[] { 42, 180, -1, -1 });
+        byteCodeArray[212] = new ThisFieldRefForm(212, "aload_0_putfield_this",
+                new int[] { 42, 181, -1, -1 });
+        byteCodeArray[213] = new ThisMethodRefForm(213,
+                "aload_0_invokevirtual_this", new int[] { 42, 182, -1, -1 });
+        byteCodeArray[214] = new ThisMethodRefForm(214,
+                "aload_0_invokespecial_this", new int[] { 42, 183, -1, -1 });
+        byteCodeArray[215] = new ThisMethodRefForm(215,
+                "aload_0_invokestatic_this", new int[] { 42, 184, -1, -1 });
+        byteCodeArray[216] = new SuperFieldRefForm(216, "getstatic_super",
+                new int[] { 178, -1, -1 });
+        byteCodeArray[217] = new SuperFieldRefForm(217, "putstatic_super",
+                new int[] { 179, -1, -1 });
+        byteCodeArray[218] = new SuperFieldRefForm(218, "getfield_super",
+                new int[] { 180, -1, -1 });
+        byteCodeArray[219] = new SuperFieldRefForm(219, "putfield_super",
+                new int[] { 181, -1, -1 });
+        byteCodeArray[220] = new SuperMethodRefForm(220, "invokevirtual_super",
+                new int[] { 182, -1, -1 });
+        byteCodeArray[221] = new SuperMethodRefForm(221, "invokespecial_super",
+                new int[] { 183, -1, -1 });
+        byteCodeArray[222] = new SuperMethodRefForm(222, "invokestatic_super",
+                new int[] { 184, -1, -1 });
+        byteCodeArray[223] = new SuperFieldRefForm(223,
+                "aload_0_getstatic_super", new int[] { 42, 178, -1, -1 });
+        byteCodeArray[224] = new SuperFieldRefForm(224,
+                "aload_0_putstatic_super", new int[] { 42, 179, -1, -1 });
+        byteCodeArray[225] = new SuperFieldRefForm(225,
+                "aload_0_getfield_super", new int[] { 42, 180, -1, -1 });
+        byteCodeArray[226] = new SuperFieldRefForm(226,
+                "aload_0_putfield_super", new int[] { 42, 181, -1, -1 });
+        byteCodeArray[227] = new SuperMethodRefForm(227,
+                "aload_0_invokevirtual_super", new int[] { 42, 182, -1, -1 });
+        byteCodeArray[228] = new SuperMethodRefForm(228,
+                "aload_0_invokespecial_super", new int[] { 42, 183, -1, -1 });
+        byteCodeArray[229] = new SuperMethodRefForm(229,
+                "aload_0_invokestatic_super", new int[] { 42, 184, -1, -1 });
+        byteCodeArray[230] = new ThisInitMethodRefForm(230,
+                "invokespecial_this_init", new int[] { 183, -1, -1 });
+        byteCodeArray[231] = new SuperInitMethodRefForm(231,
+                "invokespecial_super_init", new int[] { 183, -1, -1 });
+        byteCodeArray[232] = new NewInitMethodRefForm(232,
+                "invokespecial_new_init", new int[] { 183, -1, -1 });
+        byteCodeArray[233] = new NarrowClassRefForm(233, "cldc", new int[] {
+                18, -1 });
+        byteCodeArray[234] = new IntRefForm(234, "ildc", new int[] { 18, -1 });
+        byteCodeArray[235] = new FloatRefForm(235, "fldc", new int[] { 18, -1 });
+        byteCodeArray[236] = new NarrowClassRefForm(236, "cldc_w", new int[] {
+                19, -1, -1 }, WIDENED);
+        byteCodeArray[237] = new IntRefForm(237, "ildc_w", new int[] { 19, -1,
+                -1 }, WIDENED);
+        byteCodeArray[238] = new FloatRefForm(238, "fldc_w", new int[] { 19,
+                -1, -1 }, WIDENED);
+        byteCodeArray[239] = new DoubleForm(239, "dldc2_w", new int[] { 20, -1,
+                -1 });
 
         // Reserved bytecodes
         byteCodeArray[254] = new NoArgumentForm(254, "impdep1");
@@ -331,22 +404,29 @@
     private int operandLength;
 
     /**
-     * Answer a new instance of this class with the specified
-     * opcode and name. Assume no rewrite.
-     * @param opcode int corresponding to the opcode's value
-     * @param name String printable name of the opcode
+     * Answer a new instance of this class with the specified opcode and name.
+     * Assume no rewrite.
+     * 
+     * @param opcode
+     *            int corresponding to the opcode's value
+     * @param name
+     *            String printable name of the opcode
      */
     public ByteCodeForm(int opcode, String name) {
-        this(opcode, name, new int[]{opcode});
+        this(opcode, name, new int[] { opcode });
     }
 
     /**
-     * Answer a new instance of this class with the specified
-     * opcode, name, operandType and rewrite
-     * @param opcode int corresponding to the opcode's value
-     * @param name String printable name of the opcode
-     * @param rewrite int[] Array of ints. Operand positions (which will
-     *   later be rewritten in ByteCodes) are indicated by -1.
+     * Answer a new instance of this class with the specified opcode, name,
+     * operandType and rewrite
+     * 
+     * @param opcode
+     *            int corresponding to the opcode's value
+     * @param name
+     *            String printable name of the opcode
+     * @param rewrite
+     *            int[] Array of ints. Operand positions (which will later be
+     *            rewritten in ByteCodes) are indicated by -1.
      */
     public ByteCodeForm(int opcode, String name, int[] rewrite) {
         this.opcode = opcode;
@@ -362,7 +442,7 @@
         // Find the first negative number in the rewrite array
         int iterationIndex = 0;
         while (iterationIndex < rewrite.length) {
-            if(rewrite[iterationIndex] < 0) {
+            if (rewrite[iterationIndex] < 0) {
                 // Found the first opcode to substitute
                 firstOperandIndex = iterationIndex;
                 iterationIndex = rewrite.length;
@@ -371,7 +451,7 @@
             }
         }
 
-        if(firstOperandIndex == -1) {
+        if (firstOperandIndex == -1) {
             // Nothing more to do since the opcode has no operands
             return;
         }
@@ -380,7 +460,7 @@
         int lastOperandIndex = -1;
         iterationIndex = firstOperandIndex;
         while (iterationIndex < rewrite.length) {
-            if(rewrite[iterationIndex] < 0) {
+            if (rewrite[iterationIndex] < 0) {
                 lastOperandIndex = iterationIndex;
             }
             iterationIndex++;
@@ -390,22 +470,24 @@
         final int difference = lastOperandIndex - firstOperandIndex;
 
         // If last < first, something is wrong.
-        if(difference < 0) {
-            throw new Error("Logic error: not finding rewrite operands correctly");
+        if (difference < 0) {
+            throw new Error(
+                    "Logic error: not finding rewrite operands correctly");
         }
         operandLength = difference + 1;
     }
 
     public static ByteCodeForm get(int opcode) {
-        return (ByteCodeForm)byteCodes.get(new Integer(opcode));
+        return (ByteCodeForm) byteCodes.get(new Integer(opcode));
     }
 
     public static ByteCodeForm get(String name) {
-        return (ByteCodeForm)byteCodes.get(name);
+        return (ByteCodeForm) byteCodes.get(name);
     }
 
     public String toString() {
-        return this.getClass().getName() + "(" + getName() + ":" + getOperandType() + ")";
+        return this.getClass().getName() + "(" + getName() + ":"
+                + getOperandType() + ")";
     }
 
     public int getOpcode() {
@@ -542,40 +624,39 @@
         return false;
     }
 
-
     /**
-     * This method will answer true if the receiver is
-     * a multi-bytecode instruction (such as
-     * aload0_putfield_super); otherwise, it will answer
+     * This method will answer true if the receiver is a multi-bytecode
+     * instruction (such as aload0_putfield_super); otherwise, it will answer
      * false.
-     *
+     * 
      * @return boolean true if multibytecode, false otherwise
      */
     public boolean hasMultipleByteCodes() {
-    	if(rewrite.length > 1) {
-             // Currently, all multi-bytecode instructions
-             // begin with aload_0, so this is how we test.
-    		if(rewrite[0] == 42) {
-    			// If there's an instruction (not a negative
-    			// number, which is an operand) after the
-    			// aload_0, it's a multibytecode instruction.
-    			return(rewrite[1] > 0);
-    		}
-    	}
-    	return false;
+        if (rewrite.length > 1) {
+            // Currently, all multi-bytecode instructions
+            // begin with aload_0, so this is how we test.
+            if (rewrite[0] == 42) {
+                // If there's an instruction (not a negative
+                // number, which is an operand) after the
+                // aload_0, it's a multibytecode instruction.
+                return (rewrite[1] > 0);
+            }
+        }
+        return false;
     }
 
     /**
-     * When passed a byteCode, an OperandTable and a
-     * SegmentConstantPool, this method will set the
-     * rewrite of the byteCode appropriately.
-     *
-     * @param byteCode ByteCode to be updated (!)
-     * @param operandManager OperandTable from which to draw info
-     * @param codeLength Length of bytes (excluding this bytecode)
-     *      from the beginning of the method. Used in calculating
-     *      padding for some variable-length bytecodes (such as
-     *      lookupswitch, tableswitch).
+     * When passed a byteCode, an OperandTable and a SegmentConstantPool, this
+     * method will set the rewrite of the byteCode appropriately.
+     * 
+     * @param byteCode
+     *            ByteCode to be updated (!)
+     * @param operandManager
+     *            OperandTable from which to draw info
+     * @param codeLength
+     *            Length of bytes (excluding this bytecode) from the beginning
+     *            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) {
@@ -583,14 +664,17 @@
     }
 
     /**
-     * The ByteCodeForm knows how to fix up a bytecode if
-     * it needs to be fixed up because it holds a Label
-     * bytecode.
-     * @param byteCode a ByteCode to be fixed up
-     * @param codeAttribute a CodeAttribute used to determine how
-     *   the ByteCode should be fixed up.
+     * The ByteCodeForm knows how to fix up a bytecode if it needs to be fixed
+     * up because it holds a Label bytecode.
+     * 
+     * @param byteCode
+     *            a ByteCode to be fixed up
+     * @param codeAttribute
+     *            a CodeAttribute used to determine how the ByteCode should be
+     *            fixed up.
      */
-    public void fixUpByteCodeTargets(ByteCode byteCode, CodeAttribute codeAttribute) {
+    public void fixUpByteCodeTargets(ByteCode byteCode,
+            CodeAttribute codeAttribute) {
         // Most ByteCodeForms don't have any fixing up to do.
         return;
     }

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteForm.java?rev=647100&r1=647099&r2=647100&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/ByteForm.java Fri Apr 11 03:09:38 2008
@@ -20,8 +20,7 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the form for bytecodes
- * which have single byte operands.
+ * This class implements the form for bytecodes which have single byte operands.
  */
 public class ByteForm extends ByteCodeForm {
 
@@ -37,8 +36,12 @@
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -23,9 +23,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have class references (and only
- * class references).
+ * This class implements the byte code form for those bytecodes which have class
+ * references (and only class references).
  */
 public class ClassRefForm extends ReferenceForm {
 
@@ -40,9 +39,10 @@
         this.widened = widened;
     }
 
-    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
+    protected void setNestedEntries(ByteCode byteCode,
+            OperandManager operandManager, int offset) throws Pack200Exception {
         // If the offset is not zero, proceed normally.
-        if(offset != 0) {
+        if (offset != 0) {
             super.setNestedEntries(byteCode, operandManager, offset - 1);
             return;
         }
@@ -51,15 +51,16 @@
         // (This is true for all bc_classref forms in
         // the spec except for multianewarray, which has
         // its own form.)
-        final SegmentConstantPool globalPool = operandManager.globalConstantPool();
+        final SegmentConstantPool globalPool = operandManager
+                .globalConstantPool();
         ClassFileEntry[] nested = null;
         // How do I get this class?
-        nested = new ClassFileEntry[] {
-                globalPool.getClassPoolEntry(operandManager.getCurrentClass())
-            };
+        nested = new ClassFileEntry[] { globalPool
+                .getClassPoolEntry(operandManager.getCurrentClass()) };
         byteCode.setNested(nested);
-        byteCode.setNestedPositions(new int[][] {{0,2}});
+        byteCode.setNestedPositions(new int[][] { { 0, 2 } });
     }
+
     public int getOperandType() {
         return TYPE_CLASSREF;
     }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -23,31 +23,33 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * Abstract superclass of all classes that have class-specific
- * references to constant pool information.
- * These classes have a context (a string representing a pack200 class)
- * i.e., they send getClassSpecificPoolEntry instead of getConstantPoolEntry.
- *
+ * Abstract superclass of all classes that have class-specific references to
+ * constant pool information. These classes have a context (a string
+ * representing a pack200 class) i.e., they send getClassSpecificPoolEntry
+ * instead of getConstantPoolEntry.
+ * 
  */
 public abstract class ClassSpecificReferenceForm extends ReferenceForm {
 
-    public ClassSpecificReferenceForm(int opcode, String name,
-            int[] rewrite) {
+    public ClassSpecificReferenceForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
     }
 
     protected abstract int getOffset(OperandManager operandManager);
+
     protected abstract int getPoolID();
+
     protected abstract String context(OperandManager operandManager);
 
-    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
-        final SegmentConstantPool globalPool = operandManager.globalConstantPool();
+    protected void setNestedEntries(ByteCode byteCode,
+            OperandManager operandManager, int offset) throws Pack200Exception {
+        final SegmentConstantPool globalPool = operandManager
+                .globalConstantPool();
         ClassFileEntry[] nested = null;
-        nested = new ClassFileEntry[] {
-                globalPool.getClassSpecificPoolEntry(getPoolID(), offset, context(operandManager))
-                };
+        nested = new ClassFileEntry[] { globalPool.getClassSpecificPoolEntry(
+                getPoolID(), offset, context(operandManager)) };
         byteCode.setNested(nested);
-        byteCode.setNestedPositions(new int[][] {{0, 2}});
+        byteCode.setNestedPositions(new int[][] { { 0, 2 } });
     }
 
 }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,9 +20,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have double references (and only
- * double references).
+ * This class implements the byte code form for those bytecodes which have
+ * double references (and only double references).
  */
 public class DoubleForm extends ReferenceForm {
 

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,9 +20,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have field references (and only
- * field references).
+ * This class implements the byte code form for those bytecodes which have field
+ * references (and only field references).
  */
 public class FieldRefForm extends ReferenceForm {
 

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -19,9 +19,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have float references (and only
- * float references).
+ * This class implements the byte code form for those bytecodes which have float
+ * references (and only float references).
  */
 public class FloatRefForm extends SingleByteReferenceForm {
 

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -22,14 +22,12 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have IMethod references (and only
- * IMethod references).
+ * This class implements the byte code form for those bytecodes which have
+ * IMethod references (and only IMethod references).
  */
 public class IMethodRefForm extends ReferenceForm {
 
-    public IMethodRefForm(int opcode, String name,
-            int[] rewrite) {
+    public IMethodRefForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
     }
 
@@ -49,13 +47,18 @@
         return SegmentConstantPool.CP_IMETHOD;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.Segment)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.Segment)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
         super.setByteCodeOperands(byteCode, operandManager, codeLength);
-        final 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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,9 +20,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for the
- * iinc instruction. It has a local reference and a byte
- * operand.
+ * This class implements the byte code form for the iinc instruction. It has a
+ * local reference and a byte operand.
  */
 public class IincForm extends ByteCodeForm {
 
@@ -37,13 +36,18 @@
     public boolean hasIincOperand() {
         return true;
     }
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
         final int local = operandManager.nextLocal();
         final int constant = operandManager.nextByte();
-        byteCode.setOperandBytes(new int[]{local, constant});
+        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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -23,14 +23,13 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * Abstract superclass of those classes which look up init methods
- * (these are class specific methods). They use getInitMethodPoolEntry
- * to find the methods.
+ * Abstract superclass of those classes which look up init methods (these are
+ * class specific methods). They use getInitMethodPoolEntry to find the methods.
  */
-public abstract class InitMethodReferenceForm extends ClassSpecificReferenceForm {
+public abstract class InitMethodReferenceForm extends
+        ClassSpecificReferenceForm {
 
-    public InitMethodReferenceForm(int opcode, String name,
-            int[] rewrite) {
+    public InitMethodReferenceForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
     }
 
@@ -48,13 +47,14 @@
         return operandManager.nextInitRef();
     }
 
-    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
-        final SegmentConstantPool globalPool = operandManager.globalConstantPool();
+    protected void setNestedEntries(ByteCode byteCode,
+            OperandManager operandManager, int offset) throws Pack200Exception {
+        final SegmentConstantPool globalPool = operandManager
+                .globalConstantPool();
         ClassFileEntry[] nested = null;
-        nested = new ClassFileEntry[] {
-                globalPool.getInitMethodPoolEntry(SegmentConstantPool.CP_METHOD, offset, context(operandManager))
-        };
+        nested = new ClassFileEntry[] { globalPool.getInitMethodPoolEntry(
+                SegmentConstantPool.CP_METHOD, offset, context(operandManager)) };
         byteCode.setNested(nested);
-        byteCode.setNestedPositions(new int[][] {{0, 2}});
+        byteCode.setNestedPositions(new int[][] { { 0, 2 } });
     }
 }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,9 +20,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have int references (and only
- * int references).
+ * This class implements the byte code form for those bytecodes which have int
+ * references (and only int references).
  */
 public class IntRefForm extends SingleByteReferenceForm {
 

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -21,9 +21,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have label references (and only
- * label references).
+ * This class implements the byte code form for those bytecodes which have label
+ * references (and only label references).
  */
 public class LabelForm extends ByteCodeForm {
 
@@ -46,32 +45,42 @@
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTarget(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.CodeAttribute)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTarget(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.CodeAttribute)
      */
-    public void fixUpByteCodeTargets(ByteCode byteCode, CodeAttribute codeAttribute) {
+    public void fixUpByteCodeTargets(ByteCode byteCode,
+            CodeAttribute codeAttribute) {
         // LabelForms need to fix up the target of label operations
         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();
+        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);
-        if(widened) {
-            byteCode.setNestedPositions(new int[][] {{0,4}});
+        if (widened) {
+            byteCode.setNestedPositions(new int[][] { { 0, 4 } });
         } else {
-            byteCode.setNestedPositions(new int[][] {{0,2}});
+            byteCode.setNestedPositions(new int[][] { { 0, 2 } });
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
-        byteCode.setByteCodeTargets(new int[] {operandManager.nextLabel()});
+        byteCode.setByteCodeTargets(new int[] { operandManager.nextLabel() });
         // The byte code operands actually get set later -
         // once we have all the bytecodes - in fixUpByteCodeTarget().
         return;

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,10 +20,9 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have float references (and only
- * float references). This excludes iinc (which has its
- * own form, IincForm).
+ * This class implements the byte code form for those bytecodes which have float
+ * references (and only float references). This excludes iinc (which has its own
+ * form, IincForm).
  */
 public class LocalForm extends ByteCodeForm {
 
@@ -43,11 +42,15 @@
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
-        byteCode.setOperandBytes(new int[]{operandManager.nextLocal()});
+        byteCode.setOperandBytes(new int[] { operandManager.nextLocal() });
     }
 }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,9 +20,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have long references (and only
- * long references).
+ * This class implements the byte code form for those bytecodes which have long
+ * references (and only long references).
  */
 public class LongForm extends ReferenceForm {
 

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -29,34 +29,35 @@
         super(opcode, name, rewrite);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandManager, int)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandManager, int)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
         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++) {
+        for (int index = 0; index < case_count; index++) {
             case_values[index] = operandManager.nextCaseValues();
         }
         final int case_pcs[] = new int[case_count];
-        for(int index=0; index < case_count; index++) {
+        for (int index = 0; index < case_count; index++) {
             case_pcs[index] = operandManager.nextLabel();
         }
 
         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];
+        for (int index = 1; index < case_count + 1; index++) {
+            labelsArray[index] = case_pcs[index - 1];
         }
         byteCode.setByteCodeTargets(labelsArray);
 
-
         // All this gets dumped into the rewrite bytes of the
         // poor bytecode.
 
-
         // Unlike most byte codes, the LookupSwitch is a
         // variable-sized bytecode. Because of this, the
         // rewrite array has to be defined here individually
@@ -68,9 +69,8 @@
         // label is on a 4-byte offset.
         final int padLength = 3 - (codeLength % 4);
         final int rewriteSize = 1 + padLength + 4 // defaultbytes
-            + 4 // npairs
-            + (4 * case_values.length)
-            + (4 * case_pcs.length);
+                + 4 // npairs
+                + (4 * case_values.length) + (4 * case_pcs.length);
 
         final int[] newRewrite = new int[rewriteSize];
         int rewriteIndex = 0;
@@ -80,7 +80,7 @@
         newRewrite[rewriteIndex++] = byteCode.getOpcode();
 
         // padding
-        for(int index=0; index < padLength; index++) {
+        for (int index = 0; index < padLength; index++) {
             newRewrite[rewriteIndex++] = 0;
         }
 
@@ -99,7 +99,7 @@
         // match-offset pairs
         // The case_values aren't overwritten, but the
         // case_pcs will get overwritten by fixUpByteCodeTargets
-        for(int index = 0; index < case_values.length; index++) {
+        for (int index = 0; index < case_values.length; index++) {
             // match
             setRewrite4Bytes(case_values[index], rewriteIndex, 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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,14 +20,10 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for those
- * bytecodes which have regular method references (and only
- * regular method references). These are:
- *    invokevirtual
- *    invokespecial
- *    invokestatic
- * Class-specific references to methods are subclasses of
- * ClassSpecificReferenceForm instead.
+ * This class implements the byte code form for those bytecodes which have
+ * regular method references (and only regular method references). These are:
+ * invokevirtual invokespecial invokestatic Class-specific references to methods
+ * are subclasses of ClassSpecificReferenceForm instead.
  */
 public class MethodRefForm extends ReferenceForm {
 

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,17 +20,14 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form for the
- * multianewarray instruction. It has a class reference
- * and a byte operand.
- *
- * MultiANewArrayForms (like other anewarray
- * forms) do not track the last new().
+ * This class implements the byte code form for the multianewarray instruction.
+ * It has a class reference and a byte operand.
+ * 
+ * MultiANewArrayForms (like other anewarray forms) do not track the last new().
  */
 public class MultiANewArrayForm extends ClassRefForm {
 
-    public MultiANewArrayForm(int opcode, String name,
-            int[] rewrite) {
+    public MultiANewArrayForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
     }
 
@@ -46,8 +43,12 @@
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NarrowClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NarrowClassRefForm.java?rev=647100&r1=647099&r2=647100&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NarrowClassRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/forms/NarrowClassRefForm.java Fri Apr 11 03:09:38 2008
@@ -22,9 +22,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class is used for representations of cldc and
- * cldc_w. In these cases, a narrow class ref has one
- * byte and a wide class ref has two bytes.
+ * This class is used for representations of cldc and cldc_w. In these cases, a
+ * narrow class ref has one byte and a wide class ref has two bytes.
  */
 public class NarrowClassRefForm extends ClassRefForm {
 
@@ -35,13 +34,15 @@
     public NarrowClassRefForm(int opcode, String name, int[] rewrite,
             boolean widened) {
         super(opcode, name, rewrite, widened);
-     }
+    }
 
-    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
+    protected void setNestedEntries(ByteCode byteCode,
+            OperandManager operandManager, int offset) throws Pack200Exception {
         super.setNestedEntries(byteCode, operandManager, offset);
-        if(!widened) {
-            byteCode.setNestedPositions(new int[][] {{0,1}});
-            ((CPClass)byteCode.getNestedClassFileEntries()[0]).mustStartClassPool(true);
+        if (!widened) {
+            byteCode.setNestedPositions(new int[][] { { 0, 1 } });
+            ((CPClass) byteCode.getNestedClassFileEntries()[0])
+                    .mustStartClassPool(true);
         }
     }
 }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -24,36 +24,35 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class is an extension of the ClassRefForm. It
- * has two purposes:
- *  1. To keep track of the last type used in a new()
- *     instruction in the current class.
- *  2. To allow the sender to create instances of either
- *     a specified class (which then becomes the new
- *     class) or the last used new class.
+ * This class is an extension of the ClassRefForm. It has two purposes: 1. To
+ * keep track of the last type used in a new() instruction in the current class.
+ * 2. To allow the sender to create instances of either a specified class (which
+ * then becomes the new class) or the last used new class.
  */
 public class NewClassRefForm extends ClassRefForm {
 
-    public NewClassRefForm(int opcode, String name,
-            int[] rewrite) {
+    public NewClassRefForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ReferenceForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandManager)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ReferenceForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandManager)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {
         ClassFileEntry[] nested = null;
         final int offset = getOffset(operandManager);
-        if(offset == 0) {
+        if (offset == 0) {
             // Use current class
-            final SegmentConstantPool globalPool = operandManager.globalConstantPool();
-            nested = new ClassFileEntry[] {
-                        globalPool.getClassPoolEntry(operandManager.getCurrentClass())
-            };
+            final SegmentConstantPool globalPool = operandManager
+                    .globalConstantPool();
+            nested = new ClassFileEntry[] { globalPool
+                    .getClassPoolEntry(operandManager.getCurrentClass()) };
             byteCode.setNested(nested);
-            byteCode.setNestedPositions(new int[][] {{0,2}});
+            byteCode.setNestedPositions(new int[][] { { 0, 2 } });
         } else {
             // Look up the class in the classpool
             try {
@@ -64,6 +63,7 @@
                 throw new Error("Got a pack200 exception. What to do?");
             }
         }
-        operandManager.setNewClass(((CPClass)byteCode.getNestedClassFileEntries()[0]).getName());
+        operandManager.setNewClass(((CPClass) byteCode
+                .getNestedClassFileEntries()[0]).getName());
     }
 }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -23,14 +23,12 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class is used to determine which init method should
- * be called, based on the last class which was sent a
- * constructor message.
+ * This class is used to determine which init method should be called, based on
+ * the last class which was sent a constructor message.
  */
 public class NewInitMethodRefForm extends InitMethodReferenceForm {
 
-    public NewInitMethodRefForm(int opcode, String name,
-            int[] rewrite) {
+    public NewInitMethodRefForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
     }
 
@@ -47,13 +45,14 @@
         return result;
     }
 
-    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
-        final SegmentConstantPool globalPool = operandManager.globalConstantPool();
+    protected void setNestedEntries(ByteCode byteCode,
+            OperandManager operandManager, int offset) throws Pack200Exception {
+        final SegmentConstantPool globalPool = operandManager
+                .globalConstantPool();
         ClassFileEntry[] nested = null;
-        nested = new ClassFileEntry[] {
-                globalPool.getInitMethodPoolEntry(SegmentConstantPool.CP_METHOD, offset, context(operandManager))
-        };
+        nested = new ClassFileEntry[] { globalPool.getInitMethodPoolEntry(
+                SegmentConstantPool.CP_METHOD, offset, context(operandManager)) };
         byteCode.setNested(nested);
-        byteCode.setNestedPositions(new int[][] {{0, 2}});
+        byteCode.setNestedPositions(new int[][] { { 0, 2 } });
     }
 }

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,10 +20,9 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the byte code form of all bytecodes
- * which either have no operands (such as nop) or have all
- * their operands passed on the stack (not encoded as bytes
- * in the bytecode streams).
+ * This class implements the byte code form of all bytecodes which either have
+ * no operands (such as nop) or have all their operands passed on the stack (not
+ * encoded as bytes in the bytecode streams).
  */
 public class NoArgumentForm extends ByteCodeForm {
 
@@ -39,8 +38,12 @@
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -23,8 +23,8 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * Abstract class of all ByteCodeForms which add a nested
- * entry from the globalConstantPool.
+ * Abstract class of all ByteCodeForms which add a nested entry from the
+ * globalConstantPool.
  */
 public abstract class ReferenceForm extends ByteCodeForm {
 
@@ -33,20 +33,26 @@
     }
 
     protected abstract int getPoolID();
+
     protected abstract int getOffset(OperandManager operandManager);
 
-    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
-        final SegmentConstantPool globalPool = operandManager.globalConstantPool();
+    protected void setNestedEntries(ByteCode byteCode,
+            OperandManager operandManager, int offset) throws Pack200Exception {
+        final SegmentConstantPool globalPool = operandManager
+                .globalConstantPool();
         ClassFileEntry[] nested = null;
-        nested = new ClassFileEntry[] {
-                    globalPool.getConstantPoolEntry(getPoolID(), offset)
-            };
+        nested = new ClassFileEntry[] { globalPool.getConstantPoolEntry(
+                getPoolID(), offset) };
         byteCode.setNested(nested);
-        byteCode.setNestedPositions(new int[][] {{0,2}});
+        byteCode.setNestedPositions(new int[][] { { 0, 2 } });
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.Segment)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.Segment)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -20,8 +20,7 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * This class implements the form for bytecodes
- * which have short operands only.
+ * This class implements the form for bytecodes which have short operands only.
  */
 public class ShortForm extends ByteCodeForm {
 
@@ -37,8 +36,12 @@
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode, org.apache.harmony.pack200.bytecode.OperandTable, org.apache.harmony.pack200.SegmentConstantPool)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.harmony.pack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.pack200.bytecode.ByteCode,
+     *      org.apache.harmony.pack200.bytecode.OperandTable,
+     *      org.apache.harmony.pack200.SegmentConstantPool)
      */
     public void setByteCodeOperands(ByteCode byteCode,
             OperandManager operandManager, int codeLength) {

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=647100&r1=647099&r2=647100&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 Fri Apr 11 03:09:38 2008
@@ -22,16 +22,14 @@
 import org.apache.harmony.pack200.bytecode.OperandManager;
 
 /**
- * Some bytecodes (such as (a)ldc, fldc and ildc) have single-
- * byte references to the class pool. This class is the
- * abstract superclass of those classes.
+ * Some bytecodes (such as (a)ldc, fldc and ildc) have single- byte references
+ * to the class pool. This class is the abstract superclass of those classes.
  */
 public abstract class SingleByteReferenceForm extends ReferenceForm {
 
     protected boolean widened = false;
 
-    public SingleByteReferenceForm(int opcode, String name,
-            int[] rewrite) {
+    public SingleByteReferenceForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
     }
 
@@ -39,13 +37,15 @@
 
     protected abstract int getPoolID();
 
-    protected void setNestedEntries(ByteCode byteCode, OperandManager operandManager, int offset) throws Pack200Exception {
+    protected void setNestedEntries(ByteCode byteCode,
+            OperandManager operandManager, int offset) throws Pack200Exception {
         super.setNestedEntries(byteCode, operandManager, offset);
-        if(widened) {
-            byteCode.setNestedPositions(new int[][] {{0,2}});
+        if (widened) {
+            byteCode.setNestedPositions(new int[][] { { 0, 2 } });
         } else {
-            byteCode.setNestedPositions(new int[][] {{0,1}});
-            ((ConstantPoolEntry)byteCode.getNestedClassFileEntries()[0]).mustStartClassPool(true);
+            byteCode.setNestedPositions(new int[][] { { 0, 1 } });
+            ((ConstantPoolEntry) byteCode.getNestedClassFileEntries()[0])
+                    .mustStartClassPool(true);
         }
     }
 }



Mime
View raw message