This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.util.zip
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 17 Jun 2003 14:11:26 +0200
- Subject: FYI: Patch: java.util.zip
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to rework the import statements.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+7wVuWSOgCCdjSDsRAmx0AJ9Q7POSUMRm6KO9Mjwh9WbAY/Ih3QCdFqRC
c9nxn2j2n7OywEdOpobfhLk=
=X6DX
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1948
diff -u -b -B -r1.1948 ChangeLog
--- ChangeLog 17 Jun 2003 12:01:35 -0000 1.1948
+++ ChangeLog 17 Jun 2003 12:06:08 -0000
@@ -1,5 +1,13 @@
2003-06-17 Michael Koch <konqueror@gmx.de>
+ * java/util/zip/ZipEntry.java,
+ java/util/zip/ZipFile.java,
+ java/util/zip/ZipInputStream.java,
+ java/util/zip/ZipOutputStream.java:
+ Reworked imports, only import used classes.
+
+2003-06-17 Michael Koch <konqueror@gmx.de>
+
* gnu/java/lang/ArrayHelper.java,
gnu/java/lang/ClassHelper.java:
Reformatted to match classpath's versions.
Index: java/util/zip/ZipEntry.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/zip/ZipEntry.java,v
retrieving revision 1.17
diff -u -b -B -r1.17 ZipEntry.java
--- java/util/zip/ZipEntry.java 21 Feb 2003 16:56:58 -0000 1.17
+++ java/util/zip/ZipEntry.java 17 Jun 2003 12:06:08 -0000
@@ -35,9 +35,10 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.util.zip;
+
import java.util.Calendar;
-import java.util.TimeZone;
import java.util.Date;
/**
Index: java/util/zip/ZipFile.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/zip/ZipFile.java,v
retrieving revision 1.21
diff -u -b -B -r1.21 ZipFile.java
--- java/util/zip/ZipFile.java 21 Feb 2003 12:35:49 -0000 1.21
+++ java/util/zip/ZipFile.java 17 Jun 2003 12:06:08 -0000
@@ -38,9 +38,7 @@
package java.util.zip;
import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
import java.io.DataInput;
-import java.io.DataInputStream;
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
Index: java/util/zip/ZipInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/zip/ZipInputStream.java,v
retrieving revision 1.18
diff -u -b -B -r1.18 ZipInputStream.java
--- java/util/zip/ZipInputStream.java 12 Feb 2003 01:25:08 -0000 1.18
+++ java/util/zip/ZipInputStream.java 17 Jun 2003 12:06:08 -0000
@@ -39,7 +41,6 @@
import java.io.EOFException;
import java.io.InputStream;
import java.io.IOException;
-import java.util.Enumeration;
/**
* This is a FilterInputStream that reads the files in an zip archive
Index: java/util/zip/ZipOutputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/zip/ZipOutputStream.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 ZipOutputStream.java
--- java/util/zip/ZipOutputStream.java 3 Nov 2002 20:27:31 -0000 1.13
+++ java/util/zip/ZipOutputStream.java 17 Jun 2003 12:06:08 -0000
@@ -35,12 +35,13 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.util.zip;
-import java.io.OutputStream;
+
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Vector;
+import java.io.OutputStream;
import java.util.Enumeration;
+import java.util.Vector;
/**
* This is a FilterOutputStream that writes the files into a zip