implement jar and file URL stream handlers

classpath/java/util/zip/ZipFile.java

@@ -63,13 +63,23 @@ public class ZipFile {
     return index.size();
   }
 
+  protected Enumeration<? extends ZipEntry> makeEnumeration
+    (EntryFactory factory)
+  {
+    return new MyEnumeration(factory, window, index.values().iterator());
+  }
+
   public Enumeration<? extends ZipEntry> entries() {
-    return new MyEnumeration(window, index.values().iterator());
+    return makeEnumeration(ZipEntryFactory.Instance);
+  }
+
+  protected ZipEntry getEntry(EntryFactory factory, String name) {
+    Integer pointer = index.get(name);
+    return (pointer == null ? null : factory.makeEntry(window, pointer));
   }
 
   public ZipEntry getEntry(String name) {
-    Integer pointer = index.get(name);
-    return (pointer == null ? null : new MyZipEntry(window, pointer));
+    return getEntry(ZipEntryFactory.Instance, name);
   }
 
   public InputStream getInputStream(ZipEntry entry) throws IOException {
@@ -126,7 +136,7 @@ public class ZipFile {
     return get2(w, p + 28);
   }
 
-  private static String entryName(Window w, int p) throws IOException {
+  protected static String entryName(Window w, int p) throws IOException {
     int length = entryNameLength(w, p);
     return new String(w.data, w.seek(p + 46, length), length);
   }
@@ -135,10 +145,14 @@ public class ZipFile {
     return get2(w, p + 10);
   }
 
-  private static int compressedSize(Window w, int p) throws IOException {
+  protected static int compressedSize(Window w, int p) throws IOException {
     return get4(w, p + 20);
   }
 
+  protected static int uncompressedSize(Window w, int p) throws IOException {
+    return get4(w, p + 24);
+  }
+
   private static int fileNameLength(Window w, int p) throws IOException {
     return get2(w, p + 28);
   }
@@ -186,7 +200,7 @@ public class ZipFile {
     file.close();
   }
 
-  private static class Window {
+  protected static class Window {
     private final RandomAccessFile file;
     public final byte[] data;
     public int start;
@@ -255,13 +269,37 @@ public class ZipFile {
         return 0;
       }
     }
+
+    public int getSize() {
+      try {
+        return uncompressedSize(window, pointer);
+      } catch (IOException e) {
+        return 0;
+      }
+    }
+  }
+
+  protected interface EntryFactory {
+    public ZipEntry makeEntry(Window window, int pointer);
+  }
+
+  private static class ZipEntryFactory implements EntryFactory {
+    public static final ZipEntryFactory Instance = new ZipEntryFactory();
+
+    public ZipEntry makeEntry(Window window, int pointer) {
+      return new MyZipEntry(window, pointer);
+    }
   }
 
   private static class MyEnumeration implements Enumeration<ZipEntry> {
+    private final EntryFactory factory;
     private final Window window;
     private final Iterator<Integer> iterator;
 
-    public MyEnumeration(Window window, Iterator<Integer> iterator) {
+    public MyEnumeration(EntryFactory factory, Window window,
+                         Iterator<Integer> iterator)
+    {
+      this.factory = factory;
       this.window = window;
       this.iterator = iterator;
     }
@@ -271,7 +309,7 @@ public class ZipFile {
     }
 
     public ZipEntry nextElement() {
-      return new MyZipEntry(window, iterator.next());
+      return factory.makeEntry(window, iterator.next());
     }
   }