From 064ebcd475e6576cc844f4d9216e8a64337fc07c Mon Sep 17 00:00:00 2001
From: mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 7 Nov 2004 01:25:48 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90220 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 8 ++++++++
libjava/java/util/zip/CheckedInputStream.java | 5 +++--
libjava/java/util/zip/InflaterInputStream.java | 3 ++-
libjava/java/util/zip/ZipFile.java | 6 +++---
libjava/java/util/zip/ZipInputStream.java | 6 +++---
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4451fa3e2f33..9e3bd543583f 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 ab9c750d5168..64d4294f7245 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 bfe93bd152cf..b2c03ced0c8c 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 c95a34d6b4e8..38ec9e6b5655 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 3cc67516e2a9..b694c9f4e314 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
--
GitLab