harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r988241 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/byteco...
Date Mon, 23 Aug 2010 18:20:37 GMT
Author: hindessm
Date: Mon Aug 23 18:20:36 2010
New Revision: 988241

URL: http://svn.apache.org/viewvc?rev=988241&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@986603:

  r986603 | sjanuary | 2010-08-18 10:13:22 +0100 (Wed, 18 Aug 2010) | 1 line
  
  Pack200 - remove some unused methods and fields


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 18:20:36 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356
+/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356,986603
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 18:20:36 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356
+/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356,986603
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 18:20:36 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356,986603
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
Mon Aug 23 18:20:36 2010
@@ -100,10 +100,6 @@ public class ByteCode extends ClassFileE
         return getByteCodeForm().getOpcode();
     }
 
-    public int getOperandType() {
-        return getByteCodeForm().getOperandType();
-    }
-
     private boolean hashcodeComputed;
     private int cachedHashCode;
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
Mon Aug 23 18:20:36 2010
@@ -23,39 +23,7 @@ import org.apache.harmony.unpack200.byte
 import org.apache.harmony.unpack200.bytecode.CodeAttribute;
 import org.apache.harmony.unpack200.bytecode.OperandManager;
 
-public class ByteCodeForm {
-
-    // Operand types. Those with no operands and
-    // those with operands on the operand stack are
-    // treated similarly. These types are used to
-    // distinguish different kinds of non-stack
-    // bytecode operands
-    protected static final int TYPE_NONE = 0;
-    protected static final int TYPE_BYTE = 1;
-    protected static final int TYPE_SHORT = 2;
-    protected static final int TYPE_INTREF = 3;
-    protected static final int TYPE_FLOATREF = 4;
-    protected static final int TYPE_STRINGREF = 5;
-    protected static final int TYPE_CLASSREF = 6;
-    protected static final int TYPE_LONG = 7;
-    protected static final int TYPE_DOUBLE = 8;
-    protected static final int TYPE_LOCAL = 9;
-    protected static final int TYPE_LABEL = 10;
-    protected static final int TYPE_FIELDREF = 11;
-    protected static final int TYPE_METHODREF = 12;
-    protected static final int TYPE_IMETHODREF = 13;
-    protected static final int TYPE_WIDE = 14;
-    protected static final int TYPE_IINC = 15;
-    protected static final int TYPE_SWITCH = 16;
-    protected static final int TYPE_MULTIANEWARRAY = 17;
-    protected static final int TYPE_THISFIELDREF = 18;
-    protected static final int TYPE_THISMETHODREF = 19;
-    protected static final int TYPE_SUPERFIELDREF = 20;
-    protected static final int TYPE_SUPERMETHODREF = 21;
-    protected static final int TYPE_THISINITMETHODREF = 22;
-    protected static final int TYPE_SUPERINITMETHODREF = 23;
-    protected static final int TYPE_NEWINITMETHODREF = 24;
-    protected static final int TYPE_NEWCLASSREF = 25;
+public abstract class ByteCodeForm {
 
     protected static final boolean WIDENED = true;
 
@@ -480,13 +448,8 @@ public class ByteCodeForm {
         return (ByteCodeForm) byteCodeArray[opcode];
     }
 
-    public static ByteCodeForm get(String name) {
-        return (ByteCodeForm) byteCodesByName.get(name);
-    }
-
     public String toString() {
-        return this.getClass().getName() + "(" + getName() + ":"
-                + getOperandType() + ")";
+        return this.getClass().getName() + "(" + getName() + ")";
     }
 
     public int getOpcode() {
@@ -497,10 +460,6 @@ public class ByteCodeForm {
         return name;
     }
 
-    public int getOperandType() {
-        return -1;
-    }
-
     public int[] getRewrite() {
         return rewrite;
     }
@@ -523,106 +482,6 @@ public class ByteCodeForm {
         return false;
     }
 
-    public boolean hasByteOperand() {
-        return false;
-    }
-
-    public boolean hasShortOperand() {
-        return false;
-    }
-
-    public boolean hasIntRefOperand() {
-        return false;
-    }
-
-    public boolean hasFloatRefOperand() {
-        return false;
-    }
-
-    public boolean hasStringRefOperand() {
-        return false;
-    }
-
-    public boolean hasClassRefOperand() {
-        return false;
-    }
-
-    public boolean hasLongOperand() {
-        return false;
-    }
-
-    public boolean hasDoubleOperand() {
-        return false;
-    }
-
-    public boolean hasLocalOperand() {
-        return false;
-    }
-
-    public boolean hasLabelOperand() {
-        return false;
-    }
-
-    public boolean hasFieldRefOperand() {
-        return false;
-    }
-
-    public boolean hasMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasIMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasWideOperand() {
-        return false;
-    }
-
-    public boolean hasIincOperand() {
-        return false;
-    }
-
-    public boolean hasSwitchOperand() {
-        return false;
-    }
-
-    public boolean hasMultianewarrayOperand() {
-        return false;
-    }
-
-    public boolean hasThisFieldRefOperand() {
-        return false;
-    }
-
-    public boolean hasThisMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasSuperFieldRefOperand() {
-        return false;
-    }
-
-    public boolean hasSuperMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasThisInitMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasSuperInitMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasNewInitMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasInitMethodRefOperand() {
-        return false;
-    }
-
     /**
      * This method will answer true if the receiver is a multi-bytecode
      * instruction (such as aload0_putfield_super); otherwise, it will answer
@@ -657,10 +516,8 @@ public class ByteCodeForm {
      *            of the method. Used in calculating padding for some
      *            variable-length bytecodes (such as lookupswitch, tableswitch).
      */
-    public void setByteCodeOperands(ByteCode byteCode,
-            OperandManager operandManager, int codeLength) {
-        throw new Error("My subclass should have implemented this");
-    }
+    public abstract void setByteCodeOperands(ByteCode byteCode,
+            OperandManager operandManager, int codeLength);
 
     /**
      * The ByteCodeForm knows how to fix up a bytecode if it needs to be fixed

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
Mon Aug 23 18:20:36 2010
@@ -28,14 +28,6 @@ public class ByteForm extends ByteCodeFo
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_BYTE;
-    }
-
-    public boolean hasByteOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
Mon Aug 23 18:20:36 2010
@@ -61,14 +61,6 @@ public class ClassRefForm extends Refere
         byteCode.setNestedPositions(new int[][] { { 0, 2 } });
     }
 
-    public int getOperandType() {
-        return TYPE_CLASSREF;
-    }
-
-    public boolean hasClassRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextClassRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
Mon Aug 23 18:20:36 2010
@@ -29,14 +29,6 @@ public class DoubleForm extends Referenc
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_DOUBLE;
-    }
-
-    public boolean hasDoubleOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextDoubleRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
Mon Aug 23 18:20:36 2010
@@ -29,14 +29,6 @@ public class FieldRefForm extends Refere
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_FIELDREF;
-    }
-
-    public boolean hasFieldRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextFieldRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
Mon Aug 23 18:20:36 2010
@@ -33,14 +33,6 @@ public class FloatRefForm extends Single
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_FLOATREF;
-    }
-
-    public boolean hasFloatRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextFloatRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
Mon Aug 23 18:20:36 2010
@@ -31,14 +31,6 @@ public class IMethodRefForm extends Refe
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_IMETHODREF;
-    }
-
-    public boolean hasIMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextIMethodRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
Mon Aug 23 18:20:36 2010
@@ -29,14 +29,6 @@ public class IincForm extends ByteCodeFo
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_IINC;
-    }
-
-    public boolean hasIincOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
Mon Aug 23 18:20:36 2010
@@ -35,10 +35,6 @@ public abstract class InitMethodReferenc
 
     protected abstract String context(OperandManager operandManager);
 
-    public boolean hasInitMethodRefOperand() {
-        return true;
-    }
-
     protected int getPoolID() {
         return SegmentConstantPool.CP_METHOD;
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
Mon Aug 23 18:20:36 2010
@@ -34,14 +34,6 @@ public class IntRefForm extends SingleBy
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_INTREF;
-    }
-
-    public boolean hasIntRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextIntRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
Mon Aug 23 18:20:36 2010
@@ -37,14 +37,6 @@ public class LabelForm extends ByteCodeF
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_LABEL;
-    }
-
-    public boolean hasLabelOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
Mon Aug 23 18:20:36 2010
@@ -34,14 +34,6 @@ public class LocalForm extends ByteCodeF
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_LOCAL;
-    }
-
-    public boolean hasLocalOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
Mon Aug 23 18:20:36 2010
@@ -29,14 +29,6 @@ public class LongForm extends ReferenceF
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_LONG;
-    }
-
-    public boolean hasLongOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextLongRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
Mon Aug 23 18:20:36 2010
@@ -31,14 +31,6 @@ public class MethodRefForm extends Refer
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_METHODREF;
-    }
-
-    public boolean hasMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextMethodRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
Mon Aug 23 18:20:36 2010
@@ -31,18 +31,6 @@ public class MultiANewArrayForm extends 
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_MULTIANEWARRAY;
-    }
-
-    public boolean hasMultianewarrayOperand() {
-        return true;
-    }
-
-    public boolean hasClassRefOperand() {
-        return false;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
Mon Aug 23 18:20:36 2010
@@ -32,14 +32,6 @@ public class NewInitMethodRefForm extend
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_NEWINITMETHODREF;
-    }
-
-    public boolean hasNewInitMethodRefOperand() {
-        return true;
-    }
-
     protected String context(OperandManager operandManager) {
         final String result = operandManager.getNewClass();
         return result;

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
Mon Aug 23 18:20:36 2010
@@ -30,14 +30,6 @@ public class NoArgumentForm extends Byte
         super(opcode, name);
     }
 
-    public int getOperandType() {
-        return TYPE_NONE;
-    }
-
-    public boolean hasNoOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
Mon Aug 23 18:20:36 2010
@@ -28,14 +28,6 @@ public class ShortForm extends ByteCodeF
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SHORT;
-    }
-
-    public boolean hasShortOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
Mon Aug 23 18:20:36 2010
@@ -38,14 +38,6 @@ public class StringRefForm extends Singl
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_STRINGREF;
-    }
-
-    public boolean hasStringRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextStringRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
Mon Aug 23 18:20:36 2010
@@ -31,14 +31,6 @@ public class SuperFieldRefForm extends C
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SUPERFIELDREF;
-    }
-
-    public boolean hasSuperFieldRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextSuperFieldRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
Mon Aug 23 18:20:36 2010
@@ -26,14 +26,6 @@ public class SuperInitMethodRefForm exte
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SUPERINITMETHODREF;
-    }
-
-    public boolean hasSuperInitMethodRefOperand() {
-        return true;
-    }
-
     protected String context(
             org.apache.harmony.unpack200.bytecode.OperandManager operandManager) {
         return operandManager.getSuperClass();

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
Mon Aug 23 18:20:36 2010
@@ -31,14 +31,6 @@ public class SuperMethodRefForm extends 
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SUPERMETHODREF;
-    }
-
-    public boolean hasSuperMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextSuperMethodRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
Mon Aug 23 18:20:36 2010
@@ -30,14 +30,6 @@ public abstract class SwitchForm extends
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SWITCH;
-    }
-
-    public boolean hasSwitchOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
Mon Aug 23 18:20:36 2010
@@ -31,14 +31,6 @@ public class ThisFieldRefForm extends Cl
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_THISFIELDREF;
-    }
-
-    public boolean hasThisFieldRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextThisFieldRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
Mon Aug 23 18:20:36 2010
@@ -28,14 +28,6 @@ public class ThisInitMethodRefForm exten
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_THISINITMETHODREF;
-    }
-
-    public boolean hasThisInitMethodRefOperand() {
-        return true;
-    }
-
     protected String context(OperandManager operandManager) {
         return operandManager.getCurrentClass();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
Mon Aug 23 18:20:36 2010
@@ -31,14 +31,6 @@ public class ThisMethodRefForm extends C
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_THISMETHODREF;
-    }
-
-    public boolean hasThisMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextThisMethodRef();
     }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java?rev=988241&r1=988240&r2=988241&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
Mon Aug 23 18:20:36 2010
@@ -34,14 +34,6 @@ public class WideForm extends VariableIn
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_WIDE;
-    }
-
-    public boolean hasWideOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 18:20:36 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356
+/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356,986603
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 18:20:36 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356
+/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879,983902,984367,984577,984597-984598,984613,984682,984708,984731,984779,984784,984798,985098,985141,986136,986141,986147,986150,986205,986223-986224,986228,986248,986356,986603
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message