harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r996813 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/ classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ drlvm/ ...
Date Tue, 14 Sep 2010 10:24:23 GMT
Author: hindessm
Date: Tue Sep 14 10:24:22 2010
New Revision: 996813

URL: http://svn.apache.org/viewvc?rev=996813&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@996798:

  r996798 | sjanuary | 2010-09-14 09:55:24 +0100 (Tue, 14 Sep 2010) | 1 line
  
  Code cleanup - remove some unused methods and trailing whitespace


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
    harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:24:22 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687
+/harmony/enhanced/java/trunk:929253-996210,996457,996567,996687,996798
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:24:22 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687
+/harmony/enhanced/java/trunk/classlib:929253-996210,996457,996567,996687,996798
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:24:22 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-996210,996457,996567,996687,996798
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java?rev=996813&r1=996812&r2=996813&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Archive.java
Tue Sep 14 10:24:22 2010
@@ -146,7 +146,7 @@ public class Archive {
         List classes = new ArrayList();
         List files = new ArrayList();
         long segmentLimit = options.getSegmentLimit();
-        
+
         int size = packingFileList.size();
         PackingFile packingFile;
         for (int index = 0; index < size; index++) {
@@ -221,9 +221,9 @@ public class Archive {
 
     static class SegmentUnit {
 
-        private List classList;
+        private final List classList;
 
-        private List fileList;
+        private final List fileList;
 
         private int byteAmount = 0;
 
@@ -323,6 +323,10 @@ public class Archive {
         public boolean isDirectory(){
             return isDirectory;
         }
+
+        public String toString() {
+            return name;
+        }
     }
 
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java?rev=996813&r1=996812&r2=996813&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/CpBands.java
Tue Sep 14 10:24:22 2010
@@ -151,28 +151,28 @@ public class CpBands extends BandSet {
                 cpUtf8BigChars[i][j] = ((Character) bigChars.remove(0)).charValue();
             }
         }
-        
+
         byte[] encodedBand = encodeBandInt("cpUtf8Prefix", cpUtf8Prefix, Codec.DELTA5);
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
                 + " bytes from cpUtf8Prefix[" + cpUtf8Prefix.length + "]");
-        
+
         encodedBand = encodeBandInt("cpUtf8Suffix", cpUtf8Suffix, Codec.UNSIGNED5);
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
                 + " bytes from cpUtf8Suffix[" + cpUtf8Suffix.length + "]");
-        
+
         encodedBand = encodeBandInt("cpUtf8Chars", cpUtf8Chars, Codec.CHAR3);
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
                 + " bytes from cpUtf8Chars[" + cpUtf8Chars.length + "]");
-        
+
         encodedBand = encodeBandInt("cpUtf8BigSuffix", cpUtf8BigSuffix,
                 Codec.DELTA5);
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
                 + " bytes from cpUtf8BigSuffix[" + cpUtf8BigSuffix.length + "]");
-        
+
         for (int i = 0; i < cpUtf8BigChars.length; i++) {
             encodedBand = encodeBandInt("cpUtf8BigChars " + i,
                     cpUtf8BigChars[i], Codec.DELTA5);
@@ -238,7 +238,7 @@ public class CpBands extends BandSet {
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
                 + " bytes from cp_Long_hi[" + highBits.length + "]");
-        
+
         encodedBand = encodeBandInt("cp_Long_lo", loBits, Codec.DELTA5);
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
@@ -262,7 +262,7 @@ public class CpBands extends BandSet {
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
                 + " bytes from cp_Double_hi[" + highBits.length + "]");
-        
+
         encodedBand = encodeBandInt("cp_Double_lo", loBits, Codec.DELTA5);
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
@@ -317,13 +317,13 @@ public class CpBands extends BandSet {
         for (int j = 0; j < cpSignatureClasses.length; j++) {
             cpSignatureClasses[j] = ((CPClass) classes.get(j)).getIndex();
         }
-        
+
         byte[] encodedBand = encodeBandInt("cpSignatureForm", cpSignatureForm,
                 Codec.DELTA5);
         out.write(encodedBand);
         PackingUtils.log("Wrote " + encodedBand.length
                 + " bytes from cpSignatureForm[" + cpSignatureForm.length + "]");
-        
+
         encodedBand = encodeBandInt("cpSignatureClasses", cpSignatureClasses,
                 Codec.UDELTA5);
         out.write(encodedBand);

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java?rev=996813&r1=996812&r2=996813&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/pack200/Pack200Exception.java
Tue Sep 14 10:24:22 2010
@@ -33,26 +33,4 @@ public class Pack200Exception extends Ex
         super(message);
     }
 
-    /**
-     * Create a new Pack200 exception with the given message and cause
-     *
-     * @param message
-     *            the text message to display
-     * @param cause
-     *            the {@link Throwable} that caused this problem
-     */
-    public Pack200Exception(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Create a new Pack200 exception with the given cause
-     *
-     * @param cause
-     *            the {@link Throwable} that caused this problem
-     */
-    public Pack200Exception(Throwable cause) {
-        super(cause);
-    }
-
 }

Modified: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java?rev=996813&r1=996812&r2=996813&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/main/java/org/apache/harmony/unpack200/bytecode/ClassConstantPool.java
Tue Sep 14 10:24:22 2010
@@ -115,8 +115,6 @@ public class ClassConstantPool {
             // children now become parents
             parents.clear();
             parents.addAll(children);
-
-
         }
     }
 

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:24:22 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687
+/harmony/enhanced/java/trunk/drlvm:929253-996210,996457,996567,996687,996798
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 14 10:24:22 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687
+/harmony/enhanced/java/trunk/jdktools:929253-996210,996457,996567,996687,996798
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message