harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r493560 [1/2] - in /harmony/enhanced/classlib/trunk: depends/files/ modules/pack200/ modules/pack200/make/ modules/pack200/src/main/java/org/apache/harmony/pack200/ modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ modules/...
Date Sat, 06 Jan 2007 20:16:31 GMT
Author: ayza
Date: Sat Jan  6 12:16:29 2007
New Revision: 493560

URL: http://svn.apache.org/viewvc?view=rev&rev=493560
Log:
Final fixes for the pack200 module: package names changed, license added to several source files, build file fixed, pack200.jar added to bootclasspath.properties (HARMONY-2479)

Removed:
    harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AllTests.java
Modified:
    harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
    harmony/enhanced/classlib/trunk/modules/pack200/build.xml
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl
    harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayoutMap.java
    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/Pack200Adapter.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200UnpackerAdapter.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/pack200/Segment.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentOptions.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPClass.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstant.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstantNumber.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPDouble.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPField.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFloat.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInteger.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPLong.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMember.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMethod.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPNameAndType.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPString.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPUTF8.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassConstantPool.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassFile.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ClassFileEntry.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantPoolEntry.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ConstantValueAttribute.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/ExceptionsAttribute.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/SourceFileAttribute.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutMapTest.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/AttributeLayoutTest.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/HelloWorld.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/pack200/tests/SegmentOptionsTest.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/SegmentTest.java
    harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/bytecode/ClassFileEntryTest.java   (contents, props changed)
    harmony/enhanced/classlib/trunk/modules/pack200/src/test/java/org/apache/harmony/pack200/tests/bytecode/ConstantPoolTest.java   (contents, props changed)

Modified: harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Sat Jan  6 12:16:29 2007
@@ -188,6 +188,10 @@
 bootclasspath.43=yoko_M1-20061027/yoko-rmi.jar
 bootclasspath.44=bcel-5.2/bcel-5.2.jar
 
+bootclasspath.45=pack200.jar
+bootclasspath.source.45=pack200-src.jar
+bootclasspath.source.packageroot.45=/
+
 #
 #  Sun compatibility
 #

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Sat Jan  6 12:16:29 2007
@@ -121,54 +121,10 @@
     </target>
 
     <target name="compile-tests" depends="copy-test-resources" > 
-        <!--mkdir dir="${hy.pack200.bin.internal}" /-->
         <mkdir dir="${hy.pack200.bin.test}" />
-        <!--mkdir dir="${hy.pack200.bin.test.support}" /-->
-        
-        <!--echo message="Compiling support classes for PACK200 tests" />
-        <javac srcdir="${hy.pack200.src.test.support}"
-               destdir="${hy.pack200.bin.test.support}"
-               sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.pack200.javac.source}" 
-               target="${hy.pack200.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-        </javac-->
-
-        <!--echo message="Compiling internal PACK200 tests" />
-        <javac srcdir="${hy.pack200.src.test.internal}"
-               destdir="${hy.pack200.bin.internal}"
-               sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-            <classpath location="${hy.pack200.bin.test.support}" />
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-        </javac-->
 
         <echo message="Compiling PACK200 tests" />
-        <!--javac srcdir="${hy.pack200.src.test.java}"
+        <javac srcdir="${hy.pack200.src.test.java}"
                destdir="${hy.pack200.bin.test}"
                sourcepath=""
                compiler="${hy.javac.compiler}"
@@ -185,7 +141,7 @@
                 </fileset>
             </bootclasspath>
             <classpath location="../../build/tests" />
-        </javac-->
+        </javac>
     </target>
 
     <target name="run-tests">
@@ -194,45 +150,7 @@
 
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
-        <!-- internal tests that need to run on the bootclasspath -->
-        <!--echo message="Running internal PACK200 tests" />
-        <junit fork="yes"
-               forkmode="${hy.test.forkmode}"
-               timeout="${hy.test.timeout}"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${basedir}"
-               jvm="${test.jre.home}/bin/java">
-
-            <jvmarg line="${hy.test.vmargs}" />
-
-            <jvmarg value="-Xbootclasspath/a:${hy.pack200.bin.internal}${path.separator}../../${junit.jar}"/>         
-            
-            <classpath>
-                <pathelement path="${hy.pack200.bin.test}"/>
-                <pathelement path="${hy.pack200.bin.test.support}"/>
-                <pathelement path="${hy.pack200.src.test.resources}"/>
-            </classpath>
-            <classpath location="../../build/tests" />
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.pack200.src.test.internal}">
-                    <include name="**/*Test.java"/>
-                </fileset>
-            </batchtest>
-        </junit-->
-
         <echo message="Running PACK200 tests" />
