You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sj...@apache.org on 2008/06/03 12:09:44 UTC
svn commit: r662729 [1/2] - in
/harmony/enhanced/classlib/trunk/modules/pack200/src:
main/java/org/apache/harmony/pack200/ main/java/org/apache/harmony/unpack200/
main/java/org/apache/harmony/unpack200/bytecode/
main/java/org/apache/harmony/unpack200/b...
Author: sjanuary
Date: Tue Jun 3 03:09:41 2008
New Revision: 662729
URL: http://svn.apache.org/viewvc?rev=662729&view=rev
Log:
Pack200 - moved Pack200Exception to org.apache.harmony.pack200 package (was left in wrong package in earlier refactoring)
Added:
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java (contents, props changed)
- copied, changed from r651194, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Pack200Exception.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/HelloWorld.java (contents, props changed)
- copied, changed from r651194, harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/HelloWorld.java
Removed:
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Pack200Exception.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/HelloWorld.java
Modified:
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/FileBands.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/NewAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SignatureAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/SourceFileAttribute.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassSpecificReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LookupSwitchForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NarrowClassRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewClassRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SingleByteReferenceForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/TableSwitchForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/VariableInstructionForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200PackerAdapter.java
harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/unpack200/Pack200UnpackerAdapter.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/BHSDCodecTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecEncodingTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/CodecTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/PopulationCodecTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AbstractBandsTestCase.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutMapTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/AttributeLayoutTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BandSetTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/BcBandsTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/ClassBandsTest.java
harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/unpack200/tests/SegmentOptionsTest.java
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BHSDCodec.java Tue Jun 3 03:09:41 2008
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.harmony.unpack200.Pack200Exception;
/**
* A BHSD codec is a means of encoding integer values as a sequence of bytes or
@@ -36,7 +35,7 @@
* the integers [1..10] would be represented as a sequence of 10x1s. This allows
* the absolute value of a coded integer to fall outside of the 'small number'
* range, whilst still being encoded as a single byte.
- *
+ *
* A BHSD codec is configured with four parameters:
* <dl>
* <dt>B</dt>
@@ -69,7 +68,7 @@
* instance of the Codec to be cloned for each use.)
* <dt>
* </dl>
- *
+ *
* Codecs are notated as (B,H,S,D) and either D or S,D may be omitted if zero.
* Thus {@link #BYTE1} is denoted (1,256,0,0) or (1,256). The
* {@link #toString()} method prints out the condensed form of the encoding.
@@ -78,7 +77,7 @@
* {@link #UNSIGNED5}) are unsigned; otherwise, in most cases, they are signed.
* The presence of the word Delta ({@link #DELTA5}, {@link #UDELTA5})
* indicates a delta encoding is used.
- *
+ *
*/
public final class BHSDCodec extends Codec {
@@ -115,7 +114,7 @@
/**
* Constructs an unsigned, non-delta Codec with the given B and H values.
- *
+ *
* @param b
* the maximum number of bytes that a value can be encoded as
* [1..5]
@@ -128,7 +127,7 @@
/**
* Constructs a non-delta Codec with the given B, H and S values.
- *
+ *
* @param b
* the maximum number of bytes that a value can be encoded as
* [1..5]
@@ -144,7 +143,7 @@
/**
* Constructs a Codec with the given B, H, S and D values.
- *
+ *
* @param b
* the maximum number of bytes that a value can be encoded as
* [1..5]
@@ -188,7 +187,7 @@
/**
* Returns the cardinality of this codec; that is, the number of distinct
* values that it can contain.
- *
+ *
* @return the cardinality of this codec
*/
public long cardinality() {
@@ -256,7 +255,7 @@
/**
* True if this encoding can code the given value
- *
+ *
* @param value
* the value to check
* @return <code>true</code> if the encoding can encode this value
@@ -311,7 +310,7 @@
/**
* Returns true if this codec is a delta codec
- *
+ *
* @return true if this codec is a delta codec
*/
public boolean isDelta() {
@@ -320,7 +319,7 @@
/**
* Returns true if this codec is a signed codec
- *
+ *
* @return true if this codec is a signed codec
*/
public boolean isSigned() {
@@ -329,7 +328,7 @@
/**
* Returns the largest value that this codec can represent.
- *
+ *
* @return the largest value that this codec can represent.
*/
public long largest() {
@@ -358,7 +357,7 @@
/**
* Returns the smallest value that this codec can represent.
- *
+ *
* @return the smallest value that this codec can represent.
*/
public long smallest() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Codec.java Tue Jun 3 03:09:41 2008
@@ -19,12 +19,11 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.harmony.unpack200.Pack200Exception;
/**
* A Codec allows a sequence of bytes to be decoded into integer values (or vice
* versa).
- *
+ *
* There are a number of standard Codecs ({@link #UDELTA5}, {@link #UNSIGNED5},
* {@link #BYTE1}, {@link #CHAR3}) that are used in the implementation of many
* bands; but there are a variety of other ones, and indeed the specification
@@ -90,7 +89,7 @@
* Decode a sequence of bytes from the given input stream, returning the
* value as a long. Note that this method can only be applied for non-delta
* encodings.
- *
+ *
* @param in
* the input stream to read from
* @return the value as a long
@@ -109,7 +108,7 @@
* previous value must be passed in as a parameter. If it is a non-delta
* encoding, then it does not matter what value is passed in, so it makes
* sense for the value to be passed in by default using code similar to:
- *
+ *
* <pre>
* long last = 0;
* while (condition) {
@@ -117,7 +116,7 @@
* // do something with last
* }
* </pre>
- *
+ *
* @param in
* the input stream to read from
* @param last
@@ -137,10 +136,10 @@
/**
* Decodes a sequence of <code>n</code> values from <code>in</code>.
* This should probably be used in most cases, since some codecs (such as
- *
+ *
* @{link PopCodec}) only work when the number of values to be read is
* known.
- *
+ *
* @param n
* the number of values to decode
* @param in
@@ -167,10 +166,10 @@
/**
* Decodes a sequence of <code>n</code> values from <code>in</code>.
* This should probably be used in most cases, since some codecs (such as
- *
+ *
* @{link PopCodec}) only work when the number of values to be read is
* known.
- *
+ *
* @param n
* the number of values to decode
* @param in
@@ -196,7 +195,7 @@
/**
* Decodes a sequence of <code>n</code> values from <code>in</code>.
- *
+ *
* @param n
* the number of values to decode
* @param in
@@ -225,7 +224,7 @@
/**
* Decodes a sequence of <code>n</code> values from <code>in</code>.
- *
+ *
* @param n
* the number of values to decode
* @param in
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/CodecEncoding.java Tue Jun 3 03:09:41 2008
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.harmony.unpack200.Pack200Exception;
/**
* CodecEncoding is used to get the right Codec for a given meta-encoding
@@ -99,7 +98,7 @@
* band_headers byte array. Since the values from this are consumed and not
* repeated, the input stream should be reused for subsequent encodings.
* This does not therefore close the input stream.
- *
+ *
* @param value
* the canonical encoding value
* @param in
@@ -108,7 +107,7 @@
* TODO
* @return the corresponding codec, or <code>null</code> if the default
* should be used
- *
+ *
* @throws IOException
* if there is a problem reading from the input stream (which in
* reality, is never, since the band_headers are likely stored
Copied: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java (from r651194, harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Pack200Exception.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java?p2=harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java&p1=harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Pack200Exception.java&r1=651194&r2=662729&rev=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Pack200Exception.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java Tue Jun 3 03:09:41 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.harmony.unpack200;
+package org.apache.harmony.pack200;
/**
* Represents a problem with a Pack200 coding/decoding issue.
@@ -25,7 +25,7 @@
/**
* Create a new Pack200 exception with the given message and cause
- *
+ *
* @param message
* the text message to display
*/
@@ -35,7 +35,7 @@
/**
* Create a new Pack200 exception with the given message and cause
- *
+ *
* @param message
* the text message to display
* @param cause
@@ -47,7 +47,7 @@
/**
* Create a new Pack200 exception with the given message and cause
- *
+ *
* @param cause
* the {@link Throwable} that caused this problem
*/
Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/PopulationCodec.java Tue Jun 3 03:09:41 2008
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.harmony.unpack200.Pack200Exception;
/**
* A PopulationCodec is a Codec that is well suited to encoding data that shows
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/RunCodec.java Tue Jun 3 03:09:41 2008
@@ -20,7 +20,6 @@
import java.io.InputStream;
import java.util.Arrays;
-import org.apache.harmony.unpack200.Pack200Exception;
/**
* A run codec is a grouping of two nested codecs; K values are decoded from the
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Archive.java Tue Jun 3 03:09:41 2008
@@ -29,6 +29,8 @@
import java.util.jar.JarOutputStream;
import java.util.zip.GZIPInputStream;
+import org.apache.harmony.pack200.Pack200Exception;
+
/**
* Archive is the main entry point to unpack200. An archive is constructed with
* either two file names, a pack file and an output file name or two input
@@ -57,7 +59,7 @@
/**
* Creates an Archive with the given input and output file names.
- *
+ *
* @param inputFile
* @param outputFile
* @throws FileNotFoundException
@@ -76,7 +78,7 @@
* Creates an Archive with streams for the input and output files. Note: If
* you use this method then calling {@link #setRemovePackFile(boolean)} will
* have no effect.
- *
+ *
* @param inputStream
* @param outputStream
* @throws IOException
@@ -89,7 +91,7 @@
/**
* Unpacks the Archive from the input file to the output file
- *
+ *
* @throws Pack200Exception
* @throws IOException
*/
@@ -200,7 +202,7 @@
/**
* If removePackFile is set to true, the input file is deleted after
* unpacking
- *
+ *
* @param removePackFile
*/
public void setRemovePackFile(boolean removePackFile) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttrDefinitionBands.java Tue Jun 3 03:09:41 2008
@@ -20,6 +20,7 @@
import java.io.InputStream;
import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
/**
* Attribute definition bands are the set of bands used to define extra
@@ -44,7 +45,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void unpack(InputStream in) throws IOException, Pack200Exception {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayout.java Tue Jun 3 03:09:41 2008
@@ -17,6 +17,7 @@
package org.apache.harmony.unpack200;
import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
/**
@@ -109,7 +110,7 @@
/**
* Construct a default AttributeLayout (equivalent to
* <code>new AttributeLayout(name, context, layout, index, true);</code>)
- *
+ *
* @param name
* @param context
* @param layout
@@ -243,7 +244,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.IMatches#matches(long)
*/
public boolean matches(long value) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/AttributeLayoutMap.java Tue Jun 3 03:09:41 2008
@@ -23,6 +23,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.harmony.pack200.Pack200Exception;
+
/**
* Stores a mapping from attribute names to their corresponding layout types.
* Note that names of attribute layouts and their formats are <emph>not</emph>
@@ -243,9 +245,9 @@
/**
* The map should not contain the same layout and name combination more than
* once for each context.
- *
+ *
* @throws Pack200Exception
- *
+ *
*/
public void checkMap() throws Pack200Exception {
for (int i = 0; i < layouts.length; i++) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BandSet.java Tue Jun 3 03:09:41 2008
@@ -24,6 +24,7 @@
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;
@@ -57,7 +58,7 @@
/**
* Decode a band and return an array of <code>int</code> values
- *
+ *
* @param name
* the name of the band (primarily for logging/debugging
* purposes)
@@ -139,7 +140,7 @@
/**
* Decode a band and return an array of <code>int[]</code> values
- *
+ *
* @param name
* the name of the band (primarily for logging/debugging
* purposes)
@@ -180,7 +181,7 @@
/**
* Decode a band and return an array of <code>long</code> values
- *
+ *
* @param name
* the name of the band (primarily for logging/debugging
* purposes)
@@ -332,7 +333,7 @@
* <code>reference</code> (which is populated prior to this call). An
* exception is thrown if a decoded index falls outside the range
* [0..reference.length-1].
- *
+ *
* @param name
* the band name
* @param in
@@ -343,7 +344,7 @@
* the number of references to decode
* @param reference
* the array of values to use for the references
- *
+ *
* @throws IOException
* if a problem occurs during reading from the underlying stream
* @throws Pack200Exception
@@ -363,7 +364,7 @@
* exception is thrown if a decoded index falls outside the range
* [0..reference.length-1]. Unlike the other parseReferences, this
* post-processes the result into an array of results.
- *
+ *
* @param name
* TODO
* @param in
@@ -374,7 +375,7 @@
* the numbers of references to decode for each array entry
* @param reference
* the array of values to use for the references
- *
+ *
* @throws IOException
* if a problem occurs during reading from the underlying stream
* @throws Pack200Exception
@@ -632,7 +633,7 @@
result[i] = new String[ints[i].length];
for (int j = 0; j < result[i].length; j++) {
result[i][j] = reference[ints[i][j]];
-
+
}
}
return result;
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/BcBands.java Tue Jun 3 03:09:41 2008
@@ -24,6 +24,7 @@
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;
@@ -78,7 +79,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void unpack(InputStream in) throws IOException, Pack200Exception {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/ClassBands.java Tue Jun 3 03:09:41 2008
@@ -23,6 +23,7 @@
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;
@@ -90,7 +91,7 @@
private ArrayList[][] methodAttributes;
private String[][] methodDescr;
-
+
private int[][] methodDescrInts;
private long[][] methodFlags;
@@ -661,7 +662,7 @@
int icTupleF = classInnerClassesF[innerClassIndex][j];
String icTupleC2 = null;
String icTupleN = null;
-
+
if (icTupleF != 0) {
icTupleC2Index = classInnerClassesOuterRCN[innerClassC2NIndex];
icTupleNIndex = classInnerClassesNameRUN[innerClassC2NIndex];
@@ -764,9 +765,6 @@
Codec.BRANCH5, codeHandlerCount);
codeHandlerClassRCN = decodeBandInt(
"code_handler_class_RCN", in, Codec.UNSIGNED5, codeHandlerCount);
- // The codeHandlerClassRCN band contains incremented references to
- // cp_Class so we can't use parseReferences(..) here.
- String[] cpClass = cpBands.getCpClass();
int codeFlagsCount = segment.getSegmentHeader().getOptions()
.hasAllCodeFlags() ? codeCount : codeSpecialHeader;
@@ -1166,7 +1164,7 @@
/**
* Parse the class metadata bands and return the number of backwards
* callables
- *
+ *
* @param in
* @param classAttrCalls
* @return
@@ -1304,10 +1302,10 @@
/**
* Answer an ArrayList of ArrayLists which hold the the code attributes
* corresponding to all classes in order.
- *
+ *
* If a class doesn't have any attributes, the corresponding element in this
* list will be an empty ArrayList.
- *
+ *
* @return ArrayList
*/
public ArrayList getOrderedCodeAttributes() {
@@ -1358,7 +1356,7 @@
* Returns null if all classes should use the default major and minor
* version or an array of integers containing the major version numberss to
* use for each class in the segment
- *
+ *
* @return Class file major version numbers, or null if none specified
*/
public int[] getClassVersionMajor() {
@@ -1369,7 +1367,7 @@
* Returns null if all classes should use the default major and minor
* version or an array of integers containing the minor version numberss to
* use for each class in the segment
- *
+ *
* @return Class file minor version numbers, or null if none specified
*/
public int[] getClassVersionMinor() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/CpBands.java Tue Jun 3 03:09:41 2008
@@ -22,6 +22,7 @@
import java.util.HashMap;
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;
@@ -128,7 +129,7 @@
/**
* Parses the constant pool class names, using {@link #cpClassCount} to
* populate {@link #cpClass} from {@link #cpUTF8}.
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -154,7 +155,7 @@
* largely to make it easier for representing field and method descriptors
* (e.g. <code>out:java.lang.PrintStream</code>) in a way that is
* compatible with passing String arrays.
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -193,7 +194,7 @@
/**
* Parses the constant pool field definitions, using {@link #cpFieldCount}
* to populate {@link #cpFieldClass} and {@link #cpFieldDescriptor}.
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -232,7 +233,7 @@
* Parses the constant pool interface method definitions, using
* {@link #cpIMethodCount} to populate {@link #cpIMethodClass} and
* {@link #cpIMethodDescriptor}.
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -272,7 +273,7 @@
/**
* Parses the constant pool method definitions, using {@link #cpMethodCount}
* to populate {@link #cpMethodClass} and {@link #cpMethodDescriptor}.
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -309,7 +310,7 @@
* representation identical to the bytecode equivalent
* <code>[Ljava/lang/String;(V)</code> TODO Check that the form is as
* above and update other types e.g. J
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -366,7 +367,7 @@
/**
* Parses the constant pool strings, using {@link #cpStringCount} to
* populate {@link #cpString} from indexes into {@link #cpUTF8}.
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -519,7 +520,7 @@
}
return cputf8;
}
-
+
public CPUTF8 cpUTF8Value(String string, int domain) {
return cpUTF8Value(string, domain, true);
}
@@ -647,7 +648,7 @@
int nameIndex = cpDescriptorNameInts[index];
int descriptorIndex = cpDescriptorTypeInts[index];
String descriptorString = cpSignature[descriptorIndex];
-
+
// For some reason, descriptors which have just plain
// native types are stored in DOMAIN_NORMALASCIIZ rather
// than in DOMAIN_SIGNATUREASCIIZ. This might indicate
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/FileBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/FileBands.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/FileBands.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/FileBands.java Tue Jun 3 03:09:41 2008
@@ -20,6 +20,7 @@
import java.io.InputStream;
import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
/**
* Parses the file band headers (not including the actual bits themselves). At
@@ -54,7 +55,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void unpack(InputStream in) throws IOException, Pack200Exception {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcBands.java Tue Jun 3 03:09:41 2008
@@ -23,6 +23,7 @@
import java.util.List;
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;
@@ -48,7 +49,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void unpack(InputStream in) throws IOException, Pack200Exception {
@@ -110,7 +111,7 @@
/**
* Answer the relevant IcTuples for the specified className and class
* constant pool.
- *
+ *
* @param className
* String name of the class X for ic_relevant(X)
* @param cp
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/IcTuple.java Tue Jun 3 03:09:41 2008
@@ -20,7 +20,7 @@
/**
* An IcTuple is the set of information that describes an inner class.
- *
+ *
* C is the fully qualified class name<br>
* F is the flags<br>
* C2 is the outer class name, or null if it can be inferred from C<br>
@@ -33,7 +33,7 @@
private final int nIndex;
/**
- *
+ *
* @param C
* @param F
* @param C2
@@ -115,7 +115,7 @@
/**
* Answer the outer class name for the receiver. This may either be
* specified or inferred from inner class name.
- *
+ *
* @return String name of outer class
*/
public String outerClassString() {
@@ -124,7 +124,7 @@
/**
* Answer the inner class name for the receiver.
- *
+ *
* @return String name of inner class
*/
public String simpleClassName() {
@@ -134,7 +134,7 @@
/**
* Answer the full name of the inner class represented by this tuple
* (including its outer component)
- *
+ *
* @return String full name of inner class
*/
public String thisClassString() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/MetadataBandGroup.java Tue Jun 3 03:09:41 2008
@@ -42,7 +42,7 @@
private final String type;
private final CpBands cpBands;
-
+
private final CPUTF8 rvaUTF8 = new CPUTF8("RuntimeVisibleAnnotations",
ClassConstantPool.DOMAIN_ATTRIBUTEASCIIZ);
private final CPUTF8 riaUTF8 = new CPUTF8("RuntimeInvisibleAnnotations",
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/NewAttributeBands.java Tue Jun 3 03:09:41 2008
@@ -25,6 +25,7 @@
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;
@@ -61,7 +62,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.BandSet#unpack(java.io.InputStream)
*/
public void unpack(InputStream in) throws IOException, Pack200Exception {
@@ -71,7 +72,7 @@
/**
* Parse the bands relating to this AttributeLayout and return the correct
* class file attributes as a List of {@link Attribute}
- *
+ *
* @throws Pack200Exception
*/
public List parseAttributes(InputStream in, int occurrenceCount)
@@ -92,7 +93,7 @@
/**
* Get one attribute at the given index from the various bands. The correct
* bands must have already been read in.
- *
+ *
* @param index
* @param elements
* @return
@@ -112,7 +113,7 @@
/**
* Tokenise the layout into AttributeElements
- *
+ *
* @throws IOException
*/
private void parseLayout() throws IOException {
@@ -130,7 +131,7 @@
/**
* Resolve calls in the attribute layout and returns the number of backwards
* calls
- *
+ *
* @param tokens -
* the attribute layout as a List of AttributeElements
*/
@@ -283,7 +284,7 @@
/**
* Read a UnionCase from the stream
- *
+ *
* @param stream
* @return
* @throws IOException
@@ -322,7 +323,7 @@
/**
* Read the bands associated with this part of the layout
- *
+ *
* @param in
* @param count
* @throws Pack200Exception
@@ -334,7 +335,7 @@
/**
* Add the band data for this element at the given index to the
* attribute
- *
+ *
* @param index
* @param attribute
*/
@@ -715,7 +716,7 @@
/**
* Used by calls when adding band contents to attributes so they don't
* have to keep track of the internal index of the callable
- *
+ *
* @param attribute
*/
public void addNextToAttribute(NewAttribute attribute) {
@@ -728,7 +729,7 @@
/**
* Adds the count of a call to this callable (ie the number of calls)
- *
+ *
* @param count
*/
public void addCount(int count) {
@@ -810,7 +811,7 @@
/**
* Utility method to get the contents of the given stream, up to the next
* ']', (ignoring pairs of brackets '[' and ']')
- *
+ *
* @param stream
* @return
* @throws IOException
@@ -837,7 +838,7 @@
/**
* Returns the {@link BHSDCodec} that should be used for the given layout
* element
- *
+ *
* @param layoutElement
*/
public BHSDCodec getCodec(String layoutElement) {
@@ -858,7 +859,7 @@
/**
* Utility method to get the contents of the given stream, up to the next
* ']', (ignoring pairs of brackets '[' and ']')
- *
+ *
* @param stream
* @return
* @throws IOException
@@ -884,7 +885,7 @@
/**
* Read a number from the stream and return it
- *
+ *
* @param stream
* @return
* @throws IOException
@@ -913,7 +914,7 @@
/**
* Read a 'body' section of the layout from the given stream
- *
+ *
* @param stream
* @return List of LayoutElements
* @throws IOException
@@ -935,7 +936,7 @@
* Once the attribute bands have been read the callables can be informed
* about the number of times each is subject to a backwards call. This
* method is used to set this information.
- *
+ *
* @param backwardsCalls
* one int for each backwards callable, which contains the number
* of times that callable is subject to a backwards call.
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/Segment.java Tue Jun 3 03:09:41 2008
@@ -31,6 +31,7 @@
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;
@@ -49,14 +50,14 @@
* combine (non-GZipped) archives into a single large archive by concatenation
* alone. Thus all the hard work in unpacking an archive falls to understanding
* a segment.
- *
+ *
* The first component of a segment is the header; this contains (amongst other
* things) the expected counts of constant pool entries, which in turn defines
* how many values need to be read from the stream. Because values are variable
* width (see {@link Codec}), it is not possible to calculate the start of the
* next segment, although one of the header values does hint at the size of the
* segment if non-zero, which can be used for buffering purposes.
- *
+ *
* Note that this does not perform any buffering of the input stream; each value
* will be read on a byte-by-byte basis. It does not perform GZip decompression
* automatically; both of these are expected to be done by the caller if the
@@ -234,7 +235,7 @@
int innerClassIndex = ic_stored[index].thisClassIndex();
int outerClassIndex = ic_stored[index].outerClassIndex();
int simpleClassNameIndex = ic_stored[index].simpleClassNameIndex();
-
+
String innerClassString = ic_stored[index].thisClassString();
String outerClassString = ic_stored[index].outerClassString();
String simpleClassName = ic_stored[index].simpleClassName();
@@ -308,7 +309,7 @@
/**
* Given an ic_local and an ic_relevant, use them to calculate what should
* be added as ic_stored.
- *
+ *
* @param ic_local
* IcTuple[] array of local transmitted tuples
* @param ic_relevant
@@ -360,7 +361,7 @@
/**
* This performs the actual work of parsing against a non-static instance of
* Segment.
- *
+ *
* @param in
* the input stream to read from
* @throws IOException
@@ -391,7 +392,7 @@
/**
* Unpacks a packed stream (either .pack. or .pack.gz) into a corresponding
* JarOuputStream.
- *
+ *
* @throws Pack200Exception
* if there is a problem unpacking
* @throws IOException
@@ -411,7 +412,7 @@
* reading, since the file bits may not be loaded and thus just copied from
* one stream to another. Doesn't close the output stream when finished, in
* case there are more entries (e.g. further segments) to be written.
- *
+ *
* @param out
* the JarOutputStream to write data to
* @throws IOException
@@ -522,7 +523,7 @@
/**
* Override the archive's deflate hint with the given boolean
- *
+ *
* @param deflateHint -
* the deflate hint to use
*/
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentConstantPool.java Tue Jun 3 03:09:41 2008
@@ -16,6 +16,7 @@
*/
package org.apache.harmony.unpack200;
+import org.apache.harmony.pack200.Pack200Exception;
import org.apache.harmony.unpack200.bytecode.ClassConstantPool;
import org.apache.harmony.unpack200.bytecode.ClassFileEntry;
import org.apache.harmony.unpack200.bytecode.ConstantPoolEntry;
@@ -88,7 +89,7 @@
* Subset the constant pool of the specified type to be just that which has
* the specified class name. Answer the ConstantPoolEntry at the
* desiredIndex of the subsetted pool.
- *
+ *
* @param cp
* type of constant pool array to search
* @param desiredIndex
@@ -119,7 +120,7 @@
/**
* Given the name of a class, answer the CPClass associated with that class.
* Answer null if the class doesn't exist.
- *
+ *
* @param name
* Class name to look for (form: java/lang/Object)
* @return CPClass for that class name, or null if not found.
@@ -139,7 +140,7 @@
/**
* Answer the init method for the specified class.
- *
+ *
* @param cp
* constant pool to search (must be CP_METHOD)
* @param value
@@ -169,19 +170,19 @@
* which have just those methods / fields defined in the superclass.
* Similarly, _this bytecodes use just those methods/fields defined in this
* class, and _init bytecodes use just those methods that start with <init>.
- *
+ *
* This method takes an array of names, a String to match for, an index and
* a boolean as parameters, and answers the array position in the array of
* the indexth element which matches (or equals) the String (depending on
* the state of the boolean)
- *
+ *
* In other words, if the class array consists of: Object [position 0, 0th
* instance of Object] String [position 1, 0th instance of String] String
* [position 2, 1st instance of String] Object [position 3, 1st instance of
* Object] Object [position 4, 2nd instance of Object] then
* matchSpecificPoolEntryIndex(..., "Object", 2, false) will answer 4.
* matchSpecificPoolEntryIndex(..., "String", 0, false) will answer 1.
- *
+ *
* @param nameArray
* Array of Strings against which the compareString is tested
* @param compareString
@@ -204,7 +205,7 @@
* secondaryCompareString When the desiredIndex number of hits has been
* reached, the index into the original two arrays of the element hit is
* returned.
- *
+ *
* @param primaryArray
* The first array to search
* @param secondaryArray
@@ -244,7 +245,7 @@
* forms we care about: .* (aka REGEX_MATCH_ALL) ^<init>.* (aka
* REGEX_MATCH_INIT) and will answer correctly if those are passed as the
* regexString.
- *
+ *
* @param regexString
* String against which the compareString will be matched
* @param compareString
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentHeader.java Tue Jun 3 03:09:41 2008
@@ -23,6 +23,7 @@
import org.apache.harmony.pack200.BHSDCodec;
import org.apache.harmony.pack200.Codec;
+import org.apache.harmony.pack200.Pack200Exception;
/**
* SegmentHeader is the header band of a {@link Segment}
@@ -120,7 +121,7 @@
/**
* Sets the minor version of this archive
- *
+ *
* @param version
* the minor version of the archive
* @throws Pack200Exception
@@ -134,7 +135,7 @@
/**
* Sets the major version of this archive.
- *
+ *
* @param version
* the minor version of the archive
* @throws Pack200Exception
@@ -239,11 +240,11 @@
* Obtain the band headers data as an input stream. If no band headers are
* present, this will return an empty input stream to prevent any further
* reads taking place.
- *
+ *
* Note that as a stream, data consumed from this input stream can't be
* re-used. Data is only read from this stream if the encoding is such that
* additional information needs to be decoded from the stream itself.
- *
+ *
* @return the band headers input stream
*/
public InputStream getBandHeadersInputStream() {
@@ -329,7 +330,7 @@
/**
* Decode a number of scalars from the band file. A scalar is like a band,
* but does not perform any band code switching.
- *
+ *
* @param name
* the name of the scalar (primarily for logging/debugging
* purposes)
@@ -355,7 +356,7 @@
/**
* Decode a scalar from the band file. A scalar is like a band, but does not
* perform any band code switching.
- *
+ *
* @param name
* the name of the scalar (primarily for logging/debugging
* purposes)
@@ -404,7 +405,7 @@
* Completely reads in a byte array, akin to the implementation in
* {@link java.lang.DataInputStream}. TODO Refactor out into a separate
* InputStream handling class
- *
+ *
* @param in
* the input stream to read from
* @param data
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentOptions.java Tue Jun 3 03:09:41 2008
@@ -16,6 +16,8 @@
*/
package org.apache.harmony.unpack200;
+import org.apache.harmony.pack200.Pack200Exception;
+
/**
* Stores the combinations of bit flags that can be used in the segment header
* options. Whilst this could be defined in {@link Segment}, it's cleaner to
@@ -62,7 +64,7 @@
/**
* Creates a new segment options with the given integer value.
- *
+ *
* @param options
* the integer value to use as the flags
* @throws Pack200Exception
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/SegmentUtils.java Tue Jun 3 03:09:41 2008
@@ -32,7 +32,7 @@
/**
* Count the number of arguments in the descriptor. Each long or double
* counts as widthOfLongsAndDoubles; all other arguments count as 1.
- *
+ *
* @param descriptor
* String for which arguments are counted
* @param widthOfLongsAndDoubles
@@ -129,7 +129,7 @@
* used instead of indexOf('$') because inner classes may be separated by
* any character <= '$' (in other words, Foo#Bar is as valid as Foo$Bar). If
* no $ character is found, answer -1.
- *
+ *
* @param string
* String to search for $
* @return first index of $ character, or -1 if not found
@@ -151,7 +151,7 @@
* This is a debugging message to aid the developer in writing this class.
* If the property 'debug.unpack200' is set, this will generate messages to
* stderr; otherwise, it will be silent.
- *
+ *
* @param message
* @deprecated this may be removed from production code
*/
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/Attribute.java Tue Jun 3 03:09:41 2008
@@ -66,7 +66,7 @@
* when attributes are nested within other attributes - the outer attribute
* needs to take the inner attribute headers into account when calculating
* its length.
- *
+ *
* @return int adjusted length
*/
protected int getLengthIncludingHeader() {
@@ -80,7 +80,7 @@
/**
* Answer true if the receiver needs to have BCI renumbering applied to it;
* otherwise answer false.
- *
+ *
* @return boolean BCI renumbering required
*/
public boolean hasBCIRenumbering() {
@@ -90,7 +90,7 @@
/**
* Answer true if the receiver is a source file attribute (which gets
* special handling when the class is built); otherwise answer false.
- *
+ *
* @return boolean source file attribute
*/
public boolean isSourceFileAttribute() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/BCIRenumberedAttribute.java Tue Jun 3 03:09:41 2008
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.util.List;
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
/**
* Abstract superclass for attributes that have some part encoded with a BCI
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java Tue Jun 3 03:09:41 2008
@@ -119,7 +119,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#resolve(org.apache.harmony.unpack200.bytecode.ClassConstantPool)
*/
protected void resolve(ClassConstantPool pool) {
@@ -153,7 +153,7 @@
* bytecode, set the rewrite bytes of the operand to be the appropriate
* values. All values in operands[] will be masked with 0xFF so they fit
* into a byte.
- *
+ *
* @param operands
* int[] rewrite operand bytes
*/
@@ -181,7 +181,7 @@
* Given an int operand, set the rewrite bytes for that position and the one
* immediately following it to a high-byte, low-byte encoding of the
* operand.
- *
+ *
* @param operand
* int to set the rewrite bytes to
* @param position
@@ -211,7 +211,7 @@
/**
* This is just like setOperandInt, but takes special care when the operand
* is less than 0 to make sure it's written correctly.
- *
+ *
* @param operand
* int to set the rewrite bytes to
* @param position
@@ -229,7 +229,7 @@
/**
* Given an int operand, treat it as a byte and set the rewrite byte for
* that position to that value. Mask of anything beyond 0xFF.
- *
+ *
* @param operand
* int to set the rewrite byte to (unsigned)
* @param position
@@ -267,14 +267,14 @@
* nestedPositions is an array of arrays of ints. Each subarray specifies a
* position of a nested element (from the nested[] array) and the length of
* that element.
- *
+ *
* For instance, one might have a nested of: {CPClass java/lang/Foo, CPFloat
* 3.14} The nestedPositions would then be: {{0,2},{2,2}} In other words,
* when the bytecode is resolved, the CPClass will be resolved to an int and
* inserted at position 0 and 1 of the rewrite arguments (the first
* occurrences of -1). The CPFloat will be resolved to an int position and
* inserted at positions 2 and 3 of the rewrite arguments.
- *
+ *
* @param nestedPositions
*/
public void setNestedPositions(int[][] nestedPositions) {
@@ -293,7 +293,7 @@
* This method will answer true if the receiver is a multi-bytecode
* instruction (such as aload0_putfield_super); otherwise, it will answer
* false.
- *
+ *
* @return boolean true if multibytecode, false otherwise
*/
public boolean hasMultipleByteCodes() {
@@ -305,10 +305,10 @@
* particular, label byte codes need to know where they are in order to
* calculate their targets). This method lets the CodeAttribute specify
* where the byte code is.
- *
+ *
* Since there are no aload0+label instructions, this method doesn't worry
* about multioperation bytecodes.
- *
+ *
* @param byteCodeOffset
* int position in code array.
*/
@@ -326,7 +326,7 @@
* relative to the byteCodeOffset, but later get fixed up to point to the
* absolute position in the CodeAttribute array. This method sets the
* targets.
- *
+ *
* @param byteCodeTargets
* int index in array
*/
@@ -352,10 +352,10 @@
* Some bytecodes (the ones with variable lengths) can't have a static
* rewrite array - they need the ability to update the array. This method
* permits that.
- *
+ *
* Note that this should not be called from bytecodes which have a static
* rewrite; use the table in ByteCodeForm instead to specify those rewrites.
- *
+ *
* @param rewrite
*/
public void setRewrite(int[] rewrite) {
@@ -366,7 +366,7 @@
* Some bytecodes (the ones with variable lengths) can't have a static
* rewrite array - they need the ability to update the array. This method
* permits their associated bytecode formst to query their rewrite array.
- *
+ *
* Note that this should not be called from bytecodes which have a static
* rewrite; use the table in ByteCodeForm instead to specify those rewrites.
*/
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPClass.java Tue Jun 3 03:09:41 2008
@@ -32,7 +32,7 @@
/**
* Creates a new CPClass
- *
+ *
* @param name
* @throws NullPointerException
* if name is null
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPConstant.java Tue Jun 3 03:09:41 2008
@@ -26,7 +26,7 @@
/**
* Create a new CPConstant
- *
+ *
* @param tag
* @param value
* @throws NullPointerException
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPInterfaceMethodRef.java Tue Jun 3 03:09:41 2008
@@ -27,7 +27,7 @@
* This method answers the value this method will use for an invokeinterface
* call. This is equal to 1 + the count of all the args, where longs and
* doubles count for 2 and all others count for 1.
- *
+ *
* @return integer count
*/
public int invokeInterfaceCount() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPMember.java Tue Jun 3 03:09:41 2008
@@ -36,7 +36,7 @@
/**
* Create a new CPMember
- *
+ *
* @param name
* @param descriptor
* @param flags
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPNameAndType.java Tue Jun 3 03:09:41 2008
@@ -36,7 +36,7 @@
/**
* Create a new CPNameAndType
- *
+ *
* @param name
* @param descriptor
* @param domain
@@ -104,7 +104,7 @@
* Answers the invokeinterface count argument when the receiver is treated
* as an invokeinterface target. This value is not meaningful if the
* receiver is not an invokeinterface target.
- *
+ *
* @return count
*/
public int invokeInterfaceCount() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPRef.java Tue Jun 3 03:09:41 2008
@@ -33,7 +33,7 @@
/**
* Create a new CPRef
- *
+ *
* @param type
* @param className
* @param descriptor
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPString.java Tue Jun 3 03:09:41 2008
@@ -43,7 +43,7 @@
/**
* Allows the constant pool entries to resolve their nested entries
- *
+ *
* @param pool
*/
protected void resolve(ClassConstantPool pool) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/CPUTF8.java Tue Jun 3 03:09:41 2008
@@ -29,7 +29,7 @@
/**
* Creates a new CPUTF8 instance
- *
+ *
* @param utf8
* @param domain
* @throws NullPointerException
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java Tue Jun 3 03:09:41 2008
@@ -199,14 +199,14 @@
public int compare(Object arg0, Object arg1) {
return ((CPUTF8)arg0).underlyingString().compareTo(((CPUTF8)arg1).underlyingString());
}
-
+
});
TreeSet cpClassesNotInCpAll = new TreeSet(new Comparator() {
public int compare(Object arg0, Object arg1) {
return ((CPClass)arg0).getName().compareTo(((CPClass)arg1).getName());
}
-
+
});
for (Iterator iterator = entries.iterator(); iterator.hasNext();) {
ConstantPoolEntry entry = (ConstantPoolEntry) iterator.next();
@@ -232,9 +232,9 @@
* Answer the collection of CPClasses currently held by the ClassPoolSet.
* This is used to calculate relevant classes when generating the set of
* relevant inner classes (ic_relevant())
- *
+ *
* @return ArrayList collection of all classes.
- *
+ *
* NOTE: when this list is answered, the classes may not yet be resolved.
*/
public List allClasses() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassFileEntry.java Tue Jun 3 03:09:41 2008
@@ -39,7 +39,7 @@
/**
* Allows the constant pool entries to resolve their nested entries
- *
+ *
* @param pool
*/
protected void resolve(ClassConstantPool pool) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/DeprecatedAttribute.java Tue Jun 3 03:09:41 2008
@@ -33,7 +33,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
@@ -42,7 +42,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
@@ -51,7 +51,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/EnclosingMethodAttribute.java Tue Jun 3 03:09:41 2008
@@ -47,7 +47,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#getLength()
*/
protected int getLength() {
@@ -68,7 +68,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#writeBody(java.io.DataOutputStream)
*/
protected void writeBody(DataOutputStream dos) throws IOException {
@@ -78,7 +78,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ExceptionTableEntry.java Tue Jun 3 03:09:41 2008
@@ -40,10 +40,10 @@
* either a normal one (with a Throwable as the catch_type) or a finally
* clause (which has no catch_type). In the class file, the finally clause
* is represented as catch_type == 0.
- *
+ *
* To create a finally clause with this method, pass in null for the
* catchType.
- *
+ *
* @param startPC
* int
* @param endPC
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/InnerClassesAttribute.java Tue Jun 3 03:09:41 2008
@@ -52,7 +52,7 @@
/**
* Determine the indices of the things in the receiver which point to
* elements of the ClassConstantPool
- *
+ *
* @param pool
* ClassConstantPool which holds the CPClass and CPUTF8
* objects.
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LineNumberTableAttribute.java Tue Jun 3 03:09:41 2008
@@ -52,7 +52,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.ClassFileEntry#toString()
*/
public String toString() {
@@ -61,7 +61,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#getNestedClassFileEntries()
*/
protected ClassFileEntry[] getNestedClassFileEntries() {
@@ -75,7 +75,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.Attribute#resolve(org.apache.harmony.unpack200.bytecode.ClassConstantPool)
*/
protected void resolve(ClassConstantPool pool) {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTableAttribute.java Tue Jun 3 03:09:41 2008
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
/**
* Local variable table
@@ -108,7 +108,7 @@
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.BCIRenumberedAttribute#renumber(java.util.List)
*/
public void renumber(List byteCodeOffsets) throws Pack200Exception {
Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java?rev=662729&r1=662728&r2=662729&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/LocalVariableTypeTableAttribute.java Tue Jun 3 03:09:41 2008
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.harmony.unpack200.Pack200Exception;
+import org.apache.harmony.pack200.Pack200Exception;
/**
* Local variable type table.
@@ -95,14 +95,14 @@
nestedEntries.toArray(nestedEntryArray);
return nestedEntryArray;
}
-
+
protected int[] getStartPCs() {
return start_pcs;
}
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.harmony.unpack200.bytecode.BCIRenumberedAttribute#renumber(java.util.List)
*/
public void renumber(List byteCodeOffsets) throws Pack200Exception {