You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/08/30 22:55:13 UTC
[commons-compress] branch pack200 updated: Renamed the package org.apache.harmony to org.apache.commons.compress.harmony to more easily track potential future changes.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch pack200
in repository https://gitbox.apache.org/repos/asf/commons-compress.git
The following commit(s) were added to refs/heads/pack200 by this push:
new e3ea7b6 Renamed the package org.apache.harmony to org.apache.commons.compress.harmony to more easily track potential future changes.
e3ea7b6 is described below
commit e3ea7b6607e7c96b9e2b6813c05bfba887c8e226
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Aug 30 18:55:04 2020 -0400
Renamed the package org.apache.harmony
to org.apache.commons.compress.harmony to more easily track
potential future changes.
---
.../harmony/archive/internal/nls/Messages.java | 8 ++---
.../compress}/harmony/pack200/Archive.java | 2 +-
.../harmony/pack200/AttributeDefinitionBands.java | 2 +-
.../compress}/harmony/pack200/BHSDCodec.java | 2 +-
.../compress}/harmony/pack200/BandSet.java | 2 +-
.../compress}/harmony/pack200/BcBands.java | 2 +-
.../compress}/harmony/pack200/CPClass.java | 2 +-
.../compress}/harmony/pack200/CPConstant.java | 2 +-
.../compress}/harmony/pack200/CPDouble.java | 2 +-
.../compress}/harmony/pack200/CPFloat.java | 2 +-
.../compress}/harmony/pack200/CPInt.java | 2 +-
.../compress}/harmony/pack200/CPLong.java | 2 +-
.../compress}/harmony/pack200/CPMethodOrField.java | 2 +-
.../compress}/harmony/pack200/CPNameAndType.java | 2 +-
.../compress}/harmony/pack200/CPSignature.java | 2 +-
.../compress}/harmony/pack200/CPString.java | 2 +-
.../compress}/harmony/pack200/CPUTF8.java | 2 +-
.../harmony/pack200/CanonicalCodecFamilies.java | 2 +-
.../compress}/harmony/pack200/ClassBands.java | 6 ++--
.../compress}/harmony/pack200/Codec.java | 2 +-
.../compress}/harmony/pack200/CodecEncoding.java | 2 +-
.../harmony/pack200/ConstantPoolEntry.java | 2 +-
.../compress}/harmony/pack200/CpBands.java | 2 +-
.../compress}/harmony/pack200/FileBands.java | 6 ++--
.../compress}/harmony/pack200/IcBands.java | 2 +-
.../compress}/harmony/pack200/IntList.java | 2 +-
.../harmony/pack200/MetadataBandGroup.java | 4 +--
.../compress}/harmony/pack200/NewAttribute.java | 2 +-
.../harmony/pack200/NewAttributeBands.java | 4 +--
.../compress}/harmony/pack200/Pack200Adapter.java | 2 +-
.../harmony/pack200/Pack200ClassReader.java | 2 +-
.../harmony/pack200/Pack200Exception.java | 2 +-
.../harmony/pack200/Pack200PackerAdapter.java | 6 ++--
.../compress}/harmony/pack200/PackingOptions.java | 2 +-
.../compress}/harmony/pack200/PackingUtils.java | 4 +--
.../compress}/harmony/pack200/PopulationCodec.java | 2 +-
.../compress}/harmony/pack200/RunCodec.java | 2 +-
.../compress}/harmony/pack200/Segment.java | 6 ++--
.../compress}/harmony/pack200/SegmentHeader.java | 2 +-
.../compress}/harmony/unpack200/Archive.java | 4 +--
.../harmony/unpack200/AttrDefinitionBands.java | 32 +++++++++----------
.../harmony/unpack200/AttributeLayout.java | 10 +++---
.../harmony/unpack200/AttributeLayoutMap.java | 4 +--
.../compress}/harmony/unpack200/BandSet.java | 34 ++++++++++----------
.../compress}/harmony/unpack200/BcBands.java | 24 +++++++--------
.../compress}/harmony/unpack200/ClassBands.java | 36 +++++++++++-----------
.../compress}/harmony/unpack200/CpBands.java | 28 ++++++++---------
.../compress}/harmony/unpack200/FileBands.java | 8 ++---
.../compress}/harmony/unpack200/IMatcher.java | 2 +-
.../compress}/harmony/unpack200/IcBands.java | 14 ++++-----
.../compress}/harmony/unpack200/IcTuple.java | 2 +-
.../harmony/unpack200/MetadataBandGroup.java | 26 ++++++++--------
.../harmony/unpack200/NewAttributeBands.java | 36 +++++++++++-----------
.../harmony/unpack200/Pack200UnpackerAdapter.java | 8 ++---
.../compress}/harmony/unpack200/Segment.java | 26 ++++++++--------
.../harmony/unpack200/SegmentConstantPool.java | 8 ++---
.../unpack200/SegmentConstantPoolArrayCache.java | 2 +-
.../compress}/harmony/unpack200/SegmentHeader.java | 8 ++---
.../harmony/unpack200/SegmentOptions.java | 4 +--
.../compress}/harmony/unpack200/SegmentUtils.java | 2 +-
.../bytecode/AnnotationDefaultAttribute.java | 2 +-
.../unpack200/bytecode/AnnotationsAttribute.java | 2 +-
.../harmony/unpack200/bytecode/Attribute.java | 2 +-
.../unpack200/bytecode/BCIRenumberedAttribute.java | 6 ++--
.../harmony/unpack200/bytecode/ByteCode.java | 8 ++---
.../harmony/unpack200/bytecode/CPClass.java | 2 +-
.../harmony/unpack200/bytecode/CPConstant.java | 2 +-
.../unpack200/bytecode/CPConstantNumber.java | 2 +-
.../harmony/unpack200/bytecode/CPDouble.java | 2 +-
.../harmony/unpack200/bytecode/CPField.java | 2 +-
.../harmony/unpack200/bytecode/CPFieldRef.java | 2 +-
.../harmony/unpack200/bytecode/CPFloat.java | 2 +-
.../harmony/unpack200/bytecode/CPInteger.java | 2 +-
.../unpack200/bytecode/CPInterfaceMethodRef.java | 2 +-
.../harmony/unpack200/bytecode/CPLong.java | 2 +-
.../harmony/unpack200/bytecode/CPMember.java | 2 +-
.../harmony/unpack200/bytecode/CPMethod.java | 2 +-
.../harmony/unpack200/bytecode/CPMethodRef.java | 2 +-
.../harmony/unpack200/bytecode/CPNameAndType.java | 4 +--
.../harmony/unpack200/bytecode/CPRef.java | 2 +-
.../harmony/unpack200/bytecode/CPString.java | 2 +-
.../harmony/unpack200/bytecode/CPUTF8.java | 2 +-
.../unpack200/bytecode/ClassConstantPool.java | 4 +--
.../harmony/unpack200/bytecode/ClassFile.java | 2 +-
.../harmony/unpack200/bytecode/ClassFileEntry.java | 2 +-
.../harmony/unpack200/bytecode/CodeAttribute.java | 4 +--
.../unpack200/bytecode/ConstantPoolEntry.java | 2 +-
.../unpack200/bytecode/ConstantValueAttribute.java | 2 +-
.../unpack200/bytecode/DeprecatedAttribute.java | 8 ++---
.../bytecode/EnclosingMethodAttribute.java | 8 ++---
.../unpack200/bytecode/ExceptionTableEntry.java | 2 +-
.../unpack200/bytecode/ExceptionsAttribute.java | 2 +-
.../unpack200/bytecode/InnerClassesAttribute.java | 2 +-
.../bytecode/LineNumberTableAttribute.java | 8 ++---
.../bytecode/LocalVariableTableAttribute.java | 6 ++--
.../bytecode/LocalVariableTypeTableAttribute.java | 6 ++--
.../harmony/unpack200/bytecode/NewAttribute.java | 8 ++---
.../harmony/unpack200/bytecode/OperandManager.java | 6 ++--
...timeVisibleorInvisibleAnnotationsAttribute.java | 2 +-
...leorInvisibleParameterAnnotationsAttribute.java | 2 +-
.../unpack200/bytecode/SignatureAttribute.java | 8 ++---
.../unpack200/bytecode/SourceFileAttribute.java | 4 +--
.../unpack200/bytecode/forms/ByteCodeForm.java | 8 ++---
.../harmony/unpack200/bytecode/forms/ByteForm.java | 12 ++++----
.../unpack200/bytecode/forms/ClassRefForm.java | 12 ++++----
.../bytecode/forms/ClassSpecificReferenceForm.java | 12 ++++----
.../unpack200/bytecode/forms/DoubleForm.java | 6 ++--
.../unpack200/bytecode/forms/FieldRefForm.java | 6 ++--
.../unpack200/bytecode/forms/FloatRefForm.java | 6 ++--
.../unpack200/bytecode/forms/IMethodRefForm.java | 16 +++++-----
.../harmony/unpack200/bytecode/forms/IincForm.java | 12 ++++----
.../bytecode/forms/InitMethodReferenceForm.java | 12 ++++----
.../unpack200/bytecode/forms/IntRefForm.java | 6 ++--
.../unpack200/bytecode/forms/LabelForm.java | 18 +++++------
.../unpack200/bytecode/forms/LocalForm.java | 12 ++++----
.../harmony/unpack200/bytecode/forms/LongForm.java | 6 ++--
.../unpack200/bytecode/forms/LookupSwitchForm.java | 10 +++---
.../unpack200/bytecode/forms/MethodRefForm.java | 6 ++--
.../bytecode/forms/MultiANewArrayForm.java | 12 ++++----
.../bytecode/forms/NarrowClassRefForm.java | 8 ++---
.../unpack200/bytecode/forms/NewClassRefForm.java | 18 +++++------
.../bytecode/forms/NewInitMethodRefForm.java | 12 ++++----
.../unpack200/bytecode/forms/NoArgumentForm.java | 12 ++++----
.../unpack200/bytecode/forms/ReferenceForm.java | 18 +++++------
.../unpack200/bytecode/forms/ShortForm.java | 12 ++++----
.../bytecode/forms/SingleByteReferenceForm.java | 8 ++---
.../unpack200/bytecode/forms/StringRefForm.java | 14 ++++-----
.../bytecode/forms/SuperFieldRefForm.java | 6 ++--
.../bytecode/forms/SuperInitMethodRefForm.java | 4 +--
.../bytecode/forms/SuperMethodRefForm.java | 6 ++--
.../unpack200/bytecode/forms/SwitchForm.java | 10 +++---
.../unpack200/bytecode/forms/TableSwitchForm.java | 10 +++---
.../unpack200/bytecode/forms/ThisFieldRefForm.java | 6 ++--
.../bytecode/forms/ThisInitMethodRefForm.java | 4 +--
.../bytecode/forms/ThisMethodRefForm.java | 6 ++--
.../bytecode/forms/VariableInstructionForm.java | 2 +-
.../harmony/unpack200/bytecode/forms/WideForm.java | 12 ++++----
.../commons/compress/java/util/jar/Pack200.java | 6 ++--
138 files changed, 457 insertions(+), 457 deletions(-)
diff --git a/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java b/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
similarity index 96%
rename from src/main/java/org/apache/harmony/archive/internal/nls/Messages.java
rename to src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
index e80a150..b408ab4 100644
--- a/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java
+++ b/src/main/java/org/apache/commons/compress/harmony/archive/internal/nls/Messages.java
@@ -21,7 +21,7 @@
* if this tool runs again. Better make changes in the template file.
*/
-package org.apache.harmony.archive.internal.nls;
+package org.apache.commons.compress.harmony.archive.internal.nls;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -29,7 +29,7 @@ import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-//import org.apache.harmony.kernel.vm.VM;
+//import org.apache.commons.compress.harmony.kernel.vm.VM;
/**
* This class retrieves strings from a resource bundle and returns them,
@@ -37,7 +37,7 @@ import java.util.ResourceBundle;
* <p>
* It is used by the system classes to provide national language support, by
* looking up messages in the <code>
- * org.apache.harmony.archive.internal.nls.messages
+ * org.apache.commons.compress.harmony.archive.internal.nls.messages
* </code>
* resource bundle. Note that if this file is not available, or an invalid key
* is looked up, or resource bundle support is not available, the key itself
@@ -243,7 +243,7 @@ public class Messages {
// Attempt to load the messages.
try {
bundle = setLocale(Locale.getDefault(),
- "org.apache.harmony.archive.internal.nls.messages"); //$NON-NLS-1$
+ "org.apache.commons.compress.harmony.archive.internal.nls.messages"); //$NON-NLS-1$
} catch (Throwable e) {
e.printStackTrace();
}
diff --git a/src/main/java/org/apache/harmony/pack200/Archive.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/Archive.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
index 9b40ea3..3f52cbe 100644
--- a/src/main/java/org/apache/harmony/pack200/Archive.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Archive.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.BufferedOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/pack200/AttributeDefinitionBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/AttributeDefinitionBands.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/AttributeDefinitionBands.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/AttributeDefinitionBands.java
index 5afb5ba..6882170 100644
--- a/src/main/java/org/apache/harmony/pack200/AttributeDefinitionBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/AttributeDefinitionBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/BHSDCodec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/BHSDCodec.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
index 8836098..5c9c83a 100644
--- a/src/main/java/org/apache/harmony/pack200/BHSDCodec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BHSDCodec.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.EOFException;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/pack200/BandSet.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/BandSet.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
index c4f573a..b6c969b 100644
--- a/src/main/java/org/apache/harmony/pack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BandSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/BcBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/BcBands.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/BcBands.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/BcBands.java
index 92c65fe..2ac3c61 100644
--- a/src/main/java/org/apache/harmony/pack200/BcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/BcBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/CPClass.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPClass.java
similarity index 97%
rename from src/main/java/org/apache/harmony/pack200/CPClass.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPClass.java
index 1639613..b6d4282 100644
--- a/src/main/java/org/apache/harmony/pack200/CPClass.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPClass.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a class
diff --git a/src/main/java/org/apache/harmony/pack200/CPConstant.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPConstant.java
similarity index 94%
rename from src/main/java/org/apache/harmony/pack200/CPConstant.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPConstant.java
index ffd3229..4409945 100644
--- a/src/main/java/org/apache/harmony/pack200/CPConstant.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPConstant.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Abstract superclass for constant pool constant entries such as numbers or
diff --git a/src/main/java/org/apache/harmony/pack200/CPDouble.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPDouble.java
similarity index 95%
rename from src/main/java/org/apache/harmony/pack200/CPDouble.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPDouble.java
index 210f774..bd4279c 100644
--- a/src/main/java/org/apache/harmony/pack200/CPDouble.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPDouble.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a double.
diff --git a/src/main/java/org/apache/harmony/pack200/CPFloat.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPFloat.java
similarity index 95%
rename from src/main/java/org/apache/harmony/pack200/CPFloat.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPFloat.java
index 6cb649d..e6cdf23 100644
--- a/src/main/java/org/apache/harmony/pack200/CPFloat.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPFloat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a float.
diff --git a/src/main/java/org/apache/harmony/pack200/CPInt.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
similarity index 96%
rename from src/main/java/org/apache/harmony/pack200/CPInt.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
index abcfe30..dfc1563 100644
--- a/src/main/java/org/apache/harmony/pack200/CPInt.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for an int.
diff --git a/src/main/java/org/apache/harmony/pack200/CPLong.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
similarity index 96%
rename from src/main/java/org/apache/harmony/pack200/CPLong.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
index 2f2d7b4..6074b2b 100644
--- a/src/main/java/org/apache/harmony/pack200/CPLong.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a long.
diff --git a/src/main/java/org/apache/harmony/pack200/CPMethodOrField.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPMethodOrField.java
similarity index 97%
rename from src/main/java/org/apache/harmony/pack200/CPMethodOrField.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPMethodOrField.java
index 7c1c937..8a8a676 100644
--- a/src/main/java/org/apache/harmony/pack200/CPMethodOrField.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPMethodOrField.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a method or field.
diff --git a/src/main/java/org/apache/harmony/pack200/CPNameAndType.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPNameAndType.java
similarity index 97%
rename from src/main/java/org/apache/harmony/pack200/CPNameAndType.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPNameAndType.java
index 52c3985..95a281b 100644
--- a/src/main/java/org/apache/harmony/pack200/CPNameAndType.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPNameAndType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a name and type pair.
diff --git a/src/main/java/org/apache/harmony/pack200/CPSignature.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPSignature.java
similarity index 98%
rename from src/main/java/org/apache/harmony/pack200/CPSignature.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPSignature.java
index d5e423c..83d806b 100644
--- a/src/main/java/org/apache/harmony/pack200/CPSignature.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPSignature.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.util.List;
diff --git a/src/main/java/org/apache/harmony/pack200/CPString.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPString.java
similarity index 96%
rename from src/main/java/org/apache/harmony/pack200/CPString.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPString.java
index b8acca6..4b24767 100644
--- a/src/main/java/org/apache/harmony/pack200/CPString.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPString.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a String.
diff --git a/src/main/java/org/apache/harmony/pack200/CPUTF8.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CPUTF8.java
similarity index 96%
rename from src/main/java/org/apache/harmony/pack200/CPUTF8.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CPUTF8.java
index 00a1526..d2de3a3 100644
--- a/src/main/java/org/apache/harmony/pack200/CPUTF8.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPUTF8.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Constant pool entry for a UTF8 entry, used for storing long Strings.
diff --git a/src/main/java/org/apache/harmony/pack200/CanonicalCodecFamilies.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CanonicalCodecFamilies.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/CanonicalCodecFamilies.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CanonicalCodecFamilies.java
index 174f533..dbdf123 100644
--- a/src/main/java/org/apache/harmony/pack200/CanonicalCodecFamilies.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CanonicalCodecFamilies.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Sets of codecs that share characteristics. Mainly used for different effort
diff --git a/src/main/java/org/apache/harmony/pack200/ClassBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/ClassBands.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
index 094a90f..b852b90 100644
--- a/src/main/java/org/apache/harmony/pack200/ClassBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/ClassBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.harmony.pack200.AttributeDefinitionBands.AttributeDefinition;
-import org.apache.harmony.pack200.IcBands.IcTuple;
+import org.apache.commons.compress.harmony.pack200.AttributeDefinitionBands.AttributeDefinition;
+import org.apache.commons.compress.harmony.pack200.IcBands.IcTuple;
import org.objectweb.asm.Label;
import org.objectweb.asm.Opcodes;
diff --git a/src/main/java/org/apache/harmony/pack200/Codec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/Codec.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
index 83b80e0..ae3f9d6 100644
--- a/src/main/java/org/apache/harmony/pack200/Codec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Codec.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/CodecEncoding.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CodecEncoding.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/CodecEncoding.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CodecEncoding.java
index c7df8a4..41a10db 100644
--- a/src/main/java/org/apache/harmony/pack200/CodecEncoding.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CodecEncoding.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.EOFException;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/pack200/ConstantPoolEntry.java b/src/main/java/org/apache/commons/compress/harmony/pack200/ConstantPoolEntry.java
similarity index 95%
rename from src/main/java/org/apache/harmony/pack200/ConstantPoolEntry.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/ConstantPoolEntry.java
index d2fd1b3..4a92275 100644
--- a/src/main/java/org/apache/harmony/pack200/ConstantPoolEntry.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/ConstantPoolEntry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Abstract superclass for constant pool entries
diff --git a/src/main/java/org/apache/harmony/pack200/CpBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/CpBands.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
index aad5037..f4061cd 100644
--- a/src/main/java/org/apache/harmony/pack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CpBands.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/FileBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/FileBands.java
similarity index 97%
rename from src/main/java/org/apache/harmony/pack200/FileBands.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/FileBands.java
index be9cc00..f7eaead 100644
--- a/src/main/java/org/apache/harmony/pack200/FileBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/FileBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Set;
import java.util.TimeZone;
-import org.apache.harmony.pack200.Archive.PackingFile;
-import org.apache.harmony.pack200.Archive.SegmentUnit;
+import org.apache.commons.compress.harmony.pack200.Archive.PackingFile;
+import org.apache.commons.compress.harmony.pack200.Archive.SegmentUnit;
import org.objectweb.asm.ClassReader;
/**
diff --git a/src/main/java/org/apache/harmony/pack200/IcBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/IcBands.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
index 8eac217..0ebe9fa 100644
--- a/src/main/java/org/apache/harmony/pack200/IcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/IntList.java b/src/main/java/org/apache/commons/compress/harmony/pack200/IntList.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/IntList.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/IntList.java
index efa8e1c..fe8f86c 100644
--- a/src/main/java/org/apache/harmony/pack200/IntList.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/IntList.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.util.Arrays;
diff --git a/src/main/java/org/apache/harmony/pack200/MetadataBandGroup.java b/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/MetadataBandGroup.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
index 1719396..ee24d59 100644
--- a/src/main/java/org/apache/harmony/pack200/MetadataBandGroup.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/MetadataBandGroup.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
@@ -80,7 +80,7 @@ public class MetadataBandGroup extends BandSet {
}
/* (non-Javadoc)
- * @see org.apache.harmony.pack200.BandSet#pack(java.io.OutputStream)
+ * @see org.apache.commons.compress.harmony.pack200.BandSet#pack(java.io.OutputStream)
*/
public void pack(OutputStream out) throws IOException, Pack200Exception {
PackingUtils.log("Writing metadata band group...");
diff --git a/src/main/java/org/apache/harmony/pack200/NewAttribute.java b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttribute.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/NewAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/NewAttribute.java
index 54b867b..86b6b8e 100644
--- a/src/main/java/org/apache/harmony/pack200/NewAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassReader;
diff --git a/src/main/java/org/apache/harmony/pack200/NewAttributeBands.java b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/NewAttributeBands.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
index fcbd1b7..139b290 100644
--- a/src/main/java/org/apache/harmony/pack200/NewAttributeBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -27,7 +27,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.harmony.pack200.AttributeDefinitionBands.AttributeDefinition;
+import org.apache.commons.compress.harmony.pack200.AttributeDefinitionBands.AttributeDefinition;
import org.objectweb.asm.Label;
/**
diff --git a/src/main/java/org/apache/harmony/pack200/Pack200Adapter.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200Adapter.java
similarity index 97%
rename from src/main/java/org/apache/harmony/pack200/Pack200Adapter.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/Pack200Adapter.java
index e2b284c..8fc7784 100644
--- a/src/main/java/org/apache/harmony/pack200/Pack200Adapter.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200Adapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
diff --git a/src/main/java/org/apache/harmony/pack200/Pack200ClassReader.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
similarity index 97%
rename from src/main/java/org/apache/harmony/pack200/Pack200ClassReader.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
index 29c024f..d9e288e 100644
--- a/src/main/java/org/apache/harmony/pack200/Pack200ClassReader.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200ClassReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import org.objectweb.asm.ClassReader;
diff --git a/src/main/java/org/apache/harmony/pack200/Pack200Exception.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200Exception.java
similarity index 95%
rename from src/main/java/org/apache/harmony/pack200/Pack200Exception.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/Pack200Exception.java
index cb4d5e2..4af7ee5 100644
--- a/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200Exception.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
/**
* Represents a problem with a Pack200 coding/decoding issue.
diff --git a/src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200PackerAdapter.java
similarity index 95%
rename from src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/Pack200PackerAdapter.java
index bc63a3d..b82aff0 100644
--- a/src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Pack200PackerAdapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
@@ -39,7 +39,7 @@ public class Pack200PackerAdapter extends Pack200Adapter implements Packer {
"Must specify both input and output streams");
completed(0);
try {
- new org.apache.harmony.pack200.Archive(file, out, options).pack();
+ new org.apache.commons.compress.harmony.pack200.Archive(file, out, options).pack();
} catch (Pack200Exception e) {
throw new IOException("Failed to pack Jar:" + String.valueOf(e));
}
@@ -54,7 +54,7 @@ public class Pack200PackerAdapter extends Pack200Adapter implements Packer {
PackingOptions options = new PackingOptions();
try {
- new org.apache.harmony.pack200.Archive(in, out, options).pack();
+ new org.apache.commons.compress.harmony.pack200.Archive(in, out, options).pack();
} catch (Pack200Exception e) {
throw new IOException("Failed to pack Jar:" + String.valueOf(e));
}
diff --git a/src/main/java/org/apache/harmony/pack200/PackingOptions.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/PackingOptions.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java
index 943ca2f..bfee2e1 100644
--- a/src/main/java/org/apache/harmony/pack200/PackingOptions.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/main/java/org/apache/harmony/pack200/PackingUtils.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
similarity index 98%
rename from src/main/java/org/apache/harmony/pack200/PackingUtils.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
index 689aec4..74b7cff 100644
--- a/src/main/java/org/apache/harmony/pack200/PackingUtils.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
@@ -39,7 +39,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import java.util.logging.SimpleFormatter;
-import org.apache.harmony.pack200.Archive.PackingFile;
+import org.apache.commons.compress.harmony.pack200.Archive.PackingFile;
public class PackingUtils {
diff --git a/src/main/java/org/apache/harmony/pack200/PopulationCodec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/PopulationCodec.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
index 2ed6456..ea21bd0 100644
--- a/src/main/java/org/apache/harmony/pack200/PopulationCodec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PopulationCodec.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/RunCodec.java b/src/main/java/org/apache/commons/compress/harmony/pack200/RunCodec.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/RunCodec.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/RunCodec.java
index 4842809..6df25a2 100644
--- a/src/main/java/org/apache/harmony/pack200/RunCodec.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/RunCodec.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/org/apache/harmony/pack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/Segment.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
index bf96a5d..cd60ba7 100644
--- a/src/main/java/org/apache/harmony/pack200/Segment.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/Segment.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.harmony.pack200.Archive.PackingFile;
-import org.apache.harmony.pack200.Archive.SegmentUnit;
+import org.apache.commons.compress.harmony.pack200.Archive.PackingFile;
+import org.apache.commons.compress.harmony.pack200.Archive.SegmentUnit;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassReader;
diff --git a/src/main/java/org/apache/harmony/pack200/SegmentHeader.java b/src/main/java/org/apache/commons/compress/harmony/pack200/SegmentHeader.java
similarity index 99%
rename from src/main/java/org/apache/harmony/pack200/SegmentHeader.java
rename to src/main/java/org/apache/commons/compress/harmony/pack200/SegmentHeader.java
index 53b158b..80b0749 100644
--- a/src/main/java/org/apache/harmony/pack200/SegmentHeader.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/SegmentHeader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.pack200;
+package org.apache.commons.compress.harmony.pack200;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/src/main/java/org/apache/harmony/unpack200/Archive.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/Archive.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/Archive.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/Archive.java
index 2cb5919..f27a0d3 100644
--- a/src/main/java/org/apache/harmony/unpack200/Archive.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Archive.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -30,7 +30,7 @@ import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
import java.util.zip.GZIPInputStream;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* Archive is the main entry point to unpack200. An archive is constructed with
diff --git a/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttrDefinitionBands.java
similarity index 79%
rename from src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/AttrDefinitionBands.java
index 709cd24..23177bc 100644
--- a/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttrDefinitionBands.java
@@ -14,25 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.AnnotationDefaultAttribute;
-import org.apache.harmony.unpack200.bytecode.CodeAttribute;
-import org.apache.harmony.unpack200.bytecode.ConstantValueAttribute;
-import org.apache.harmony.unpack200.bytecode.DeprecatedAttribute;
-import org.apache.harmony.unpack200.bytecode.EnclosingMethodAttribute;
-import org.apache.harmony.unpack200.bytecode.ExceptionsAttribute;
-import org.apache.harmony.unpack200.bytecode.InnerClassesAttribute;
-import org.apache.harmony.unpack200.bytecode.LineNumberTableAttribute;
-import org.apache.harmony.unpack200.bytecode.LocalVariableTableAttribute;
-import org.apache.harmony.unpack200.bytecode.LocalVariableTypeTableAttribute;
-import org.apache.harmony.unpack200.bytecode.SignatureAttribute;
-import org.apache.harmony.unpack200.bytecode.SourceFileAttribute;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.AnnotationDefaultAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ConstantValueAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.DeprecatedAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.EnclosingMethodAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ExceptionsAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.InnerClassesAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.LineNumberTableAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.LocalVariableTableAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.LocalVariableTypeTableAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.SignatureAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.SourceFileAttribute;
/**
* Attribute definition bands are the set of bands used to define extra
@@ -58,7 +58,7 @@ public class AttrDefinitionBands extends BandSet {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void read(InputStream in) throws IOException, Pack200Exception {
int attributeDefinitionCount = header.getAttributeDefinitionCount();
diff --git a/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/AttributeLayout.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
index e6575b9..cee1b26 100644
--- a/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
/**
* AttributeLayout defines a layout that describes how an attribute will be
@@ -204,7 +204,7 @@ public class AttributeLayout implements IMatcher {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.IMatches#matches(long)
+ * @see org.apache.commons.compress.harmony.unpack200.IMatches#matches(long)
*/
public boolean matches(long value) {
return (value & mask) != 0;
diff --git a/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutMap.java
similarity index 99%
rename from src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutMap.java
index bc8c839..4166dd9 100644
--- a/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutMap.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* Stores a mapping from attribute names to their corresponding layout types.
diff --git a/src/main/java/org/apache/harmony/unpack200/BandSet.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
similarity index 94%
rename from src/main/java/org/apache/harmony/unpack200/BandSet.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
index 1037100..224864d 100644
--- a/src/main/java/org/apache/harmony/unpack200/BandSet.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BandSet.java
@@ -14,28 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
-import org.apache.harmony.pack200.BHSDCodec;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.CodecEncoding;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.pack200.PopulationCodec;
-import org.apache.harmony.unpack200.bytecode.CPClass;
-import org.apache.harmony.unpack200.bytecode.CPDouble;
-import org.apache.harmony.unpack200.bytecode.CPFieldRef;
-import org.apache.harmony.unpack200.bytecode.CPFloat;
-import org.apache.harmony.unpack200.bytecode.CPInteger;
-import org.apache.harmony.unpack200.bytecode.CPInterfaceMethodRef;
-import org.apache.harmony.unpack200.bytecode.CPLong;
-import org.apache.harmony.unpack200.bytecode.CPMethodRef;
-import org.apache.harmony.unpack200.bytecode.CPNameAndType;
-import org.apache.harmony.unpack200.bytecode.CPString;
-import org.apache.harmony.unpack200.bytecode.CPUTF8;
+import org.apache.commons.compress.harmony.pack200.BHSDCodec;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.CodecEncoding;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.PopulationCodec;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPDouble;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPFieldRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPFloat;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInteger;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInterfaceMethodRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPLong;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPMethodRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPNameAndType;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPString;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
/**
* Abstract superclass for a set of bands
diff --git a/src/main/java/org/apache/harmony/unpack200/BcBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/BcBands.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
index 40eb61e..dc97eea 100644
--- a/src/main/java/org/apache/harmony/unpack200/BcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/BcBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,16 +23,16 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.Attribute;
-import org.apache.harmony.unpack200.bytecode.BCIRenumberedAttribute;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.CPClass;
-import org.apache.harmony.unpack200.bytecode.CodeAttribute;
-import org.apache.harmony.unpack200.bytecode.ExceptionTableEntry;
-import org.apache.harmony.unpack200.bytecode.NewAttribute;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.Attribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.BCIRenumberedAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ExceptionTableEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.NewAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* Bytecode bands
@@ -82,7 +82,7 @@ public class BcBands extends BandSet {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void read(InputStream in) throws IOException, Pack200Exception {
diff --git a/src/main/java/org/apache/harmony/unpack200/ClassBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/ClassBands.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
index 41e7aec..fcc16e4 100644
--- a/src/main/java/org/apache/harmony/unpack200/ClassBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/ClassBands.java
@@ -14,29 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.Attribute;
-import org.apache.harmony.unpack200.bytecode.CPClass;
-import org.apache.harmony.unpack200.bytecode.CPNameAndType;
-import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
-import org.apache.harmony.unpack200.bytecode.ConstantValueAttribute;
-import org.apache.harmony.unpack200.bytecode.DeprecatedAttribute;
-import org.apache.harmony.unpack200.bytecode.EnclosingMethodAttribute;
-import org.apache.harmony.unpack200.bytecode.ExceptionsAttribute;
-import org.apache.harmony.unpack200.bytecode.LineNumberTableAttribute;
-import org.apache.harmony.unpack200.bytecode.LocalVariableTableAttribute;
-import org.apache.harmony.unpack200.bytecode.LocalVariableTypeTableAttribute;
-import org.apache.harmony.unpack200.bytecode.SignatureAttribute;
-import org.apache.harmony.unpack200.bytecode.SourceFileAttribute;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.Attribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPNameAndType;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ConstantValueAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.DeprecatedAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.EnclosingMethodAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ExceptionsAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.LineNumberTableAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.LocalVariableTableAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.LocalVariableTypeTableAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.SignatureAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.SourceFileAttribute;
/**
* Class Bands
@@ -132,7 +132,7 @@ public class ClassBands extends BandSet {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void read(InputStream in) throws IOException, Pack200Exception {
int classCount = header.getClassCount();
diff --git a/src/main/java/org/apache/harmony/unpack200/CpBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/CpBands.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
index 942c779..61547c1 100644
--- a/src/main/java/org/apache/harmony/unpack200/CpBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/CpBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.IOException;
import java.io.InputStream;
@@ -22,19 +22,19 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.CPClass;
-import org.apache.harmony.unpack200.bytecode.CPDouble;
-import org.apache.harmony.unpack200.bytecode.CPFieldRef;
-import org.apache.harmony.unpack200.bytecode.CPFloat;
-import org.apache.harmony.unpack200.bytecode.CPInteger;
-import org.apache.harmony.unpack200.bytecode.CPInterfaceMethodRef;
-import org.apache.harmony.unpack200.bytecode.CPLong;
-import org.apache.harmony.unpack200.bytecode.CPMethodRef;
-import org.apache.harmony.unpack200.bytecode.CPNameAndType;
-import org.apache.harmony.unpack200.bytecode.CPString;
-import org.apache.harmony.unpack200.bytecode.CPUTF8;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPDouble;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPFieldRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPFloat;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInteger;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInterfaceMethodRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPLong;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPMethodRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPNameAndType;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPString;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
/**
* Constant Pool bands
diff --git a/src/main/java/org/apache/harmony/unpack200/FileBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/FileBands.java
similarity index 93%
rename from src/main/java/org/apache/harmony/unpack200/FileBands.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/FileBands.java
index ab42efd..5862834 100644
--- a/src/main/java/org/apache/harmony/unpack200/FileBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/FileBands.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* Parses the file band headers (not including the actual bits themselves). At
@@ -56,7 +56,7 @@ public class FileBands extends BandSet {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void read(InputStream in) throws IOException, Pack200Exception {
int numberOfFiles = header.getNumberOfFiles();
diff --git a/src/main/java/org/apache/harmony/unpack200/IMatcher.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/IMatcher.java
similarity index 94%
rename from src/main/java/org/apache/harmony/unpack200/IMatcher.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/IMatcher.java
index 0d35735..279a104 100644
--- a/src/main/java/org/apache/harmony/unpack200/IMatcher.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/IMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
/**
* Interface for a class that can perform matching on flag values.
diff --git a/src/main/java/org/apache/harmony/unpack200/IcBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java
similarity index 94%
rename from src/main/java/org/apache/harmony/unpack200/IcBands.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java
index 6a5008b..bf0d16f 100644
--- a/src/main/java/org/apache/harmony/unpack200/IcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.IOException;
import java.io.InputStream;
@@ -27,11 +27,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.CPClass;
-import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
-import org.apache.harmony.unpack200.bytecode.ConstantPoolEntry;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ConstantPoolEntry;
/**
* Inner Class Bands
@@ -59,7 +59,7 @@ public class IcBands extends BandSet {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void read(InputStream in) throws IOException, Pack200Exception {
// Read IC bands
diff --git a/src/main/java/org/apache/harmony/unpack200/IcTuple.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
similarity index 99%
rename from src/main/java/org/apache/harmony/unpack200/IcTuple.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
index 549b971..fea414a 100644
--- a/src/main/java/org/apache/harmony/unpack200/IcTuple.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.util.ArrayList;
diff --git a/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/MetadataBandGroup.java
similarity index 87%
rename from src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/MetadataBandGroup.java
index 369565a..15c3cb2 100644
--- a/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/MetadataBandGroup.java
@@ -14,25 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import org.apache.harmony.unpack200.bytecode.AnnotationDefaultAttribute;
-import org.apache.harmony.unpack200.bytecode.AnnotationsAttribute.Annotation;
-import org.apache.harmony.unpack200.bytecode.AnnotationsAttribute.ElementValue;
-import org.apache.harmony.unpack200.bytecode.Attribute;
-import org.apache.harmony.unpack200.bytecode.CPDouble;
-import org.apache.harmony.unpack200.bytecode.CPFloat;
-import org.apache.harmony.unpack200.bytecode.CPInteger;
-import org.apache.harmony.unpack200.bytecode.CPLong;
-import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.RuntimeVisibleorInvisibleAnnotationsAttribute;
-import org.apache.harmony.unpack200.bytecode.RuntimeVisibleorInvisibleParameterAnnotationsAttribute;
-import org.apache.harmony.unpack200.bytecode.RuntimeVisibleorInvisibleParameterAnnotationsAttribute.ParameterAnnotation;
+import org.apache.commons.compress.harmony.unpack200.bytecode.AnnotationDefaultAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.Attribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPDouble;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPFloat;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInteger;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPLong;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
+import org.apache.commons.compress.harmony.unpack200.bytecode.RuntimeVisibleorInvisibleAnnotationsAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.RuntimeVisibleorInvisibleParameterAnnotationsAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.AnnotationsAttribute.Annotation;
+import org.apache.commons.compress.harmony.unpack200.bytecode.AnnotationsAttribute.ElementValue;
+import org.apache.commons.compress.harmony.unpack200.bytecode.RuntimeVisibleorInvisibleParameterAnnotationsAttribute.ParameterAnnotation;
/**
* A group of metadata bands, such as class_RVA_bands, method_AD_bands etc.
diff --git a/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBands.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBands.java
index 0677e49..bd25dc7 100644
--- a/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBands.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.IOException;
import java.io.InputStream;
@@ -24,22 +24,22 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.harmony.pack200.BHSDCodec;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.Attribute;
-import org.apache.harmony.unpack200.bytecode.CPClass;
-import org.apache.harmony.unpack200.bytecode.CPDouble;
-import org.apache.harmony.unpack200.bytecode.CPFieldRef;
-import org.apache.harmony.unpack200.bytecode.CPFloat;
-import org.apache.harmony.unpack200.bytecode.CPInteger;
-import org.apache.harmony.unpack200.bytecode.CPInterfaceMethodRef;
-import org.apache.harmony.unpack200.bytecode.CPLong;
-import org.apache.harmony.unpack200.bytecode.CPMethodRef;
-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.NewAttribute;
+import org.apache.commons.compress.harmony.pack200.BHSDCodec;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.Attribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPDouble;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPFieldRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPFloat;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInteger;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInterfaceMethodRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPLong;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPMethodRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPNameAndType;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPString;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
+import org.apache.commons.compress.harmony.unpack200.bytecode.NewAttribute;
/**
* Set of bands relating to a non-predefined attribute
@@ -63,7 +63,7 @@ public class NewAttributeBands extends BandSet {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void read(InputStream in) throws IOException, Pack200Exception {
// does nothing - use parseAttributes instead
diff --git a/src/main/java/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java
similarity index 93%
rename from src/main/java/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java
index 01f263f..ffb78de 100644
--- a/src/main/java/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Pack200UnpackerAdapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.BufferedInputStream;
import java.io.File;
@@ -22,10 +22,10 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.jar.JarOutputStream;
-import org.apache.commons.compress.java.util.jar.Pack200.Unpacker;
-import org.apache.harmony.pack200.Pack200Adapter;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Pack200Adapter;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.java.util.jar.Pack200.Unpacker;
/**
* This class provides the binding between the standard Pack200 interface and
diff --git a/src/main/java/org/apache/harmony/unpack200/Segment.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/Segment.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
index a95307a..88d5684 100644
--- a/src/main/java/org/apache/harmony/unpack200/Segment.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/Segment.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -35,18 +35,18 @@ import java.util.zip.CRC32;
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipEntry;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.Attribute;
-import org.apache.harmony.unpack200.bytecode.CPClass;
-import org.apache.harmony.unpack200.bytecode.CPField;
-import org.apache.harmony.unpack200.bytecode.CPMethod;
-import org.apache.harmony.unpack200.bytecode.CPUTF8;
-import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
-import org.apache.harmony.unpack200.bytecode.ClassFile;
-import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
-import org.apache.harmony.unpack200.bytecode.InnerClassesAttribute;
-import org.apache.harmony.unpack200.bytecode.SourceFileAttribute;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.Attribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPField;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPMethod;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFile;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.InnerClassesAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.SourceFileAttribute;
/**
* A Pack200 archive consists of one or more segments. Each segment is
diff --git a/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
index 8b91dcf..b8c6b9e 100644
--- a/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPool.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.util.List;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
-import org.apache.harmony.unpack200.bytecode.ConstantPoolEntry;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ConstantPoolEntry;
/**
* SegmentConstantPool manages the constant pool used for re-creating class
diff --git a/src/main/java/org/apache/harmony/unpack200/SegmentConstantPoolArrayCache.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolArrayCache.java
similarity index 99%
rename from src/main/java/org/apache/harmony/unpack200/SegmentConstantPoolArrayCache.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolArrayCache.java
index 50df8f7..0dfcf3a 100644
--- a/src/main/java/org/apache/harmony/unpack200/SegmentConstantPoolArrayCache.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolArrayCache.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentHeader.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/SegmentHeader.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentHeader.java
index d8af070..1c9782f 100644
--- a/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentHeader.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.ByteArrayInputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.harmony.pack200.BHSDCodec;
-import org.apache.harmony.pack200.Codec;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.BHSDCodec;
+import org.apache.commons.compress.harmony.pack200.Codec;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* SegmentHeader is the header band of a {@link Segment}
diff --git a/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentOptions.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/SegmentOptions.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentOptions.java
index 37858a3..c975b32 100644
--- a/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentOptions.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* Stores the combinations of bit flags that can be used in the segment header
diff --git a/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentUtils.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/SegmentUtils.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentUtils.java
index 9590ba0..b878e3d 100644
--- a/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/SegmentUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.commons.compress.harmony.unpack200;
/**
* Utility class for unpack200
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
index bd94809..17e7dac 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/AnnotationDefaultAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationsAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/AnnotationsAttribute.java
similarity index 99%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationsAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/AnnotationsAttribute.java
index 5d4f652..d090c38 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/AnnotationsAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/AnnotationsAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
index 6e68a1f..7dad485 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
similarity index 91%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
index 526f593..d9ccd48 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.List;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* Abstract superclass for attributes that have some part encoded with a BCI
@@ -33,7 +33,7 @@ public abstract class BCIRenumberedAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#hasBCIRenumbering()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#hasBCIRenumbering()
*/
public boolean hasBCIRenumbering() {
return true;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ByteCode.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ByteCode.java
index d621923..5643bb0 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ByteCode.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.harmony.unpack200.Segment;
-import org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm;
+import org.apache.commons.compress.harmony.unpack200.Segment;
+import org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm;
/**
* A bytecode class file entry.
@@ -107,7 +107,7 @@ public class ByteCode extends ClassFileEntry {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#resolve(org.apache.harmony.unpack200.bytecode.ClassConstantPool)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry#resolve(org.apache.commons.compress.harmony.unpack200.bytecode.ClassConstantPool)
*/
protected void resolve(ClassConstantPool pool) {
super.resolve(pool);
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
index 5587209..366ceaf 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
index ab4be3a..264d878 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
/**
* Abstract superclass for constant pool constant entries such as numbers or
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstantNumber.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstantNumber.java
similarity index 94%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPConstantNumber.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstantNumber.java
index 9b9d203..7fe9f9f 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstantNumber.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstantNumber.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
/**
* Abstract superclass for constant pool entries that are numbers.
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPDouble.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPDouble.java
similarity index 95%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPDouble.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPDouble.java
index b7d0910..5caec2a 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPDouble.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPDouble.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPField.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPField.java
similarity index 94%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPField.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPField.java
index c05f1fc..01aae39 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPField.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPField.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.util.List;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPFieldRef.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPFieldRef.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
index adba84f..8c9ae66 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPFieldRef.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPFloat.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFloat.java
similarity index 95%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPFloat.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFloat.java
index dedcb32..786c435 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPFloat.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFloat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPInteger.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPInteger.java
similarity index 95%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPInteger.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPInteger.java
index 531d95e..cdd3792 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPInteger.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPInteger.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
index 5ead087..9fe0a58 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
@@ -11,7 +11,7 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
/**
* Interface method reference constant pool entry.
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPLong.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPLong.java
similarity index 95%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPLong.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPLong.java
index 288f91d..e5360ba 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPLong.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPLong.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
index a390299..0a5c35a 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethod.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMethod.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPMethod.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMethod.java
index b76d75a..57367ba 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethod.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMethod.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.util.List;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethodRef.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMethodRef.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPMethodRef.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMethodRef.java
index 86226ac..22fa9f8 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPMethodRef.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMethodRef.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
/**
* Method reference constant pool entry.
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
index b57da6c..86a9cb9 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.harmony.unpack200.SegmentUtils;
+import org.apache.commons.compress.harmony.unpack200.SegmentUtils;
/**
* Name and Type pair constant pool entry.
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
index 2e7a93c..08250d1 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPString.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPString.java
index ca2548a..cd00c3e 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPString.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
index 8aa4239..de7d943 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassConstantPool.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassConstantPool.java
index 7ce3606..12ce4ef 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassConstantPool.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeSet;
-import org.apache.harmony.unpack200.Segment;
+import org.apache.commons.compress.harmony.unpack200.Segment;
/**
* The Class constant pool
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFile.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFile.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ClassFile.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFile.java
index e8d4bc6..446aac3 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFile.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFile.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntry.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntry.java
index 2eb2185..70a24eb 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/CodeAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CodeAttribute.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/CodeAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CodeAttribute.java
index 0878da9..68d577d 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/CodeAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CodeAttribute.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.harmony.unpack200.Segment;
+import org.apache.commons.compress.harmony.unpack200.Segment;
public class CodeAttribute extends BCIRenumberedAttribute {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantPoolEntry.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantPoolEntry.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ConstantPoolEntry.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantPoolEntry.java
index cde2749..f7afbf9 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantPoolEntry.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantPoolEntry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantValueAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ConstantValueAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
index 13b9aa8..afc2cd4 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ConstantValueAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/DeprecatedAttribute.java
similarity index 81%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/DeprecatedAttribute.java
index 983cfde..79ff7f7 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/DeprecatedAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -37,7 +37,7 @@ public class DeprecatedAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
return 0;
@@ -46,7 +46,7 @@ public class DeprecatedAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
// No body
@@ -55,7 +55,7 @@ public class DeprecatedAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
return "Deprecated Attribute";
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
similarity index 87%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
index f53ef42..82f011f 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -51,7 +51,7 @@ public class EnclosingMethodAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
return 4;
@@ -72,7 +72,7 @@ public class EnclosingMethodAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
dos.writeShort(class_index);
@@ -82,7 +82,7 @@ public class EnclosingMethodAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
return "EnclosingMethod";
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionTableEntry.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionTableEntry.java
index 2611ec8..31212f8 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionTableEntry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionsAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionsAttribute.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionsAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionsAttribute.java
index 39d26a0..f3f23cb 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionsAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ExceptionsAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
index 0c9e1c3..4233bdd 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/InnerClassesAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LineNumberTableAttribute.java
similarity index 85%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LineNumberTableAttribute.java
index 57e5ec1..a55a054 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LineNumberTableAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -56,7 +56,7 @@ public class LineNumberTableAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
return "LineNumberTable: " + line_number_table_length + " lines";
@@ -65,7 +65,7 @@ public class LineNumberTableAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#getNestedClassFileEntries()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#getNestedClassFileEntries()
*/
protected ClassFileEntry[] getNestedClassFileEntries() {
return new ClassFileEntry[] { getAttributeName() };
@@ -79,7 +79,7 @@ public class LineNumberTableAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#resolve(org.apache.harmony.unpack200.bytecode.ClassConstantPool)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#resolve(org.apache.commons.compress.harmony.unpack200.bytecode.ClassConstantPool)
*/
protected void resolve(ClassConstantPool pool) {
super.resolve(pool);
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
index ed27fb2..74334ff 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* Local variable table
@@ -112,7 +112,7 @@ public class LocalVariableTableAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.BCIRenumberedAttribute#renumber(java.util.List)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.BCIRenumberedAttribute#renumber(java.util.List)
*/
public void renumber(List byteCodeOffsets) throws Pack200Exception {
// Remember the unrenumbered start_pcs, since that's used later
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
index 7cb848b..ea276a0 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
/**
* Local variable type table.
@@ -106,7 +106,7 @@ public class LocalVariableTypeTableAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.BCIRenumberedAttribute#renumber(java.util.List)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.BCIRenumberedAttribute#renumber(java.util.List)
*/
public void renumber(List byteCodeOffsets) throws Pack200Exception {
// Remember the unrenumbered start_pcs, since that's used later
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
similarity index 95%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
index 56842bd..670471c 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/NewAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -44,7 +44,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
int length = 0;
@@ -57,7 +57,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
for (int i = 0; i < lengths.size(); i++) {
@@ -87,7 +87,7 @@ public class NewAttribute extends BCIRenumberedAttribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
return attributeName.underlyingString();
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/OperandManager.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/OperandManager.java
similarity index 96%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/OperandManager.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/OperandManager.java
index 85082ff..23f6b1a 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/OperandManager.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/OperandManager.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
-import org.apache.harmony.unpack200.Segment;
-import org.apache.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.Segment;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
/**
* This class keeps track of operands used. It provides API to let other classes
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
similarity index 97%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
index 9e82a6e..7bf640a 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleAnnotationsAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
index d15e3a7..2419b94 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/RuntimeVisibleorInvisibleParameterAnnotationsAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SignatureAttribute.java
similarity index 85%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SignatureAttribute.java
index 49cfdc7..d9f1ee0 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SignatureAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -41,7 +41,7 @@ public class SignatureAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
return 2;
@@ -60,7 +60,7 @@ public class SignatureAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
dos.writeShort(signature_index);
@@ -69,7 +69,7 @@ public class SignatureAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
// TODO Auto-generated method stub
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
similarity index 93%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
index e01224a..d09474f 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -56,7 +56,7 @@ public class SourceFileAttribute extends Attribute {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.Attribute#isSourceFileAttribute()
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.Attribute#isSourceFileAttribute()
*/
public boolean isSourceFileAttribute() {
return true;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ByteCodeForm.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ByteCodeForm.java
index 875b2b3..12c2b99 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ByteCodeForm.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
import java.util.HashMap;
import java.util.Map;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.CodeAttribute;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
public abstract class ByteCodeForm {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ByteForm.java
similarity index 70%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ByteForm.java
index c2d8c54..7e858b0 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ByteForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the form for bytecodes which have single byte operands.
@@ -31,9 +31,9 @@ public class ByteForm extends ByteCodeForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ClassRefForm.java
similarity index 84%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ClassRefForm.java
index 7797d05..ec3cf5a 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ClassRefForm.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-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;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have class
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
similarity index 81%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
index a3f11a3..ed78d9b 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-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;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* Abstract superclass of all classes that have class-specific references to
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/DoubleForm.java
similarity index 85%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/DoubleForm.java
index 91d95a0..60a403d 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/DoubleForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/FieldRefForm.java
similarity index 85%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/FieldRefForm.java
index d3b4100..fd1ce06 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/FieldRefForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have field
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/FloatRefForm.java
similarity index 86%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/FloatRefForm.java
index 2b57a07..936822e 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/FloatRefForm.java
@@ -13,10 +13,10 @@
* 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.bytecode.forms;
+ */package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have float
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IMethodRefForm.java
similarity index 71%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IMethodRefForm.java
index 540e5f4..5bc3438 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IMethodRefForm.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.CPInterfaceMethodRef;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPInterfaceMethodRef;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have
@@ -42,9 +42,9 @@ public class IMethodRefForm extends ReferenceForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.Segment)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IincForm.java
similarity index 72%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IincForm.java
index fe6768f..dad3cd0 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IincForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for the iinc instruction. It has a
@@ -32,9 +32,9 @@ public class IincForm extends ByteCodeForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
similarity index 81%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
index 3d0ae11..d55a51b 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-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;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* Abstract superclass of those classes which look up init methods (these are
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IntRefForm.java
similarity index 86%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IntRefForm.java
index 4256761..2d667fe 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/IntRefForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have int
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LabelForm.java
similarity index 75%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LabelForm.java
index c708661..747031e 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LabelForm.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.CodeAttribute;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have label
@@ -40,8 +40,8 @@ public class LabelForm extends ByteCodeForm {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTarget(org.apache.harmony.unpack200.bytecode.ByteCode,
- * org.apache.harmony.unpack200.bytecode.CodeAttribute)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTarget(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute)
*/
public void fixUpByteCodeTargets(ByteCode byteCode,
CodeAttribute codeAttribute) {
@@ -66,9 +66,9 @@ public class LabelForm extends ByteCodeForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LocalForm.java
similarity index 71%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LocalForm.java
index cc929f3..b693926 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LocalForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have float
@@ -33,9 +33,9 @@ public class LocalForm extends ByteCodeForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LongForm.java
similarity index 85%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LongForm.java
index 22326ae..6032118 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LongForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have long
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
similarity index 89%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
index 2a5f023..0d6a917 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
public class LookupSwitchForm extends SwitchForm {
@@ -28,8 +28,8 @@ public class LookupSwitchForm extends SwitchForm {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
- * org.apache.harmony.unpack200.bytecode.OperandManager, int)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager, int)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/MethodRefForm.java
similarity index 86%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/MethodRefForm.java
index 56c8408..70ea1b3 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/MethodRefForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
similarity index 75%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
index 30688aa..3c622ff 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for the multianewarray instruction.
@@ -34,9 +34,9 @@ public class MultiANewArrayForm extends ClassRefForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
similarity index 85%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
index 1fafef1..6c19fca 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class is used for representations of cldc and cldc_w. In these cases, a
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewClassRefForm.java
similarity index 76%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewClassRefForm.java
index 9c441af..476cdb4 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewClassRefForm.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-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;
-import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class is an extension of the ClassRefForm. It has two purposes: 1. To
@@ -38,8 +38,8 @@ public class NewClassRefForm extends ClassRefForm {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.forms.ReferenceForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
- * org.apache.harmony.unpack200.bytecode.OperandManager)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ReferenceForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
similarity index 80%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
index 5b70fc5..d20df51 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-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;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class is used to determine which init method should be called, based on
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NoArgumentForm.java
similarity index 71%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NoArgumentForm.java
index 8b1f315..13780bf 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/NoArgumentForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form of all bytecodes which either have
@@ -33,9 +33,9 @@ public class NoArgumentForm extends ByteCodeForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ReferenceForm.java
similarity index 74%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ReferenceForm.java
index d121e16..30b6309 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ReferenceForm.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-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;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* Abstract class of all ByteCodeForms which add a nested entry from the
@@ -53,9 +53,9 @@ public abstract class ReferenceForm extends ByteCodeForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.Segment)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ShortForm.java
similarity index 70%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ShortForm.java
index 96e7cfb..404ff60 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ShortForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the form for bytecodes which have short operands only.
@@ -31,9 +31,9 @@ public class ShortForm extends ByteCodeForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
similarity index 86%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
index 01e88a1..58b6383 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.pack200.Pack200Exception;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* Some bytecodes (such as (a)ldc, fldc and ildc) have single- byte references
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/StringRefForm.java
similarity index 80%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/StringRefForm.java
index 0692cd2..3f66680 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/StringRefForm.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-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;
-import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.pack200.Pack200Exception;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CPString;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for those bytecodes which have
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
similarity index 87%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
index 433245a..7b9118c 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements references to fields defined in the superclass, which
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
similarity index 87%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
index aca3882..21b518f 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
/**
* This class is used to determine which init method should be called, based on
@@ -27,7 +27,7 @@ public class SuperInitMethodRefForm extends InitMethodReferenceForm {
}
protected String context(
- org.apache.harmony.unpack200.bytecode.OperandManager operandManager) {
+ org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager operandManager) {
return operandManager.getSuperClass();
}
}
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
similarity index 87%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
index 16628aa..85ef5b3 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements references to methods defined in the superclass, which
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SwitchForm.java
similarity index 82%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SwitchForm.java
index f812267..8439f66 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/SwitchForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.CodeAttribute;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute;
public abstract class SwitchForm extends VariableInstructionForm {
@@ -28,8 +28,8 @@ public abstract class SwitchForm extends VariableInstructionForm {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTargets(org.apache.harmony.unpack200.bytecode.ByteCode,
- * org.apache.harmony.unpack200.bytecode.CodeAttribute)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#fixUpByteCodeTargets(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.CodeAttribute)
*/
public void fixUpByteCodeTargets(ByteCode byteCode,
CodeAttribute codeAttribute) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java
similarity index 89%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java
index 30d7145..72b2f9f 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/TableSwitchForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
public class TableSwitchForm extends SwitchForm {
@@ -28,8 +28,8 @@ public class TableSwitchForm extends SwitchForm {
/*
* (non-Javadoc)
*
- * @see org.apache.harmony.unpack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.harmony.unpack200.bytecode.ByteCode,
- * org.apache.harmony.unpack200.bytecode.OperandManager, int)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.SwitchForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager, int)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
similarity index 87%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
index 488cf03..abceb41 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements references to fields defined in the current class,
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
similarity index 89%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
index 3393244..6ed5ed5 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class is used to determine which init method should be called, based on
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
similarity index 87%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
index ae7d7b8..97fd6a2 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.SegmentConstantPool;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements references to methods defined in the current class,
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
similarity index 98%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
index 6036273..00df880 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
/**
* This abstract class implements the common code for instructions which have
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/WideForm.java
similarity index 90%
rename from src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
rename to src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/WideForm.java
index ba6d607..30e1615 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/WideForm.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200.bytecode.forms;
+package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
-import org.apache.harmony.unpack200.bytecode.ByteCode;
-import org.apache.harmony.unpack200.bytecode.OperandManager;
+import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
+import org.apache.commons.compress.harmony.unpack200.bytecode.OperandManager;
/**
* This class implements the byte code form for the wide instruction. Unlike
@@ -33,9 +33,9 @@ public class WideForm extends VariableInstructionForm {
/*
* (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)
+ * @see org.apache.commons.compress.harmony.unpack200.bytecode.forms.ByteCodeForm#setByteCodeOperands(org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode,
+ * org.apache.commons.compress.harmony.unpack200.bytecode.OperandTable,
+ * org.apache.commons.compress.harmony.unpack200.SegmentConstantPool)
*/
public void setByteCodeOperands(ByteCode byteCode,
OperandManager operandManager, int codeLength) {
diff --git a/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java b/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java
index 998c7bf..a2c9df2 100644
--- a/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java
+++ b/src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java
@@ -28,7 +28,7 @@ import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
-import org.apache.harmony.archive.internal.nls.Messages;
+import org.apache.commons.compress.harmony.archive.internal.nls.Messages;
/**
* Class factory for {@link Pack200.Packer} and {@link Pack200.Unpacker}.
@@ -62,7 +62,7 @@ public abstract class Pack200 {
public Object run() {
String className = System
.getProperty(SYSTEM_PROPERTY_PACKER,
- "org.apache.harmony.pack200.Pack200PackerAdapter"); //$NON-NLS-1$
+ "org.apache.commons.compress.harmony.pack200.Pack200PackerAdapter"); //$NON-NLS-1$
try {
// TODO Not sure if this will cause problems with
// loading the packer
@@ -92,7 +92,7 @@ public abstract class Pack200 {
public Object run() {
String className = System
.getProperty(SYSTEM_PROPERTY_UNPACKER,
- "org.apache.harmony.unpack200.Pack200UnpackerAdapter");//$NON-NLS-1$
+ "org.apache.commons.compress.harmony.unpack200.Pack200UnpackerAdapter");//$NON-NLS-1$
try {
return ClassLoader.getSystemClassLoader()
.loadClass(className).newInstance();