harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r687988 [10/11] - in /harmony/enhanced/classlib/branches/java6: ./ depends/build/ depends/build/platform/ depends/jars/ depends/jars/icu4jni_3.4/ depends/manifests/bcel-5.2/ depends/manifests/bcel-5.2/META-INF/ make/ modules/accessibility/ ...
Date Fri, 22 Aug 2008 07:15:27 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java Fri Aug 22 00:15:00 2008
@@ -27,8 +27,7 @@
     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");
 
     public SignatureAttribute(CPUTF8 value) {
         super(attributeName);
@@ -37,7 +36,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
      */
     protected int getLength() {
@@ -56,7 +55,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
      */
     protected void writeBody(DataOutputStream dos) throws IOException {
@@ -65,7 +64,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
      */
     public String toString() {

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java Fri Aug 22 00:15:00 2008
@@ -27,7 +27,7 @@
     private final CPUTF8 name;
     private int nameIndex;
     private static final CPUTF8 attributeName = new CPUTF8(
-            "SourceFile", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ); //$NON-NLS-1$
+            "SourceFile"); //$NON-NLS-1$
 
     public SourceFileAttribute(CPUTF8 name) {
         super(attributeName);
@@ -52,7 +52,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.Attribute#isSourceFileAttribute()
      */
     public boolean isSourceFileAttribute() {

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java Fri Aug 22 00:15:00 2008
@@ -406,7 +406,7 @@
     /**
      * 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
@@ -419,7 +419,7 @@
     /**
      * 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
@@ -628,7 +628,7 @@
      * 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() {
@@ -648,7 +648,7 @@
     /**
      * 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
@@ -666,7 +666,7 @@
     /**
      * 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

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java Fri Aug 22 00:15:00 2008
@@ -38,7 +38,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
@@ -28,7 +28,7 @@
  */
 public class ClassRefForm extends ReferenceForm {
 
-    protected boolean widened = false;
+    protected boolean widened;
 
     public ClassRefForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
@@ -27,7 +27,7 @@
  * 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 {
 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java Fri Aug 22 00:15:00 2008
@@ -49,7 +49,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.Segment)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java Fri Aug 22 00:15:00 2008
@@ -39,7 +39,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.ClassFileEntry;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java Fri Aug 22 00:15:00 2008
@@ -26,7 +26,7 @@
  */
 public class LabelForm extends ByteCodeForm {
 
-    protected boolean widened = false;
+    protected boolean widened;
 
     public LabelForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);
@@ -47,7 +47,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTarget(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.CodeAttribute)
      */
@@ -73,7 +73,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java Fri Aug 22 00:15:00 2008
@@ -44,7 +44,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java Fri Aug 22 00:15:00 2008
@@ -31,7 +31,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandManager, int)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java Fri Aug 22 00:15:00 2008
@@ -22,7 +22,7 @@
 /**
  * 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 {
@@ -45,7 +45,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.OperandManager;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.CPClass;
@@ -37,7 +37,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ReferenceForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandManager)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.ClassFileEntry;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java Fri Aug 22 00:15:00 2008
@@ -40,7 +40,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
@@ -49,7 +49,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.Segment)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java Fri Aug 22 00:15:00 2008
@@ -38,7 +38,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.OperandManager;
 
@@ -26,7 +26,7 @@
  */
 public abstract class SingleByteReferenceForm extends ReferenceForm {
 
-    protected boolean widened = false;
+    protected boolean widened;
 
     public SingleByteReferenceForm(int opcode, String name, int[] rewrite) {
         super(opcode, name, rewrite);

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java Fri Aug 22 00:15:00 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.harmony.unpack200.bytecode.forms;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.CPString;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java Fri Aug 22 00:15:00 2008
@@ -40,7 +40,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)
@@ -51,7 +51,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTargets(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.CodeAttribute)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java Fri Aug 22 00:15:00 2008
@@ -31,7 +31,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandManager, int)
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java Fri Aug 22 00:15:00 2008
@@ -35,7 +35,7 @@
      * Given an int operand, set the rewrite bytes for the next available
      * operand position and the three immediately following it to a
      * highest-byte, mid-high, mid-low, low-byte encoding of the operand.
-     * 
+     *
      * Note that unlike the ByteCode setOperand* operations, this starts with an
      * actual bytecode rewrite array (rather than a ByteCodeForm prototype
      * rewrite array). Also, this method overwrites -1 values in the rewrite
@@ -44,7 +44,7 @@
      * first time will convert it to: {100, 0, 0, 0, 0, 200, -1, -1, -1, -1}
      * Calling setRewrite4Bytes(0, rewrite) a second time will convert it to:
      * {100, 0, 0, 0, 0, 200, 0, 0, 0, 0}
-     * 
+     *
      * @param operand
      *            int to set the rewrite bytes to
      * @param rewrite
@@ -68,7 +68,7 @@
      * Given an int operand, set the rewrite bytes for the next available
      * operand position and the byte immediately following it to a high-byte,
      * low-byte encoding of the operand.
-     * 
+     *
      * Note that unlike the ByteCode setOperand* operations, this starts with an
      * actual bytecode rewrite array (rather than a ByteCodeForm prototype
      * rewrite array). Also, this method overwrites -1 values in the rewrite
@@ -77,7 +77,7 @@
      * first time will convert it to: {100, 0, 0, -1, -1, 200, -1, -1, -1, -1}
      * Calling setRewrite2Bytes(0, rewrite) a second time will convert it to:
      * {100, 0, 0, 0, 0, 200, -1, -1, -1, -1}
-     * 
+     *
      * @param operand
      *            int to set the rewrite bytes to
      * @param rewrite
@@ -99,7 +99,7 @@
     /**
      * This method writes operand directly into the rewrite array at index
      * position specified.
-     * 
+     *
      * @param operand
      *            value to write
      * @param absPosition
@@ -132,7 +132,7 @@
     /**
      * This method writes operand directly into the rewrite array at index
      * position specified.
-     * 
+     *
      * @param operand
      *            value to write
      * @param absPosition

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java Fri Aug 22 00:15:00 2008
@@ -44,7 +44,7 @@
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
      *      org.apache.harmony.unpack200.bytecode.OperandTable,
      *      org.apache.harmony.unpack200.SegmentConstantPool)
@@ -65,7 +65,7 @@
      * This method sets the rewrite array for the bytecode using Format 1 of the
      * JVM spec: an opcode and two index bytes. This is used for
      * ?load/?store/ret
-     * 
+     *
      * @param instruction
      *            should be 132
      * @param byteCode
@@ -114,7 +114,7 @@
      * This method sets the rewrite array for the bytecode using Format 2 of the
      * JVM spec: an opcode, two index bytes, and two constant bytes. This is
      * used for iinc.
-     * 
+     *
      * @param instruction
      *            int should be 132
      * @param byteCode

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java Fri Aug 22 00:15:00 2008
@@ -22,6 +22,8 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.Pack200.Packer;
 
+import org.apache.harmony.pack200.Pack200Exception;
+
 
 /**
  * This class provides the binding between the standard Pack200 interface and the
@@ -31,12 +33,31 @@
  */
 public class Pack200PackerAdapter extends Pack200Adapter implements Packer {
 
-	public void pack(JarFile arg0, OutputStream arg1) throws IOException {
-		throw new Error("Not yet implemented");
+	public void pack(JarFile file, OutputStream out) throws IOException {
+        if (file == null || out == null)
+            throw new IllegalArgumentException(
+                    "Must specify both input and output streams");
+        completed(0);
+        try {
+            new org.apache.harmony.pack200.Archive(file, out).pack();
+        } catch (Pack200Exception e) {
+            throw new IOException("Failed to pack Jar:" + String.valueOf(e));
+        }
+        completed(1);
 	}
 
-	public void pack(JarInputStream arg0, OutputStream arg1) throws IOException {
-		throw new Error("Not yet implemented");
+	public void pack(JarInputStream in, OutputStream out) throws IOException {
+	    if (in == null || out == null)
+            throw new IllegalArgumentException(
+                    "Must specify both input and output streams");
+        completed(0);
+        try {
+            new org.apache.harmony.pack200.Archive(in, out).pack();
+        } catch (Pack200Exception e) {
+            throw new IOException("Failed to pack Jar:" + String.valueOf(e));
+        }
+        completed(1);
+        in.close();
 	}
 
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java Fri Aug 22 00:15:00 2008
@@ -24,6 +24,8 @@
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200.Unpacker;
 
+import org.apache.harmony.pack200.Pack200Exception;
+
 /**
  * This class provides the binding between the standard Pack200 interface and
  * the internal interface for (un)packing. As this uses generics for the

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java Fri Aug 22 00:15:00 2008
@@ -23,8 +23,9 @@
 import junit.framework.TestCase;
 
 import org.apache.harmony.pack200.BHSDCodec;
+import org.apache.harmony.pack200.Codec;
 import org.apache.harmony.pack200.CodecEncoding;
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 
 /**
  * Tests for BHSDCodec
@@ -64,4 +65,14 @@
         }
     }
 
+    public void testDeltaEncodings() throws IOException, Pack200Exception {
+        Codec c = Codec.UDELTA5;
+        int[] sequence = new int[] {0, 2, 4, 2, 2, 4};
+        byte[] encoded = c.encode(sequence);
+        int[] decoded = c.decodeInts(6, new ByteArrayInputStream(encoded));
+        for (int i = 0; i < decoded.length; i++) {
+            assertEquals(sequence[i], decoded[i]);
+        }
+    }
+
 }
\ No newline at end of file

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java Fri Aug 22 00:15:00 2008
@@ -26,7 +26,7 @@
 import org.apache.harmony.pack200.BHSDCodec;
 import org.apache.harmony.pack200.Codec;
 import org.apache.harmony.pack200.CodecEncoding;
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 
 /**
  * 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java Fri Aug 22 00:15:00 2008
@@ -24,8 +24,8 @@
 
 import org.apache.harmony.pack200.BHSDCodec;
 import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.pack200.RunCodec;
-import org.apache.harmony.unpack200.Pack200Exception;
 
 /**
  * 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java Fri Aug 22 00:15:00 2008
@@ -23,8 +23,8 @@
 import junit.framework.TestCase;
 
 import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.pack200.PopulationCodec;
-import org.apache.harmony.unpack200.Pack200Exception;
 
 public class PopulationCodecTest extends TestCase {
 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java Fri Aug 22 00:15:00 2008
@@ -18,9 +18,9 @@
 
 import junit.framework.TestCase;
 
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.AttrDefinitionBands;
 import org.apache.harmony.unpack200.AttributeLayoutMap;
-import org.apache.harmony.unpack200.Pack200Exception;
 import org.apache.harmony.unpack200.Segment;
 import org.apache.harmony.unpack200.SegmentHeader;
 import org.apache.harmony.unpack200.SegmentOptions;

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java Fri Aug 22 00:15:00 2008
@@ -18,9 +18,9 @@
 
 import junit.framework.TestCase;
 
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.AttributeLayout;
 import org.apache.harmony.unpack200.AttributeLayoutMap;
-import org.apache.harmony.unpack200.Pack200Exception;
 
 public class AttributeLayoutMapTest extends TestCase {
 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java Fri Aug 22 00:15:00 2008
@@ -19,12 +19,11 @@
 import junit.framework.TestCase;
 
 import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.AttributeLayout;
-import org.apache.harmony.unpack200.Pack200Exception;
 import org.apache.harmony.unpack200.Segment;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
 import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
 
 public class AttributeLayoutTest extends TestCase {
@@ -60,7 +59,7 @@
         }
 
         private ClassFileEntry entry(String string) {
-            return new CPUTF8(string, ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ);
+            return new CPUTF8(string);
         }
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java Fri Aug 22 00:15:00 2008
@@ -24,8 +24,8 @@
 
 import org.apache.harmony.pack200.BHSDCodec;
 import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.BandSet;
-import org.apache.harmony.unpack200.Pack200Exception;
 import org.apache.harmony.unpack200.Segment;
 import org.apache.harmony.unpack200.SegmentHeader;
 
@@ -40,10 +40,13 @@
 
     private final BandSet bandSet = new BandSet(new MockSegment()) {
 
-        public void unpack(InputStream inputStream) throws IOException,
+        public void read(InputStream inputStream) throws IOException,
                 Pack200Exception {
         }
 
+        public void unpack() throws IOException, Pack200Exception {
+        }
+
     };
 
     public void testDecodeBandInt() throws IOException, Pack200Exception {

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java Fri Aug 22 00:15:00 2008
@@ -21,11 +21,11 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.AttrDefinitionBands;
 import org.apache.harmony.unpack200.BcBands;
 import org.apache.harmony.unpack200.ClassBands;
 import org.apache.harmony.unpack200.CpBands;
-import org.apache.harmony.unpack200.Pack200Exception;
 import org.apache.harmony.unpack200.Segment;
 import org.apache.harmony.unpack200.SegmentConstantPool;
 import org.apache.harmony.unpack200.bytecode.CPClass;
@@ -39,7 +39,6 @@
 import org.apache.harmony.unpack200.bytecode.CPNameAndType;
 import org.apache.harmony.unpack200.bytecode.CPString;
 import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
 
 /**
  * Tests for Pack200 bytecode bands
@@ -55,13 +54,10 @@
 
     public class MockCpBands extends CpBands {
 
-        private final CPUTF8 cpUTF8 = new CPUTF8("java/lang/String",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ);
+        private final CPUTF8 cpUTF8 = new CPUTF8("java/lang/String");
         private final CPClass cpClass = new CPClass(cpUTF8, -1);
         private final CPNameAndType descriptor = new CPNameAndType(new CPUTF8(
-                "Hello", ClassConstantPool.DOMAIN_NORMALASCIIZ), new CPUTF8(
-                "(a, b, c)", ClassConstantPool.DOMAIN_NORMALASCIIZ),
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, -1);
+                "Hello"), new CPUTF8("(a, b, c)"), -1);
 
         public MockCpBands(Segment segment) {
             super(segment);
@@ -106,7 +102,7 @@
         public String[] getCpClass() {
             return new String[] {"Hello"};
         }
-        
+
         public String[] getCpFieldClass() {
             return new String[]{};
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CPUTF8Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CPUTF8Test.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CPUTF8Test.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CPUTF8Test.java Fri Aug 22 00:15:00 2008
@@ -19,17 +19,13 @@
 import junit.framework.TestCase;
 
 import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
 
 public class CPUTF8Test extends TestCase {
 
     public void testEquality() {
-        CPUTF8 one = new CPUTF8("(III)V",
-                ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ, 1);
-        CPUTF8 two = new CPUTF8("((I[II)V",
-                ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ, 2);
-        CPUTF8 three = new CPUTF8("([III)V",
-                ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ, 3);
+        CPUTF8 one = new CPUTF8("(III)V", 1);
+        CPUTF8 two = new CPUTF8("((I[II)V", 2);
+        CPUTF8 three = new CPUTF8("([III)V", 3);
         assertFalse(one.equals(two));
         assertFalse(one.equals(three));
         assertFalse(two.equals(three));

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java Fri Aug 22 00:15:00 2008
@@ -20,9 +20,9 @@
 import java.io.IOException;
 
 import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.ClassBands;
 import org.apache.harmony.unpack200.CpBands;
-import org.apache.harmony.unpack200.Pack200Exception;
 import org.apache.harmony.unpack200.Segment;
 
 /**

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CodeAttributeTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CodeAttributeTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CodeAttributeTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/CodeAttributeTest.java Fri Aug 22 00:15:00 2008
@@ -29,7 +29,6 @@
 import org.apache.harmony.unpack200.bytecode.CPMethodRef;
 import org.apache.harmony.unpack200.bytecode.CPString;
 import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
 import org.apache.harmony.unpack200.bytecode.CodeAttribute;
 import org.apache.harmony.unpack200.bytecode.LocalVariableTableAttribute;
 import org.apache.harmony.unpack200.bytecode.OperandManager;
@@ -64,7 +63,7 @@
         }
 
         public CPString cpStringValue(int index) {
-            return new CPString(new CPUTF8("Hello", ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ), -1);
+            return new CPString(new CPUTF8("Hello"), -1);
         }
 
         public CPMethodRef cpMethodValue(int index) {

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java Fri Aug 22 00:15:00 2008
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
 import org.apache.harmony.unpack200.SegmentOptions;
 
 /**

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java Fri Aug 22 00:15:00 2008
@@ -1,18 +1,18 @@
 /*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package org.apache.harmony.unpack200.tests.bytecode;
 
@@ -25,18 +25,14 @@
 import org.apache.harmony.unpack200.bytecode.CPMember;
 import org.apache.harmony.unpack200.bytecode.CPString;
 import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
 import org.apache.harmony.unpack200.bytecode.SourceFileAttribute;
 
 public class ClassFileEntryTest extends TestCase {
 
     public void testUTF8() {
-        CPUTF8 u1 = new CPUTF8(
-                new String("thing"), ClassConstantPool.DOMAIN_NORMALASCIIZ, 1); //$NON-NLS-1$
-        CPUTF8 u2 = new CPUTF8(
-                new String("thing"), ClassConstantPool.DOMAIN_NORMALASCIIZ, 1); //$NON-NLS-1$
-        CPUTF8 u3 = new CPUTF8(
-                new String("otherthing"), ClassConstantPool.DOMAIN_NORMALASCIIZ, 2); //$NON-NLS-1$
+        CPUTF8 u1 = new CPUTF8(new String("thing"), 1); //$NON-NLS-1$
+        CPUTF8 u2 = new CPUTF8(new String("thing"), 1); //$NON-NLS-1$
+        CPUTF8 u3 = new CPUTF8(new String("otherthing"), 2); //$NON-NLS-1$
         checkEquality(u1, u2, "thing", u3);
     }
 
@@ -52,15 +48,12 @@
     }
 
     public void testSourceAttribute() {
-        SourceFileAttribute sfa1 = new SourceFileAttribute(
-                new CPUTF8(
-                        new String("Thing.java"), ClassConstantPool.DOMAIN_NORMALASCIIZ, 1)); //$NON-NLS-1$
-        SourceFileAttribute sfa2 = new SourceFileAttribute(
-                new CPUTF8(
-                        new String("Thing.java"), ClassConstantPool.DOMAIN_NORMALASCIIZ, 1)); //$NON-NLS-1$
-        SourceFileAttribute sfa3 = new SourceFileAttribute(
-                new CPUTF8(
-                        new String("OtherThing.java"), ClassConstantPool.DOMAIN_NORMALASCIIZ, 2)); //$NON-NLS-1$
+        SourceFileAttribute sfa1 = new SourceFileAttribute(new CPUTF8(
+                new String("Thing.java"), 1)); //$NON-NLS-1$
+        SourceFileAttribute sfa2 = new SourceFileAttribute(new CPUTF8(
+                new String("Thing.java"), 1)); //$NON-NLS-1$
+        SourceFileAttribute sfa3 = new SourceFileAttribute(new CPUTF8(
+                new String("OtherThing.java"), 2)); //$NON-NLS-1$
         checkEquality(sfa1, sfa2, "Thing.java", sfa3); //$NON-NLS-1$
     }
 
@@ -93,28 +86,21 @@
     }
 
     public void testCPString() {
-        CPString cp1 = new CPString(new CPUTF8(new String("3"),
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 3), 3);
-        CPString cp2 = new CPString(new CPUTF8(new String("3"),
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 3), 3);
-        CPString cp3 = new CPString(new CPUTF8(new String("5"),
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 5), 5);
+        CPString cp1 = new CPString(new CPUTF8(new String("3"), 3), 3);
+        CPString cp2 = new CPString(new CPUTF8(new String("3"), 3), 3);
+        CPString cp3 = new CPString(new CPUTF8(new String("5"), 5), 5);
         checkEquality(cp1, cp2, "3", cp3); //$NON-NLS-1$
     }
 
     public void testCPField() {
-        CPMember cp1 = new CPMember(new CPUTF8("Name",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 3), new CPUTF8("I",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 4), 0, null);
-        CPMember cp2 = new CPMember(new CPUTF8("Name",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 3), new CPUTF8("I",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 4), 0, null);
-        CPMember cp3 = new CPMember(new CPUTF8("Name",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 3), new CPUTF8("Z",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 5), 0, null);
-        CPMember cp4 = new CPMember(new CPUTF8("GName",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 6), new CPUTF8("I",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 4), 0, null);
+        CPMember cp1 = new CPMember(new CPUTF8("Name", 3), new CPUTF8("I", 4),
+                0, null);
+        CPMember cp2 = new CPMember(new CPUTF8("Name", 3), new CPUTF8("I", 4),
+                0, null);
+        CPMember cp3 = new CPMember(new CPUTF8("Name", 3), new CPUTF8("Z", 5),
+                0, null);
+        CPMember cp4 = new CPMember(new CPUTF8("GName", 6), new CPUTF8("I", 4),
+                0, null);
         checkEquality(cp1, cp2, "Name", cp3); //$NON-NLS-1$
         checkEquality(cp1, cp2, "I", cp4); //$NON-NLS-1$
     }

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ConstantPoolTest.java?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ConstantPoolTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/bytecode/ConstantPoolTest.java Fri Aug 22 00:15:00 2008
@@ -1,18 +1,18 @@
 /*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package org.apache.harmony.unpack200.tests.bytecode;
 
@@ -33,43 +33,37 @@
     }
 
     public void testDuplicateUTF8() {
-        CPUTF8 u1 = new CPUTF8("thing", ClassConstantPool.DOMAIN_NORMALASCIIZ, 1);
-        CPUTF8 u2 = new CPUTF8("thing", ClassConstantPool.DOMAIN_NORMALASCIIZ, 1);
+        CPUTF8 u1 = new CPUTF8("thing", 1);
+        CPUTF8 u2 = new CPUTF8("thing", 1);
         pool.add(u1);
         pool.add(u2);
         assertEquals(1, pool.size());
     }
 
     public void testDuplicateField() {
-        CPMember cp1 = new CPMember(new CPUTF8("name",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 1), new CPUTF8("I",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 2), 0, null);
+        CPMember cp1 = new CPMember(new CPUTF8("name", 1), new CPUTF8("I", 2),
+                0, null);
         pool.add(cp1);
         pool.addNestedEntries();
         assertEquals(2, pool.size());
-        CPMember cp2 = new CPMember(new CPUTF8("name",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 1), new CPUTF8("I",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 2), 0, null);
+        CPMember cp2 = new CPMember(new CPUTF8("name", 1), new CPUTF8("I", 2),
+                0, null);
         pool.add(cp2);
         pool.addNestedEntries();
         assertEquals(2, pool.size());
     }
 
     public void testIndex() {
-        pool
-                .add(new CPUTF8("OtherThing",
-                        ClassConstantPool.DOMAIN_NORMALASCIIZ, 1));
-        CPUTF8 u1 = new CPUTF8("thing", ClassConstantPool.DOMAIN_NORMALASCIIZ, 2);
+        pool.add(new CPUTF8("OtherThing", 1));
+        CPUTF8 u1 = new CPUTF8("thing", 2);
         pool.add(u1);
         pool.resolve(new Segment());
         assertTrue(pool.indexOf(u1) > 0);
     }
 
     public void testAllClasses() {
-        pool.add(new CPClass(new CPUTF8("RandomClass",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 1), 10));
-        pool.add(new CPClass(new CPUTF8("RandomClass2",
-                ClassConstantPool.DOMAIN_NORMALASCIIZ, 2), 20));
+        pool.add(new CPClass(new CPUTF8("RandomClass", 1), 10));
+        pool.add(new CPClass(new CPUTF8("RandomClass2", 2), 20));
         assertEquals(2, pool.allClasses().size());
     }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml Fri Aug 22 00:15:00 2008
@@ -226,6 +226,9 @@
         <make dir="${hy.portlib.src.test.native}/hyport/${hy.os.family}" />
         <make dir="${hy.portlib.src.test.native}/hystr/${hy.os.family}" />
         <make dir="${hy.portlib.src.test.native}/hytime/${hy.os.family}" />
+        <make dir="${hy.portlib.src.test.native}/hysysinfo/${hy.os.family}" />
+        <make dir="${hy.portlib.src.test.native}/hyipcmutex/${hy.os.family}" />
+        <make dir="${hy.portlib.src.test.native}/hymmap/${hy.os.family}" />
     </target>
 
     <target name="-run-native-tests" if="test.portlib">
@@ -245,6 +248,9 @@
         <exec-native test="hyport" />
         <exec-native test="hystr" />
         <exec-native test="hytime" />
+        <exec-native test="hysysinfo" />
+        <exec-native test="hyipcmutex" />
+        <exec-native test="hymmap" />
 	
         <move todir="${hy.tests.reports}">
             <fileset dir="${hy.portlib}">
@@ -278,6 +284,12 @@
               target="clean" />
         <make dir="${hy.portlib.src.test.native}/hytime/${hy.os.family}" 
               target="clean" />
+        <make dir="${hy.portlib.src.test.native}/hysysinfo/${hy.os.family}" 
+              target="clean" />
+        <make dir="${hy.portlib.src.test.native}/hyipcmutex/${hy.os.family}" 
+              target="clean" />
+        <make dir="${hy.portlib.src.test.native}/hymmap/${hy.os.family}" 
+              target="clean" />
     </target>
 
     <target name="touch-errors-file" if="test.errors">

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/iohelp.c Fri Aug 22 00:15:00 2008
@@ -27,7 +27,7 @@
 ioh_convertToPlatform (char *path)
 {
   char *pathIndex;
-  int length = strlen (path);
+  size_t length = strlen (path);
 
   /* Convert all separators to the same type */
   pathIndex = path;
@@ -49,20 +49,20 @@
     {
       pathIndex++;
     }
-  if ((pathIndex > path) && (length > (pathIndex - path))
+  if ((pathIndex > path) && ((int)length > (pathIndex - path))
       && (*(pathIndex + 1) == ':'))
     {
       /* For Example '////c:/!*' (! added to avoid gcc warning) */
-      int newlen = length - (pathIndex - path);
+      size_t newlen = length - (pathIndex - path);
       memmove (path, pathIndex, newlen);
       path[newlen] = '\0';
     }
   else
     {
-      if ((pathIndex - path > 3) && (length > (pathIndex - path)))
+      if ((pathIndex - path > 3) && ((int)length > (pathIndex - path)))
         {
           /* For Example '////serverName/!*' (! added to avoid gcc warning) */
-          int newlen = length - (pathIndex - path) + 2;
+          size_t newlen = length - (pathIndex - path) + 2;
           memmove (path, pathIndex - 2, newlen);
           path[newlen] = '\0';
         }

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/strhelp.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/strhelp.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/strhelp.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/common/shared/strhelp.c Fri Aug 22 00:15:00 2008
@@ -45,7 +45,7 @@
         char *chunk = va_arg (argp, char *);
         if (chunk)
         {
-            concatenatedSize += strlen (chunk);
+            concatenatedSize += (UDATA)strlen (chunk);
         }
         else
         {
@@ -111,8 +111,8 @@
     /* missing delimiter means the whole line is the key and value is empty */
     size_t keyLength = (delim ? delim : end) - start;
     size_t valueLength = delim ? end - delim - 1 : 0;
-    property->key = hymem_allocate_memory (keyLength + 1);
-    property->value = hymem_allocate_memory (valueLength + 1);
+    property->key = hymem_allocate_memory ((UDATA)(keyLength + 1));
+    property->value = hymem_allocate_memory ((UDATA)(valueLength + 1));
     if (!property->key || !property->value)
     {
         return 0;

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hycomp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hycomp.h?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hycomp.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/include/shared/hycomp.h Fri Aug 22 00:15:00 2008
@@ -219,6 +219,7 @@
 #define PLATFORM_LINE_DELIMITER	"\012"
 #define DIR_SEPARATOR '/'
 #define DIR_SEPARATOR_STR "/"
+#define PATH_SEPARATOR ':'
 #define PATH_SEPARATOR_STR ":"
 #define LIBPATH_ENV_VAR "LIBPATH"
 
@@ -512,4 +513,10 @@
 #define HY_SORT(base, nmemb, size, compare) qsort((base), (nmemb), (size), (compare))
 #endif
 
+/**
+ * Helper macros for storing/restoring pointers to jlong.
+ */
+#define jlong2addr(a, x) ((a *)((IDATA)(x)))
+#define addr2jlong(x) ((jlong)((IDATA)(x)))
+
 #endif /* hycomp_h */

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hynls.c Fri Aug 22 00:15:00 2008
@@ -781,7 +781,7 @@
                                 {
                                   charPointer = dataBuf;
                                   endPointer =
-                                    charPointer + strlen (charPointer);
+                                    charPointer + strlen ((char *)charPointer);
                                 }
                             }
                           if (charPointer >= endPointer)
@@ -869,7 +869,7 @@
                            BUF_SIZE) != NULL)
                         {
                           charPointer = dataBuf;
-                          endPointer = charPointer + strlen (charPointer);
+                          endPointer = charPointer + strlen ((char *)charPointer);
                         }
                     }
                   if (charPointer >= endPointer)

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/shared/hystr.c Fri Aug 22 00:15:00 2008
@@ -1071,7 +1071,7 @@
       currentU16 = value;
       while (numberOfUnicodeChar-- > 0)
         {
-          buf += encodeUTF8Char ((UDATA) * currentU16++, buf);
+          buf += encodeUTF8Char ((UDATA) * currentU16++, (U_8 *)buf);
         }
     }
   bufLen -= numberOfUTF8Char;

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyerrorhelpers.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyerrorhelpers.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyerrorhelpers.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyerrorhelpers.c Fri Aug 22 00:15:00 2008
@@ -37,7 +37,9 @@
 /* Ensure we get the recommended XSI-compliant strerror_r() */
 #define _XOPEN_SOURCE 600
 #undef _GNU_SOURCE
+#ifndef __USE_XOPEN2K
 #define __USE_XOPEN2K
+#endif
 #undef __USE_GNU
 #include <string.h>
 

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyfiletext.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyfiletext.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyfiletext.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyfiletext.c Fri Aug 22 00:15:00 2008
@@ -57,12 +57,12 @@
 #if (defined(HYVM_USE_ICONV))
 static IDATA file_write_using_iconv (struct HyPortLibrary *portLibrary,
                                      IDATA fd, const char *buf, IDATA nbytes);
-#endif /* HYVM_USE_ICONV (autogen) */
+#endif /* HYVM_USE_ICONV */
 
 #if (defined(HYVM_USE_ICONV))
 static char* buf_write_using_iconv (struct HyPortLibrary *portLibrary,
                                      const char *buf, IDATA nbytes);
-#endif /* HYVM_USE_ICONV (autogen) */
+#endif /* HYVM_USE_ICONV */
 
 #if (defined(HYVM_USE_WCTOMB))
 #include "utf8decode.h"
@@ -70,22 +70,22 @@
 
 #if (defined(HYVM_USE_WCTOMB))
 static IDATA walkUTF8String (const U_8 * buf, IDATA nbytes);
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #if (defined(HYVM_USE_WCTOMB))
 static void translateUTF8String (const U_8 * in, U_8 * out, IDATA nbytes);
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #if (defined(HYVM_USE_WCTOMB))
 static IDATA file_write_using_wctomb (struct HyPortLibrary *portLibrary,
                                       IDATA fd, const char *buf,
                                       IDATA nbytes);
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #if (defined(HYVM_USE_WCTOMB))
 static char* buf_write_using_wctomb (struct HyPortLibrary *portLibrary,
                                       const char *buf, IDATA nbytes);
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -268,7 +268,7 @@
     }
   return hasHighChars ? newLength : 0;
 }
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -292,7 +292,7 @@
           int wcresult;
           numberU8Consumed = decodeUTF8Char (cursor, &unicode);
           cursor += numberU8Consumed;
-          wcresult = wctomb (out, (wchar_t) unicode);
+          wcresult = wctomb ((char *) out, (wchar_t) unicode);
           if (wcresult == -1)
             {
               *out++ = '?';
@@ -308,7 +308,7 @@
         }
     }
 }
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -331,7 +331,7 @@
         }
       if (newBuf)
         {
-          translateUTF8String (buf, newBuf, nbytes);
+          translateUTF8String ((const U_8*)buf, (U_8 *)newBuf, nbytes);
           buf = newBuf;
           nbytes = newLength;
         }
@@ -343,7 +343,7 @@
     }
   return (result == nbytes) ? 0 : result;
 }
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -361,7 +361,7 @@
         outBuf = portLibrary->mem_allocate_memory (portLibrary, newLength + 1);
         if (outBuf)
         {
-            translateUTF8String (buf, outBuf, nbytes);
+            translateUTF8String ((const U_8 *)buf, (U_8 *) outBuf, nbytes);
             nbytes = newLength;
             outBuf[nbytes] = '\0';
         } else
