move canRead/canWrite up. Remove isSupportedCompressionMethod. COMPRESS-93
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/trunk@911795 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index a8e4318..71580ef 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -196,10 +196,14 @@
* compression method that hasn't been implemented yet.</p>
* @since Apache Commons Compress 1.1
*/
- public boolean canRead(ZipArchiveEntry ze) {
- return !ze.isEncrypted() &&
- (ze.getMethod() == ZipArchiveEntry.STORED
- || ze.getMethod() == ZipArchiveEntry.DEFLATED);
+ public boolean canRead(ArchiveEntry ae) {
+ if (ae instanceof ZipArchiveEntry) {
+ ZipArchiveEntry ze = (ZipArchiveEntry) ae;
+ return !ze.isEncrypted() &&
+ (ze.getMethod() == ZipArchiveEntry.STORED
+ || ze.getMethod() == ZipArchiveEntry.DEFLATED);
+ }
+ return super.canRead(ae);
}
public int read(byte[] buffer, int start, int length) throws IOException {