You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sj...@apache.org on 2008/06/03 12:09:44 UTC
svn commit: r662729 [2/2] - in
/harmony/enhanced/classlib/trunk/modules/pack200/src:
main/java/org/apache/harmony/pack200/ main/java/org/apache/harmony/unpack200/
main/java/org/apache/harmony/unpack200/bytecode/
main/java/org/apache/harmony/unpack200/b...
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java Tue Jun 3 03:09:41 2008
@@ -43,7 +43,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
@@ -56,7 +56,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
@@ -86,7 +86,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java Tue Jun 3 03:09:41 2008
@@ -37,7 +37,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
@@ -56,7 +56,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
@@ -65,7 +65,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java Tue Jun 3 03:09:41 2008
@@ -52,7 +52,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#isSourceFileAttribute()
*/
public boolean isSourceFileAttribute() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java Tue Jun 3 03:09:41 2008
@@ -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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java Tue Jun 3 03:09:41 2008
@@ -24,7 +24,7 @@
import org.apache.harmony.pack200.BHSDCodec;
import org.apache.harmony.pack200.CodecEncoding;
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
/**
* Tests for BHSDCodec
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java Tue Jun 3 03:09:41 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;
/**
*
Copied: harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/HelloWorld.java (from r651194, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/HelloWorld.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/HelloWorld.java?p2=harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/HelloWorld.java&p1=harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/HelloWorld.java&r1=651194&r2=662729&rev=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/HelloWorld.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/HelloWorld.java Tue Jun 3 03:09:41 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.tests;
+package org.apache.harmony.pack200.tests;
/**
* This is intended to be used as a test class for unpacking a packed Jar file.
Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java Tue Jun 3 03:09:41 2008
@@ -19,8 +19,8 @@
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;
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java Tue Jun 3 03:09:41 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;
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java Tue Jun 3 03:09:41 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;
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java Tue Jun 3 03:09:41 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/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java Tue Jun 3 03:09:41 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;
/**