From c04ba3c6dd5d01bb8e01cddb96bdad308bc8c212 Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 26 Nov 2003 21:55:27 +0000 Subject: [PATCH] 2003-11-26 David Belanger * java/util/zip/ZipFile (Zipfile(File)): Set file path as name. (ZipFile(File,int)): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73965 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/java/util/zip/ZipFile.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 260c7ce..bf2ffae 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-11-26 David Belanger + + * java/util/zip/ZipFile (Zipfile(File)): Set file path as name. + (ZipFile(File,int)): Likewise. + 2003-11-26 Stuart Ballard * java/util/HashMap.java (putAll): Use Iterator hasNext() method. diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index b6bc541..50f489f 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -105,7 +105,7 @@ public class ZipFile implements ZipConstants public ZipFile(File file) throws ZipException, IOException { this.raf = new RandomAccessFile(file, "r"); - this.name = file.getName(); + this.name = file.getPath(); } /** @@ -134,7 +134,7 @@ public class ZipFile implements ZipConstants ("OPEN_DELETE mode not supported yet in java.util.zip.ZipFile"); } this.raf = new RandomAccessFile(file, "r"); - this.name = file.getName(); + this.name = file.getPath(); } /** @@ -438,7 +438,7 @@ public class ZipFile implements ZipConstants } /** - * Returns the name of this zip file. + * Returns the (path) name of this zip file. */ public String getName() { -- 2.7.4