@@ -377,7 +377,7 @@
     outBuf[nbytes] = '\0';
     return outBuf;
 }
-#endif /* HYVM_USE_WCTOMB (autogen) */
+#endif /* HYVM_USE_WCTOMB */
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -458,7 +458,7 @@
     }
   return (result == nbytes) ? 0 : result;
 }
-#endif /* HYVM_USE_ICONV (autogen) */
+#endif /* HYVM_USE_ICONV */
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -527,7 +527,7 @@
     portLibrary->mem_free_memory (portLibrary, bufStart);
     return outbuf;
 }
-#endif /* HYVM_USE_ICONV (autogen) */
+#endif /* HYVM_USE_ICONV */
 
 #undef CDEV_CURRENT_FUNCTION
 

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hyshmem.c Fri Aug 22 00:15:00 2008
@@ -125,7 +125,7 @@
 {
   /*TODO: Do we need the length to be longer? */
   char controlFile[HYSH_MAXPATH];
-  IDATA retryCount, exist, rc;
+  IDATA retryCount, exist;
   key_t fkey;
   void *region;
   int retry = RETRY_COUNT;

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysl.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysl.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysl.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysl.c Fri Aug 22 00:15:00 2008
@@ -61,12 +61,12 @@
 #if (defined(HYVM_USE_MBTOWC))
 static void convertWithMBTOWC (struct HyPortLibrary *portLibrary, char *error,
                                char *errBuf, UDATA bufLen);
-#endif /* HYVM_USE_MBTOWC (autogen) */
+#endif /* HYVM_USE_MBTOWC */
 
 #if (defined(HYVM_USE_ICONV))
 static void convertWithIConv (struct HyPortLibrary *portLibrary, char *error,
                               char *errBuf, UDATA bufLen);
-#endif /* HYVM_USE_ICONV (autogen) */
+#endif /* HYVM_USE_ICONV */
 
 static void getDLError (struct HyPortLibrary *portLibrary, char *errBuf,
                         UDATA bufLen);
@@ -284,7 +284,7 @@
   *outbuf = '\0';
   iconv_close (converter);
 }
