svn commit: r1152093 - in /commons/proper/compress/branches/zip64/src: main/java/org/apache/commons/compress/archivers/zip/ test/java/org/apache/commons/compress/archivers/zip/

[bodewig]

Author: bodewig
Date: Fri Jul 29 04:01:05 2011
New Revision: 1152093

URL: http://svn.apache.org/viewvc?rev=1152093&view=rev
Log:
shuffling some code around

Modified:
    
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
    
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
    
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
    
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java

Modified: 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=1152093&r1=1152092&r2=1152093&view=diff
==============================================================================
--- 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
 (original)
+++ 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
 Fri Jul 29 04:01:05 2011
@@ -24,7 +24,6 @@ import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;

Modified: 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java?rev=1152093&r1=1152092&r2=1152093&view=diff
==============================================================================
--- 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
 (original)
+++ 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipLong.java
 Fri Jul 29 04:01:05 2011
@@ -60,7 +60,7 @@ public final class ZipLong implements Cl
      * used.
      * @since Apache Commons Compress 1.3
      */
-    static final ZipLong ZIP64_MAGIC = new ZipLong(0xFFFFFFFFL);
+    static final ZipLong ZIP64_MAGIC = new ZipLong(ZipConstants.ZIP64_MAGIC);
 
     /**
      * Create instance from a number.

Modified: 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java?rev=1152093&r1=1152092&r2=1152093&view=diff
==============================================================================
--- 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
 (original)
+++ 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipShort.java
 Fri Jul 29 04:01:05 2011
@@ -31,13 +31,6 @@ public final class ZipShort implements C
     private final int value;
 
     /**
-     * Value stored in size and similar fields if ZIP64 extensions are
-     * used.
-     * @since Apache Commons Compress 1.3
-     */
-    static final ZipShort ZIP64_MAGIC = new ZipShort(0xFFFF);
-
-    /**
      * Create instance from a number.
      * @param value the int to store as a ZipShort
      */

Modified: 
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java?rev=1152093&r1=1152092&r2=1152093&view=diff
==============================================================================
--- 
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
 (original)
+++ 
commons/proper/compress/branches/zip64/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportTest.java
 Fri Jul 29 04:01:05 2011
@@ -33,22 +33,6 @@ import static org.junit.Assume.assumeTru
 
 public class Zip64SupportTest {
 
-    private static File getFile(String name) throws Throwable {
-        URL url = Zip64SupportTest.class.getResource(name);
-        assumeNotNull(url);
-        File file = new File(new URI(url.toString()));
-        assumeTrue(file.exists());
-        return file;
-    }
-
-    private static File get5GBZerosFile() throws Throwable {
-        return getFile("/5GB_of_Zeros.zip");
-    }
-
-    private static File get100KFileFile() throws Throwable {
-        return getFile("/100k_Files.zip");
-    }
-
     private static final long FIVE_BILLION = 5000000000l;
     private static final int ONE_HUNDRED_THOUSAND = 100000;
 
@@ -143,6 +127,22 @@ public class Zip64SupportTest {
         }
     }
 
+    private static File getFile(String name) throws Throwable {
+        URL url = Zip64SupportTest.class.getResource(name);
+        assumeNotNull(url);
+        File file = new File(new URI(url.toString()));
+        assumeTrue(file.exists());
+        return file;
+    }
+
+    private static File get5GBZerosFile() throws Throwable {
+        return getFile("/5GB_of_Zeros.zip");
+    }
+
+    private static File get100KFileFile() throws Throwable {
+        return getFile("/100k_Files.zip");
+    }
+
     private static File getTempFile(String testName) throws Throwable {
         File f = File.createTempFile("commons-compress-" + testName, ".zip");
         f.deleteOnExit();