CheckedInputStream.java, [...]: Import cleanups.

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.

From-SVN: r90220

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4451fa3e2f33b71c31ab84b03c6f2f796b5427eb..9e3bd543583f61f4e20083fe8150caafb61f757d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2004-11-06  Tom Tromey  <tromey@redhat.com>
 
        * gnu/java/rmi/server/UnicastConnectionManager.java (clients): Now

diff --git a/libjava/java/util/zip/CheckedInputStream.java b/libjava/java/util/zip/CheckedInputStream.java
index ab9c750d51680f1b8c3c694ec213ccb51eac263a..64d4294f72456a501b64c9c43aaf224bc6fe2f93 100644 (file)
--- a/libjava/java/util/zip/CheckedInputStream.java
+++ b/libjava/java/util/zip/CheckedInputStream.java
@@ -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 @@ this exception to your version of the library, but you are not
 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.

diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java
index bfe93bd152cf6081166cff91a36e77d1b545b5bc..b2c03ced0c8c2b3d51c42d15235e389fabcca85d 100644 (file)
--- a/libjava/java/util/zip/InflaterInputStream.java
+++ b/libjava/java/util/zip/InflaterInputStream.java
@@ -36,11 +36,12 @@ this exception to your version of the library, but you are not
 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"

diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java
index c95a34d6b4e8d8c57c52ef652c7fad0453dfe623..38ec9e6b5655c9f6365a956fad0484cf6a81c224 100644 (file)
--- a/libjava/java/util/zip/ZipFile.java
+++ b/libjava/java/util/zip/ZipFile.java
@@ -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.BufferedInputStream;
 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;

diff --git a/libjava/java/util/zip/ZipInputStream.java b/libjava/java/util/zip/ZipInputStream.java
index 3cc67516e2a91a6de72bb6bdbac40b32b9856e2c..b694c9f4e31479a48c58596cc5d4cb273c402a2b 100644 (file)
--- a/libjava/java/util/zip/ZipInputStream.java
+++ b/libjava/java/util/zip/ZipInputStream.java
@@ -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 @@ exception statement from your version. */
 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