FYI: java.util.zip cleanup

[Mark Wielaard <mark at klomp dot org>]

Hi,

This merges some java.util.zip import cleanups done by Michael in GNU
Classpath.

2004-11-06  Michael Koch  <konqueror@gmx.de>

        * java/util/zip/CheckedInputStream.java,
        java/util/zip/InflaterInputStream.java,
        java/util/zip/ZipFile.java,
        java/util/zip/ZipInputStream.java:
        Import cleanups.

Committed,

Mark

Index: java/util/zip/CheckedInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/CheckedInputStream.java,v
retrieving revision 1.2
diff -u -r1.2 CheckedInputStream.java
--- java/util/zip/CheckedInputStream.java	22 Jan 2002 22:27:02 -0000	1.2
+++ java/util/zip/CheckedInputStream.java	21 Oct 2004 21:06:30 -0000
@@ -1,5 +1,5 @@
 /* CheckedInputStream.java - Compute checksum of data being read
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,11 +35,12 @@
 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.FilterInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /* Written using on-line Java Platform 1.2 API Specification
  * and JCL book.
Index: java/util/zip/InflaterInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/InflaterInputStream.java,v
retrieving revision 1.13
diff -u -r1.13 InflaterInputStream.java
--- java/util/zip/InflaterInputStream.java	15 Jun 2004 10:37:14 -0000	1.13
+++ java/util/zip/InflaterInputStream.java	21 Oct 2004 21:06:30 -0000
@@ -36,11 +36,12 @@
 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.FilterInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * This filter stream is used to decompress data compressed in the "deflate"
Index: java/util/zip/ZipFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipFile.java,v
retrieving revision 1.17
diff -u -r1.17 ZipFile.java
--- java/util/zip/ZipFile.java	20 Oct 2004 08:08:52 -0000	1.17
+++ java/util/zip/ZipFile.java	21 Oct 2004 21:06:30 -0000
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipFile
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+/* ZipFile.java --
+   Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,8 +42,8 @@
 import java.io.DataInput;
 import java.io.EOFException;
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.util.Enumeration;
 import java.util.HashMap;
Index: java/util/zip/ZipInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/ZipInputStream.java,v
retrieving revision 1.12
diff -u -r1.12 ZipInputStream.java
--- java/util/zip/ZipInputStream.java	18 Jun 2003 09:42:57 -0000	1.12
+++ java/util/zip/ZipInputStream.java	21 Oct 2004 21:06:30 -0000
@@ -1,5 +1,5 @@
-/* java.util.zip.ZipInputStream
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+/* ZipInputStream.java --
+   Copyright (C) 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,8 @@
 package java.util.zip;
 
 import java.io.EOFException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * This is a FilterInputStream that reads the files in an zip archive

Attachment: signature.asc
Description: This is a digitally signed message part