-        <!--
         <junit fork="yes"
                forkmode="${hy.test.forkmode}"
                timeout="${hy.test.timeout}"
@@ -268,7 +186,6 @@
         </junit>
         <antcall target="touch-failures-file" />
         <antcall target="touch-errors-file" />
-        -->
     </target>
 
     <target name="touch-failures-file" if="test.failures">

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.drl Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86.ibm Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.drl Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.linux.x86_64.ibm Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.drl Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86.ibm Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.drl Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/exclude.windows.x86_64.ibm Sat Jan  6 12:16:29 2007
@@ -0,0 +1 @@
+org/apache/harmony/pack200/tests/SegmentTest.java
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayout.java Sat Jan  6 12:16:29 2007
@@ -14,13 +14,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 
 // NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 // NOTE: Do not extract strings as messages; this code is still a
 // work-in-progress
 // NOTE: Also, don't get rid of 'else' statements for the hell of it ...
-import org.apache.harmony.archive.internal.pack200.Segment.SegmentConstantPool;
+import org.apache.harmony.pack200.Segment.SegmentConstantPool;
 
 public class AttributeLayout {
 	static class Key {

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayoutMap.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayoutMap.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayoutMap.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/AttributeLayoutMap.java Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

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?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- 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 Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

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?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- 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 Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

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?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- 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 Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Adapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Adapter.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Adapter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Adapter.java Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200PackerAdapter.java Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200UnpackerAdapter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200UnpackerAdapter.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200UnpackerAdapter.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200UnpackerAdapter.java Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 
 // NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 // NOTE: Do not extract strings as messages; this code is still a

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?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- 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 Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

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?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- 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 Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/Segment.java Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 
 // NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 // NOTE: Do not extract strings as messages; this code is still a
@@ -31,16 +31,16 @@
 import java.util.jar.JarOutputStream;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.harmony.archive.internal.pack200.bytecode.Attribute;
-import org.apache.harmony.archive.internal.pack200.bytecode.CPClass;
-import org.apache.harmony.archive.internal.pack200.bytecode.CPField;
-import org.apache.harmony.archive.internal.pack200.bytecode.CPMethod;
-import org.apache.harmony.archive.internal.pack200.bytecode.ClassConstantPool;
-import org.apache.harmony.archive.internal.pack200.bytecode.ClassFile;
-import org.apache.harmony.archive.internal.pack200.bytecode.ClassFileEntry;
-import org.apache.harmony.archive.internal.pack200.bytecode.ConstantValueAttribute;
-import org.apache.harmony.archive.internal.pack200.bytecode.ExceptionsAttribute;
-import org.apache.harmony.archive.internal.pack200.bytecode.SourceFileAttribute;
+import org.apache.harmony.pack200.bytecode.Attribute;
+import org.apache.harmony.pack200.bytecode.CPClass;
+import org.apache.harmony.pack200.bytecode.CPField;
+import org.apache.harmony.pack200.bytecode.CPMethod;
+import org.apache.harmony.pack200.bytecode.ClassConstantPool;
+import org.apache.harmony.pack200.bytecode.ClassFile;
+import org.apache.harmony.pack200.bytecode.ClassFileEntry;
+import org.apache.harmony.pack200.bytecode.ConstantValueAttribute;
+import org.apache.harmony.pack200.bytecode.ExceptionsAttribute;
+import org.apache.harmony.pack200.bytecode.SourceFileAttribute;
 
 /**
  * A Pack200 archive consists of one (or more) segments. Each segment is

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentOptions.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentOptions.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentOptions.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/SegmentOptions.java Sat Jan  6 12:16:29 2007
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.harmony.archive.internal.pack200;
+package org.apache.harmony.pack200;
 //NOTE: Do not use generics in this code; it needs to run on JVMs < 1.5
 //NOTE: Do not extract strings as messages; this code is still a work-in-progress
 //NOTE: Also, don't get rid of 'else' statements for the hell of it ...

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java Sat Jan  6 12:16:29 2007
@@ -1,78 +1,78 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-
-public abstract class Attribute extends ClassFileEntry {
-	private CPUTF8 attributeName;
-
-	private int attributeNameIndex;
-
-	public Attribute(String attributeName) {
-		this.attributeName = new CPUTF8(attributeName);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (this.getClass() != obj.getClass())
-			return false;
-		final Attribute other = (Attribute) obj;
-		if (attributeName == null) {
-			if (other.attributeName != null)
-				return false;
-		} else if (!attributeName.equals(other.attributeName))
-			return false;
-		return true;
-	}
-
-	protected CPUTF8 getAttributeName() {
-		return attributeName;
-	}
-
-	protected abstract int getLength();
-
-	@Override
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = PRIME * result
-				+ ((attributeName == null) ? 0 : attributeName.hashCode());
-		return result;
-	}
-
-	protected void resolve(ClassConstantPool pool) {
-		super.resolve(pool);
-		attributeNameIndex = pool.indexOf(attributeName);
-	}
-
-	protected void doWrite(DataOutputStream dos) throws IOException {
-		dos.writeShort(attributeNameIndex);
-		dos.writeInt(getLength());
-		writeBody(dos);
-	}
-
-	protected abstract void writeBody(DataOutputStream dos)
-			throws IOException;
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+
+public abstract class Attribute extends ClassFileEntry {
+	private CPUTF8 attributeName;
+
+	private int attributeNameIndex;
+
+	public Attribute(String attributeName) {
+		this.attributeName = new CPUTF8(attributeName);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (this.getClass() != obj.getClass())
+			return false;
+		final Attribute other = (Attribute) obj;
+		if (attributeName == null) {
+			if (other.attributeName != null)
+				return false;
+		} else if (!attributeName.equals(other.attributeName))
+			return false;
+		return true;
+	}
+
+	protected CPUTF8 getAttributeName() {
+		return attributeName;
+	}
+
+	protected abstract int getLength();
+
+	@Override
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = PRIME * result
+				+ ((attributeName == null) ? 0 : attributeName.hashCode());
+		return result;
+	}
+
+	protected void resolve(ClassConstantPool pool) {
+		super.resolve(pool);
+		attributeNameIndex = pool.indexOf(attributeName);
+	}
+
+	protected void doWrite(DataOutputStream dos) throws IOException {
+		dos.writeShort(attributeNameIndex);
+		dos.writeInt(getLength());
+		writeBody(dos);
+	}
+
+	protected abstract void writeBody(DataOutputStream dos)
+			throws IOException;
+
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/Attribute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPClass.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPClass.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPClass.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPClass.java Sat Jan  6 12:16:29 2007
@@ -1,83 +1,83 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-
-public class CPClass extends ConstantPoolEntry {
-	private int index;
-
-	public String name;
-
-	private CPUTF8 utf8;
-
-	public   CPClass(String name) {
-		super(ConstantPoolEntry.CP_Class);
-		this.name = name;
-		this.utf8 = new CPUTF8(name);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (this.getClass() != obj.getClass())
-			return false;
-		final CPClass other = (CPClass) obj;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (utf8 == null) {
-			if (other.utf8 != null)
-				return false;
-		} else if (!utf8.equals(other.utf8))
-			return false;
-		return true;
-	}
-
-	protected ClassFileEntry[] getNestedClassFileEntries() {
-		return new ClassFileEntry[] { utf8, };
-	}
-
-	@Override
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = PRIME * result + ((name == null) ? 0 : name.hashCode());
-		result = PRIME * result + ((utf8 == null) ? 0 : utf8.hashCode());
-		return result;
-	}
-
-	protected void resolve(ClassConstantPool pool) {
-		super.resolve(pool);
-		index = pool.indexOf(utf8);
-	}
-
-	public String toString() {
-		return "Class: " + name;
-	}
-
-	protected void writeBody(DataOutputStream dos) throws IOException {
-		dos.writeShort(index);
-	}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+
+public class CPClass extends ConstantPoolEntry {
+	private int index;
+
+	public String name;
+
+	private CPUTF8 utf8;
+
+	public   CPClass(String name) {
+		super(ConstantPoolEntry.CP_Class);
+		this.name = name;
+		this.utf8 = new CPUTF8(name);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (this.getClass() != obj.getClass())
+			return false;
+		final CPClass other = (CPClass) obj;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		if (utf8 == null) {
+			if (other.utf8 != null)
+				return false;
+		} else if (!utf8.equals(other.utf8))
+			return false;
+		return true;
+	}
+
+	protected ClassFileEntry[] getNestedClassFileEntries() {
+		return new ClassFileEntry[] { utf8, };
+	}
+
+	@Override
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = PRIME * result + ((name == null) ? 0 : name.hashCode());
+		result = PRIME * result + ((utf8 == null) ? 0 : utf8.hashCode());
+		return result;
+	}
+
+	protected void resolve(ClassConstantPool pool) {
+		super.resolve(pool);
+		index = pool.indexOf(utf8);
+	}
+
+	public String toString() {
+		return "Class: " + name;
+	}
+
+	protected void writeBody(DataOutputStream dos) throws IOException {
+		dos.writeShort(index);
+	}
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstant.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstant.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstant.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstant.java Sat Jan  6 12:16:29 2007
@@ -1,43 +1,59 @@
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-
-public abstract class CPConstant extends ConstantPoolEntry {
-
-	private Object value;
-
-	public CPConstant(byte tag, Object value) {
-		super(tag);
-		this.value = value;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (this.getClass() != obj.getClass())
-			return false;
-		final CPConstant other = (CPConstant) obj;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
-		return true;
-	}
-
-	@Override
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = PRIME * result + ((value == null) ? 0 : value.hashCode());
-		return result;
-	}
-	protected Object getValue() {
-		return value;
-	}
-
-
-
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+
+public abstract class CPConstant extends ConstantPoolEntry {
+
+	private Object value;
+
+	public CPConstant(byte tag, Object value) {
+		super(tag);
+		this.value = value;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (this.getClass() != obj.getClass())
+			return false;
+		final CPConstant other = (CPConstant) obj;
+		if (value == null) {
+			if (other.value != null)
+				return false;
+		} else if (!value.equals(other.value))
+			return false;
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = PRIME * result + ((value == null) ? 0 : value.hashCode());
+		return result;
+	}
+	protected Object getValue() {
+		return value;
+	}
+
+
+
+}

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstant.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstantNumber.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstantNumber.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstantNumber.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstantNumber.java Sat Jan  6 12:16:29 2007
@@ -1,15 +1,31 @@
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-
-public abstract class CPConstantNumber extends CPConstant {
-
-	public CPConstantNumber(byte tag, Object value) {
-		super(tag, value);
-	}
-
-	protected Number getNumber() {
-		return (Number)getValue();
-	}
-
-
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+
+public abstract class CPConstantNumber extends CPConstant {
+
+	public CPConstantNumber(byte tag, Object value) {
+		super(tag, value);
+	}
+
+	protected Number getNumber() {
+		return (Number)getValue();
+	}
+
+
+}

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPConstantNumber.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPDouble.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPDouble.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPDouble.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPDouble.java Sat Jan  6 12:16:29 2007
@@ -1,37 +1,37 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class CPDouble extends CPConstantNumber {
-	public CPDouble(java.lang.Double value) {
-		super(ConstantPoolEntry.CP_Double,value);
-	}
-
-	@Override
-	protected void writeBody(DataOutputStream dos) throws IOException {
-		dos.writeDouble(getNumber().doubleValue());
-	}
-
-	@Override
-	public String toString() {
-		return "Double: " + getValue();
-	}
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class CPDouble extends CPConstantNumber {
+	public CPDouble(java.lang.Double value) {
+		super(ConstantPoolEntry.CP_Double,value);
+	}
+
+	@Override
+	protected void writeBody(DataOutputStream dos) throws IOException {
+		dos.writeDouble(getNumber().doubleValue());
+	}
+
+	@Override
+	public String toString() {
+		return "Double: " + getValue();
+	}
+
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPDouble.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPField.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPField.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPField.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPField.java Sat Jan  6 12:16:29 2007
@@ -1,11 +1,27 @@
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.util.List;
-
-public class CPField extends CPMember {
-
-	public CPField(String descriptor, long flags, List attributes) {
-		super(descriptor, flags, attributes);
-	}
-
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.util.List;
+
+public class CPField extends CPMember {
+
+	public CPField(String descriptor, long flags, List attributes) {
+		super(descriptor, flags, attributes);
+	}
+
+}

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPField.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java Sat Jan  6 12:16:29 2007
@@ -1,97 +1,97 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-
-public class CPFieldRef extends ConstantPoolEntry {
-
-	CPClass className;
-	transient int classNameIndex;
-
-
-	private CPNameAndType nameAndType;
-	transient int nameAndTypeIndex;
-	public CPFieldRef(String className, String descriptor) {
-		super(ConstantPoolEntry.CP_Fieldref);
-		this.className = new CPClass(className);
-		this.nameAndType = new CPNameAndType(descriptor);
-	}
-
-
-	@Override
-	protected ClassFileEntry[] getNestedClassFileEntries() {
-		ClassFileEntry[] entries = new ClassFileEntry[2];
-		entries[0] = className;
-		entries[1] = nameAndType;
-		return entries;
-	}
-
-
-	@Override
-	protected void resolve(ClassConstantPool pool) {
-		super.resolve(pool);
-		nameAndTypeIndex = pool.indexOf(nameAndType);
-		classNameIndex = pool.indexOf(className);
-	}
-
-	protected void writeBody(DataOutputStream dos) throws IOException {
-		dos.writeShort(classNameIndex);
-		dos.writeShort(nameAndTypeIndex);
-	}
-
-	@Override
-	public String toString() {
-		return "FieldRef: " + className + "#" + nameAndType;
-	}
-
-
-	@Override
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = PRIME * result + ((className == null) ? 0 : className.hashCode());
-		result = PRIME * result + ((nameAndType == null) ? 0 : nameAndType.hashCode());
-		return result;
-	}
-
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		final CPFieldRef other = (CPFieldRef) obj;
-		if (className == null) {
-			if (other.className != null)
-				return false;
-		} else if (!className.equals(other.className))
-			return false;
-		if (nameAndType == null) {
-			if (other.nameAndType != null)
-				return false;
-		} else if (!nameAndType.equals(other.nameAndType))
-			return false;
-		return true;
-	}
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+
+public class CPFieldRef extends ConstantPoolEntry {
+
+	CPClass className;
+	transient int classNameIndex;
+
+
+	private CPNameAndType nameAndType;
+	transient int nameAndTypeIndex;
+	public CPFieldRef(String className, String descriptor) {
+		super(ConstantPoolEntry.CP_Fieldref);
+		this.className = new CPClass(className);
+		this.nameAndType = new CPNameAndType(descriptor);
+	}
+
+
+	@Override
+	protected ClassFileEntry[] getNestedClassFileEntries() {
+		ClassFileEntry[] entries = new ClassFileEntry[2];
+		entries[0] = className;
+		entries[1] = nameAndType;
+		return entries;
+	}
+
+
+	@Override
+	protected void resolve(ClassConstantPool pool) {
+		super.resolve(pool);
+		nameAndTypeIndex = pool.indexOf(nameAndType);
+		classNameIndex = pool.indexOf(className);
+	}
+
+	protected void writeBody(DataOutputStream dos) throws IOException {
+		dos.writeShort(classNameIndex);
+		dos.writeShort(nameAndTypeIndex);
+	}
+
+	@Override
+	public String toString() {
+		return "FieldRef: " + className + "#" + nameAndType;
+	}
+
+
+	@Override
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = PRIME * result + ((className == null) ? 0 : className.hashCode());
+		result = PRIME * result + ((nameAndType == null) ? 0 : nameAndType.hashCode());
+		return result;
+	}
+
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		final CPFieldRef other = (CPFieldRef) obj;
+		if (className == null) {
+			if (other.className != null)
+				return false;
+		} else if (!className.equals(other.className))
+			return false;
+		if (nameAndType == null) {
+			if (other.nameAndType != null)
+				return false;
+		} else if (!nameAndType.equals(other.nameAndType))
+			return false;
+		return true;
+	}
+
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFieldRef.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFloat.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFloat.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFloat.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFloat.java Sat Jan  6 12:16:29 2007
@@ -1,37 +1,37 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class CPFloat extends CPConstantNumber {
-	public CPFloat(java.lang.Float value) {
-		super(ConstantPoolEntry.CP_Float,value);
-	}
-
-	@Override
-	protected void writeBody(DataOutputStream dos) throws IOException {
-		dos.writeFloat(getNumber().floatValue());
-	}
-
-	@Override
-	public String toString() {
-		return "Float: " + getValue();
-	}
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class CPFloat extends CPConstantNumber {
+	public CPFloat(java.lang.Float value) {
+		super(ConstantPoolEntry.CP_Float,value);
+	}
+
+	@Override
+	protected void writeBody(DataOutputStream dos) throws IOException {
+		dos.writeFloat(getNumber().floatValue());
+	}
+
+	@Override
+	public String toString() {
+		return "Float: " + getValue();
+	}
+
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPFloat.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInteger.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInteger.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInteger.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInteger.java Sat Jan  6 12:16:29 2007
@@ -1,38 +1,38 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class CPInteger extends CPConstantNumber {
-
-	public CPInteger(java.lang.Integer value) {
-		super(ConstantPoolEntry.CP_Integer,value);
-	}
-
-	@Override
-	protected void writeBody(DataOutputStream dos) throws IOException {
-		dos.writeInt(getNumber().intValue());
-	}
-
-	@Override
-	public String toString() {
-		return "Integer: " + getValue();
-	}
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class CPInteger extends CPConstantNumber {
+
+	public CPInteger(java.lang.Integer value) {
+		super(ConstantPoolEntry.CP_Integer,value);
+	}
+
+	@Override
+	protected void writeBody(DataOutputStream dos) throws IOException {
+		dos.writeInt(getNumber().intValue());
+	}
+
+	@Override
+	public String toString() {
+		return "Integer: " + getValue();
+	}
+
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPInteger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPLong.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPLong.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPLong.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPLong.java Sat Jan  6 12:16:29 2007
@@ -1,38 +1,38 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class CPLong extends CPConstantNumber {
-
-	public CPLong(java.lang.Long value) {
-		super(ConstantPoolEntry.CP_Long,value);
-	}
-
-	@Override
-	protected void writeBody(DataOutputStream dos) throws IOException {
-		dos.writeLong(getNumber().longValue());
-	}
-
-	@Override
-	public String toString() {
-		return "Long: " + getValue();
-	}
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class CPLong extends CPConstantNumber {
+
+	public CPLong(java.lang.Long value) {
+		super(ConstantPoolEntry.CP_Long,value);
+	}
+
+	@Override
+	protected void writeBody(DataOutputStream dos) throws IOException {
+		dos.writeLong(getNumber().longValue());
+	}
+
+	@Override
+	public String toString() {
+		return "Long: " + getValue();
+	}
+
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPLong.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMember.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMember.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMember.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMember.java Sat Jan  6 12:16:29 2007
@@ -1,133 +1,133 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-
-public class CPMember extends ClassFileEntry {
-
-	List attributes;
-
-
-	short flags;
-
-	CPUTF8 name;
-	transient int nameIndex;
-
-
-	private CPUTF8 descriptor;
-	transient int descriptorIndex;
-	public CPMember(String descriptor, long flags, List attributes) {
-		int colon = descriptor.indexOf(':');
-		this.name = new CPUTF8(descriptor.substring(0,colon));
-		this.descriptor = new CPUTF8(descriptor.substring(colon+1));
-		this.flags = (short) flags;
-		this.attributes = (attributes == null ? new ArrayList() : attributes);
-	}
-
-
-	@Override
-	protected ClassFileEntry[] getNestedClassFileEntries() {
-		int attributeCount = attributes.size();
-		ClassFileEntry[] entries = new ClassFileEntry[attributeCount+2];
-		entries[0] = name;
-		entries[1] = descriptor;
-		for (int i = 0; i < attributeCount; i++) {
-			entries[i+2] = (Attribute) attributes.get(i);
-		}
-		return entries;
-	}
-
-
-	@Override
-	protected void resolve(ClassConstantPool pool) {
-		super.resolve(pool);
-		nameIndex = pool.indexOf(name);
-		descriptorIndex = pool.indexOf(descriptor);
-		for (Iterator it = attributes.iterator(); it.hasNext();) {
-			Attribute attribute = (Attribute) it.next();
-			attribute.resolve(pool);
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "Field: " + name + "(" + descriptor + ")";
-	}
-
-	@Override
-	public int hashCode() {
-		final int PRIME = 31;
-		int result = 1;
-		result = PRIME * result + ((attributes == null) ? 0 : attributes.hashCode());
-		result = PRIME * result + ((descriptor == null) ? 0 : descriptor.hashCode());
-		result = PRIME * result + flags;
-		result = PRIME * result + ((name == null) ? 0 : name.hashCode());
-		return result;
-	}
-
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		final CPMember other = (CPMember) obj;
-		if (attributes == null) {
-			if (other.attributes != null)
-				return false;
-		} else if (!attributes.equals(other.attributes))
-			return false;
-		if (descriptor == null) {
-			if (other.descriptor != null)
-				return false;
-		} else if (!descriptor.equals(other.descriptor))
-			return false;
-		if (flags != other.flags)
-			return false;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		return true;
-	}
-
-
-	@Override
-	protected void doWrite(DataOutputStream dos) throws IOException {
-		dos.writeShort(flags);
-		dos.writeShort(nameIndex);
-		dos.writeShort(descriptorIndex);
-    	int attributeCount = attributes.size();
-		dos.writeShort(attributeCount);
-		for (int i = 0; i < attributeCount; i++) {
-			Attribute attribute = (Attribute) attributes.get(i);
-			attribute.doWrite(dos);
-		}
-		
-	}
-
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+public class CPMember extends ClassFileEntry {
+
+	List attributes;
+
+
+	short flags;
+
+	CPUTF8 name;
+	transient int nameIndex;
+
+
+	private CPUTF8 descriptor;
+	transient int descriptorIndex;
+	public CPMember(String descriptor, long flags, List attributes) {
+		int colon = descriptor.indexOf(':');
+		this.name = new CPUTF8(descriptor.substring(0,colon));
+		this.descriptor = new CPUTF8(descriptor.substring(colon+1));
+		this.flags = (short) flags;
+		this.attributes = (attributes == null ? new ArrayList() : attributes);
+	}
+
+
+	@Override
+	protected ClassFileEntry[] getNestedClassFileEntries() {
+		int attributeCount = attributes.size();
+		ClassFileEntry[] entries = new ClassFileEntry[attributeCount+2];
+		entries[0] = name;
+		entries[1] = descriptor;
+		for (int i = 0; i < attributeCount; i++) {
+			entries[i+2] = (Attribute) attributes.get(i);
+		}
+		return entries;
+	}
+
+
+	@Override
+	protected void resolve(ClassConstantPool pool) {
+		super.resolve(pool);
+		nameIndex = pool.indexOf(name);
+		descriptorIndex = pool.indexOf(descriptor);
+		for (Iterator it = attributes.iterator(); it.hasNext();) {
+			Attribute attribute = (Attribute) it.next();
+			attribute.resolve(pool);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "Field: " + name + "(" + descriptor + ")";
+	}
+
+	@Override
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = PRIME * result + ((attributes == null) ? 0 : attributes.hashCode());
+		result = PRIME * result + ((descriptor == null) ? 0 : descriptor.hashCode());
+		result = PRIME * result + flags;
+		result = PRIME * result + ((name == null) ? 0 : name.hashCode());
+		return result;
+	}
+
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		final CPMember other = (CPMember) obj;
+		if (attributes == null) {
+			if (other.attributes != null)
+				return false;
+		} else if (!attributes.equals(other.attributes))
+			return false;
+		if (descriptor == null) {
+			if (other.descriptor != null)
+				return false;
+		} else if (!descriptor.equals(other.descriptor))
+			return false;
+		if (flags != other.flags)
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		return true;
+	}
+
+
+	@Override
+	protected void doWrite(DataOutputStream dos) throws IOException {
+		dos.writeShort(flags);
+		dos.writeShort(nameIndex);
+		dos.writeShort(descriptorIndex);
+    	int attributeCount = attributes.size();
+		dos.writeShort(attributeCount);
+		for (int i = 0; i < attributeCount; i++) {
+			Attribute attribute = (Attribute) attributes.get(i);
+			attribute.doWrite(dos);
+		}
+		
+	}
+
 }

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMember.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMethod.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMethod.java?view=diff&rev=493560&r1=493559&r2=493560
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMethod.java (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMethod.java Sat Jan  6 12:16:29 2007
@@ -1,11 +1,27 @@
-package org.apache.harmony.archive.internal.pack200.bytecode;
-
-import java.util.List;
-
-public class CPMethod extends CPMember {
-
-	public CPMethod(String descriptor, long flags, List attributes) {
-		super(descriptor, flags, attributes);
-	}
-
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.harmony.pack200.bytecode;
+
+import java.util.List;
+
+public class CPMethod extends CPMember {
+
+	public CPMethod(String descriptor, long flags, List attributes) {
+		super(descriptor, flags, attributes);
+	}
+
+}

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/bytecode/CPMethod.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message