-#endif /* HYVM_USE_ICONV (autogen) */
+#endif /* HYVM_USE_ICONV */
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -345,7 +345,7 @@
     }
   *out = '\0';
 }
-#endif /* HYVM_USE_MBTOWC (autogen) */
+#endif /* HYVM_USE_MBTOWC */
 
 #undef CDEV_CURRENT_FUNCTION
 

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysock.c Fri Aug 22 00:15:00 2008
@@ -3900,7 +3900,6 @@
   I_32 err = 0;
 
 #if (defined(HAS_RTNETLINK))
-  struct rtattr *rta;
   U_32 sendLength = 0;
   struct linkReq_struct linkRequest;
   struct addrReq_struct addrRequest;
@@ -3954,7 +3953,7 @@
   /* send the request  and count the number of interfaces */
   if (sendLength != linkRequest.netlinkHeader.nlmsg_len)
     {
-      I_32 err = errno;
+      err = errno;
       close (netlinkSocketHandle);
       hysock_cleanupNetlinkContext(portLibrary, &netlinkContext);
       
@@ -5207,7 +5206,7 @@
                 {
                   /* ok we have more work to do to figure it out */
                   if (getsockopt (SOCKET_CAST(sock), SOL_SOCKET, SO_ERROR,
-                                  (char *) &errorVal, &errorValLen) >= 0) {
+                                  (char *) &errorVal, (unsigned int *)&errorValLen) >= 0) {
                       return errorVal ? findError(errorVal):0; 
                   } else {
                       rc = errno;
@@ -5221,7 +5220,7 @@
           /* if the descriptor is in the exception set then the connect failed */
           if (my_pollfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
               if (getsockopt(SOCKET_CAST(sock), SOL_SOCKET, SO_ERROR,
-                             (char *) &errorVal, &errorValLen) >= 0) {
+                             (char *) &errorVal, (unsigned int *)&errorValLen) >= 0) {
                   return errorVal ? findError(errorVal):0; 
               }
               rc = errno;

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysysinfo.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysysinfo.c?rev=687988&r1=687987&r2=687988&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysysinfo.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/port/unix/hysysinfo.c Fri Aug 22 00:15:00 2008
@@ -50,13 +50,17 @@
 #include "hyportpg.h"
 
 #define CDEV_CURRENT_FUNCTION _prototypes_private
+#if !defined(FREEBSD)
+static IDATA readSymbolicLink (struct HyPortLibrary *portLibrary,
+                               char *linkFilename, char **result);
+#if !defined(LINUX)
 static BOOLEAN isSymbolicLink (struct HyPortLibrary *portLibrary,
                                char *filename);
 static IDATA cwdname (struct HyPortLibrary *portLibrary, char **result);
-static IDATA readSymbolicLink (struct HyPortLibrary *portLibrary,
-                               char *linkFilename, char **result);
 static IDATA searchSystemPath (struct HyPortLibrary *portLibrary,
                                char *filename, char **result);
+#endif
+#endif
 
 #undef CDEV_CURRENT_FUNCTION
 
@@ -456,6 +460,48 @@
 
 #undef CDEV_CURRENT_FUNCTION
 
+#if !defined(FREEBSD)
+#define CDEV_CURRENT_FUNCTION readSymbolicLink
+/**
+ * @internal  Attempts to read the contents of a symbolic link.  (The contents are the relative pathname of
+ * the thing linked to).  A buffer large enough to hold the result (and the terminating NUL) is
+ * allocated with portLibrary->mem_allocate_memory.  The caller should free this buffer with
+ * portLibrary->mem_free_memory when it is no longer needed.
+ * On success, returns 0.  On error, returns -1.
+ */
+static IDATA
+readSymbolicLink (struct HyPortLibrary *portLibrary, char *linkFilename,
+                  char **result)
+{
+  /* TODO: remove this ifdef and find out what other builds break (if any) */
+#if defined(LINUX)
+  char fixedBuffer[PATH_MAX + 1];
+  int size = readlink (linkFilename, fixedBuffer, sizeof (fixedBuffer) - 1);
+#if defined(DEBUG)
+  portLibrary->tty_printf (portLibrary, "readSymbolicLink: \"%s\"\n%i\n",
+                           linkFilename, size);
+#endif
+  if (size <= 0)
+    {
+      return -1;
+    }
+  fixedBuffer[size++] = '\0';
+  *result = (portLibrary->mem_allocate_memory) (portLibrary, size);
+  if (!*result)
+    {
+      return -1;
+    }
+  strcpy (*result, fixedBuffer);
+  return 0;
+#else
+  return -1;
+#endif
+
+}
+
+#undef CDEV_CURRENT_FUNCTION
+
+#if !defined(LINUX)
 #define CDEV_CURRENT_FUNCTION cwdname
 /**
  * @internal  Returns the current working directory.  
@@ -527,46 +573,6 @@
 
 #undef CDEV_CURRENT_FUNCTION
 
-#define CDEV_CURRENT_FUNCTION readSymbolicLink
-/**
- * @internal  Attempts to read the contents of a symbolic link.  (The contents are the relative pathname of
- * the thing linked to).  A buffer large enough to hold the result (and the terminating NUL) is
- * allocated with portLibrary->mem_allocate_memory.  The caller should free this buffer with
- * portLibrary->mem_free_memory when it is no longer needed.
- * On success, returns 0.  On error, returns -1.
- */
-static IDATA
-readSymbolicLink (struct HyPortLibrary *portLibrary, char *linkFilename,
-                  char **result)
-{
-  /* TODO: remove this ifdef and find out what other builds break (if any) */
-#if defined(LINUX)
-  char fixedBuffer[PATH_MAX + 1];
-  int size = readlink (linkFilename, fixedBuffer, sizeof (fixedBuffer) - 1);
-#if defined(DEBUG)
-  portLibrary->tty_printf (portLibrary, "readSymbolicLink: \"%s\"\n%i\n",
-                           linkFilename, size);
-#endif
-  if (size <= 0)
-    {
-      return -1;
-    }
-  fixedBuffer[size++] = '\0';
-  *result = (portLibrary->mem_allocate_memory) (portLibrary, size);
-  if (!*result)
-    {
-      return -1;
-    }
-  strcpy (*result, fixedBuffer);
-  return 0;
-#else
-  return -1;
-#endif
-
-}
-
-#undef CDEV_CURRENT_FUNCTION
-
 #define CDEV_CURRENT_FUNCTION searchSystemPath
 /**
  * @internal  Searches through the system PATH for the named file.  If found, it returns the path entry
@@ -655,6 +661,8 @@
 }
 
 #undef CDEV_CURRENT_FUNCTION
+#endif
+#endif
 
 #define CDEV_CURRENT_FUNCTION hysysinfo_get_number_CPUs
 /**



Mime
View raw message