PatchSet 4126
Date: 2003/10/27 02:12:57
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixes for java.util.zip to prepare merge of java.util.jar from GNU Classpath
Members:
ChangeLog:1.1718->1.1719
libraries/javalib/java/util/zip/ZipFile.java:1.11->1.12
libraries/javalib/java/util/zip/ZipInputStream.java:1.17->1.18
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1718 kaffe/ChangeLog:1.1719
--- kaffe/ChangeLog:1.1718 Sat Oct 25 20:00:11 2003
+++ kaffe/ChangeLog Mon Oct 27 02:12:57 2003
@@ -1,3 +1,11 @@
+2003-10-26 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * libraries/javalib/java/util/zip/ZipFile.java
+ (ZipFile(File f, int mode)): New (dummy) method.
+ * libraries/javalib/java/util/zip/ZipInputStream.java
+ (getNextEntry): Use createZipEntry().
+ (createZipEntry): Implement.
+
2003-10-25 Dalibor Topic <[EMAIL PROTECTED]>
* FAQ/FAQ.automake: Recommend autmake 1.7.8.
Index: kaffe/libraries/javalib/java/util/zip/ZipFile.java
diff -u kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.11
kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.12
--- kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.11 Mon Sep 29 23:50:26
2003
+++ kaffe/libraries/javalib/java/util/zip/ZipFile.java Mon Oct 27 02:12:59 2003
@@ -51,6 +51,12 @@
this(f.getPath());
}
+public ZipFile(File f, int mode) throws ZipException, IOException
+{
+ // XXX ignoring mode for now
+ this(f);
+}
+
public void close() throws IOException
{
if (zip != null) {
Index: kaffe/libraries/javalib/java/util/zip/ZipInputStream.java
diff -u kaffe/libraries/javalib/java/util/zip/ZipInputStream.java:1.17
kaffe/libraries/javalib/java/util/zip/ZipInputStream.java:1.18
--- kaffe/libraries/javalib/java/util/zip/ZipInputStream.java:1.17 Fri Oct 24
16:42:11 2003
+++ kaffe/libraries/javalib/java/util/zip/ZipInputStream.java Mon Oct 27 02:12:59
2003
@@ -63,7 +63,7 @@
readFully(extra, 0, extra.length);
// Setup new entry
- entry = new ZipEntry(UTF8.decode(nameBuf));
+ entry = createZipEntry(UTF8.decode(nameBuf));
entry.version = get16(zheader, LOCVER);
entry.flag = get16(zheader, LOCFLG);
@@ -211,8 +211,7 @@
}
protected ZipEntry createZipEntry(String name) {
- // XXX FIXME what is this supposed to do?
- return null;
+ return new ZipEntry(name);
}
}
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
