aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog8
-rw-r--r--libjava/java/util/zip/CheckedInputStream.java5
-rw-r--r--libjava/java/util/zip/InflaterInputStream.java3
-rw-r--r--libjava/java/util/zip/ZipFile.java6
-rw-r--r--libjava/java/util/zip/ZipInputStream.java6
5 files changed, 19 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4451fa3..9e3bd54 100644
--- 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 ab9c750..64d4294 100644
--- 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 bfe93bd..b2c03ce 100644
--- 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 c95a34d..38ec9e6 100644
--- 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 3cc6751..b694c9f 100644
--- 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