2003-11-04 Michael Koch <konqueror@gmx.de>

	* java/util/zip/Checksum.java,
	java/util/zip/ZipConstants.java:
	Removed redundant modifiers.
	* java/util/zip/InflaterInputStream.java:
	Merged copyright with libgcj's version.

4 files changed, 70 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e93455d8..a1df70e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-11-04  Michael Koch  <konqueror@gmx.de>
 
+	* java/util/zip/Checksum.java,
+	java/util/zip/ZipConstants.java:
+	Removed redundant modifiers.
+	* java/util/zip/InflaterInputStream.java:
+	Merged copyright with libgcj's version.
+
+2003-11-04  Michael Koch  <konqueror@gmx.de>
+
 	* java/nio/ByteBuffer.java
 	(equals): Removed unneeded obj != null check.
 
diff --git a/java/util/zip/Checksum.java b/java/util/zip/Checksum.java
index f018de4ba..3b01f979e 100644
--- a/java/util/zip/Checksum.java
+++ b/java/util/zip/Checksum.java
@@ -61,19 +61,19 @@ public interface Checksum
   /**
    * Returns the data checksum computed so far.
    */
-  public long getValue ();
+  long getValue();
 
   /**
    * Resets the data checksum as if no update was ever called.
    */
-  public void reset ();
+  void reset();
 
   /**
    * Adds one byte to the data checksum.
    *
    * @param bval the data value to add. The high byte of the int is ignored.
    */
-  public void update (int bval);
+  void update (int bval);
 
   /**
    * Adds the byte array to the data checksum.
@@ -82,5 +82,5 @@ public interface Checksum
    * @param off the offset in the buffer where the data starts
    * @param len the length of the data
    */
-  public void update (byte[] buf, int off, int len);
+  void update (byte[] buf, int off, int len);
 }
diff --git a/java/util/zip/InflaterInputStream.java b/java/util/zip/InflaterInputStream.java
index 7a85dfb88..5a9d0bdc2 100644
--- a/java/util/zip/InflaterInputStream.java
+++ b/java/util/zip/InflaterInputStream.java
@@ -1,5 +1,5 @@
-/* java.util.zip.InflaterInputStream
-   Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+/* InflaterInputStream.java - Input stream filter for decompressing
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
-
+ 
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -49,6 +49,7 @@ import java.io.IOException;
  * as the <code>GZIPInputStream</code>.
  *
  * @author John Leuner
+ * @author Tom Tromey
  * @since 1.1
  */
 public class InflaterInputStream extends FilterInputStream
diff --git a/java/util/zip/ZipConstants.java b/java/util/zip/ZipConstants.java
index 3d6b7447c..a934e90a0 100644
--- a/java/util/zip/ZipConstants.java
+++ b/java/util/zip/ZipConstants.java
@@ -39,59 +39,59 @@ package java.util.zip;
 
 interface ZipConstants
 {
-    /* The local file header */
-    public final static int LOCHDR = 30;
-    public final static int LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24);
-
-    public final static int LOCVER =  4;
-    public final static int LOCFLG =  6;
-    public final static int LOCHOW =  8;
-    public final static int LOCTIM = 10;
-    public final static int LOCCRC = 14;
-    public final static int LOCSIZ = 18;
-    public final static int LOCLEN = 22;
-    public final static int LOCNAM = 26;
-    public final static int LOCEXT = 28;
-
-    /* The Data descriptor */
-    public final static int EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24);
-    public final static int EXTHDR = 16;
-
-    public final static int EXTCRC =  4;
-    public final static int EXTSIZ =  8;
-    public final static int EXTLEN = 12;
-
-    /* The central directory file header */
-    public final static int CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24);
-    public final static int CENHDR = 46;
-
-    public final static int CENVEM =  4;
-    public final static int CENVER =  6;
-    public final static int CENFLG =  8;
-    public final static int CENHOW = 10;
-    public final static int CENTIM = 12;
-    public final static int CENCRC = 16;
-    public final static int CENSIZ = 20;
-    public final static int CENLEN = 24;
-    public final static int CENNAM = 28;
-    public final static int CENEXT = 30;
-    public final static int CENCOM = 32;
-    public final static int CENDSK = 34;
-    public final static int CENATT = 36;
-    public final static int CENATX = 38;
-    public final static int CENOFF = 42;
-
-    /* The entries in the end of central directory */
-    public final static int ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24);
-    public final static int ENDHDR = 22;
-
-    /* The following two fields are missing in SUN JDK */
-    final static int ENDNRD =  4;
-    final static int ENDDCD =  6;
-    public final static int ENDSUB =  8;
-    public final static int ENDTOT = 10;
-    public final static int ENDSIZ = 12;
-    public final static int ENDOFF = 16;
-    public final static int ENDCOM = 20;
+  /* The local file header */
+  int LOCHDR = 30;
+  int LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24);
+
+  int LOCVER =  4;
+  int LOCFLG =  6;
+  int LOCHOW =  8;
+  int LOCTIM = 10;
+  int LOCCRC = 14;
+  int LOCSIZ = 18;
+  int LOCLEN = 22;
+  int LOCNAM = 26;
+  int LOCEXT = 28;
+
+  /* The Data descriptor */
+  int EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24);
+  int EXTHDR = 16;
+
+  int EXTCRC =  4;
+  int EXTSIZ =  8;
+  int EXTLEN = 12;
+
+  /* The central directory file header */
+  int CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24);
+  int CENHDR = 46;
+
+  int CENVEM =  4;
+  int CENVER =  6;
+  int CENFLG =  8;
+  int CENHOW = 10;
+  int CENTIM = 12;
+  int CENCRC = 16;
+  int CENSIZ = 20;
+  int CENLEN = 24;
+  int CENNAM = 28;
+  int CENEXT = 30;
+  int CENCOM = 32;
+  int CENDSK = 34;
+  int CENATT = 36;
+  int CENATX = 38;
+  int CENOFF = 42;
+
+  /* The entries in the end of central directory */
+  int ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24);
+  int ENDHDR = 22;
+
+  /* The following two fields are missing in SUN JDK */
+  int ENDNRD =  4;
+  int ENDDCD =  6;
+  int ENDSUB =  8;
+  int ENDTOT = 10;
+  int ENDSIZ = 12;
+  int ENDOFF = 16;
+  int ENDCOM = 20;
 }