Author: bodewig
Date: Fri Jul 22 13:20:25 2011
New Revision: 1149599
URL: http://svn.apache.org/viewvc?rev=1149599&view=rev
Log:
remove all zip64 parts I've started to implement from the codepaths that are
actually being used
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
(props changed)
commons/proper/compress/trunk/src/test/resources/OSX_ArchiveWithNestedArchive.zip
(props changed)
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java?rev=1149599&r1=1149598&r2=1149599&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
Fri Jul 22 13:20:25 2011
@@ -43,7 +43,6 @@ public class ExtraFieldUtils {
register(JarMarker.class);
register(UnicodePathExtraField.class);
register(UnicodeCommentExtraField.class);
- register(Zip64ExtendedInformationExtraField.class);
}
/**
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=1149599&r1=1149598&r2=1149599&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Fri Jul 22 13:20:25 2011
@@ -68,14 +68,6 @@ public class ZipArchiveEntry extends jav
*/
private int method = -1;
- /**
- * The {@link java.util.zip.ZipEntry#setSize} method in the base
- * class throws an IllegalArgumentException if the size is bigger
- * than 2GB for Java versions < 7. Need to keep our own size
- * information for Zip64 support.
- */
- private long size = SIZE_UNKNOWN;
-
private int internalAttributes = 0;
private int platform = PLATFORM_FAT;
private long externalAttributes = 0;
@@ -119,7 +111,6 @@ public class ZipArchiveEntry extends jav
setExtra();
}
setMethod(entry.getMethod());
- this.size = entry.getSize();
}
/**
@@ -505,27 +496,6 @@ public class ZipArchiveEntry extends jav
}
/**
- * Gets the uncompressed size of the entry data.
- * @return the entry size
- */
- public long getSize() {
- return size;
- }
-
- /**
- * Sets the uncompressed size of the entry data.
- * @param size the uncompressed size in bytes
- * @exception IllegalArgumentException if the specified size is less
- * than 0
- */
- public void setSize(long size) {
- if (size < 0) {
- throw new IllegalArgumentException("invalid entry size");
- }
- this.size = size;
- }
-
- /**
* Get the hashCode of the entry.
* This uses the name as the hashcode.
* @return a hashcode.
Propchange:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
('svn:mergeinfo' removed)
Propchange:
commons/proper/compress/trunk/src/test/resources/OSX_ArchiveWithNestedArchive.zip
('svn:mergeinfo' removed)
