ZipOutputStream.java (level): Initial value is Deflater.DEFAULT_COMPRESSION.

	* java/util/zip/ZipOutputStream.java (level): Initial value is
	Deflater.DEFAULT_COMPRESSION.
	(close): New method.
	(closeEntry): Likewise.
	(finish): Likewise.
	(put_version): Likewise.
	(write_entry): Likewise.
	(put2, put4): Now return `int'.
	(comment): Default to empty string.
	(bytes_written): New instance variable.
	(chain): Likewise.
	* java/util/zip/ZipEntry.java (setComment): Limit length of
	comment string.
	(setCrc): Check CRC validity.
	(setExtra): Check argument validity.
	(setMethod): Likewise.
	(setSize): Likewise.
	(ZipEntry): Likewise.
	* include/javaprims.h: Updated namespace declarations.
	* Makefile.in: Rebuilt.
	* Makefile.am (ordinary_java_source_files): Mention new files.
	(nat_source_files): Likewise.
	* java/util/zip/ZipFile.java (readu2): Throw ZipException, not
	EOFException.
	(read4): Likewise.
	(getInputStream): Handle compressed entries.
	* java/util/zip/GZIPOutputStream.java: New file.
	* java/util/zip/GZIPInputStream.java: New file.
	* java/util/zip/DataFormatException.java: New file.
	* java/util/zip/CheckedInputStream.java: New file.
	* java/util/zip/CheckedOutputStream.java: New file.
	* java/util/zip/InflaterInputStream.java: Implemented.
	* java/util/zip/natInflater.cc: New file.
	* java/util/zip/Deflater.java: Implemented.
	* java/util/zip/natDeflater.cc: New file.
	* java/util/zip/DeflaterOutputStream.java: Implemented.
	* java/util/zip/ZipInputStream.java (closeZipEntry): Throw
	ZipException, not IOException.
	* java/util/zip/ZipFile.java (readDirectory): Throw ZipException,
	not IOException.

From-SVN: r26996

1 files changed, 119 insertions, 0 deletions

diff --git a/libjava/java/util/zip/Deflater.java b/libjava/java/util/zip/Deflater.java
index 81312e2a84f..70855c5a3bc 100644
--- a/libjava/java/util/zip/Deflater.java
+++ b/libjava/java/util/zip/Deflater.java
@@ -1,3 +1,5 @@
+// Deflater.java - Compress a data stream.
+
 /* Copyright (C) 1999  Cygnus Solutions
 
    This file is part of libgcj.
@@ -8,6 +10,123 @@ details.  */
 
 package java.util.zip;
 
+import gnu.gcj.RawData;
+
+/**
+ * @author Tom Tromey
+ * @date May 17, 1999
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification
+ * and JCL book.
+ * Believed complete and correct.
+ */
+
 public class Deflater
 {
+  public static final int BEST_COMPRESSION = 9;
+  public static final int BEST_SPEED = 1;
+  public static final int DEFAULT_COMPRESSION = -1;
+  public static final int NO_COMPRESSION = 0;
+
+  public static final int DEFAULT_STRATEGY = 0;
+  public static final int FILTERED = 1;
+  public static final int HUFFMAN_ONLY = 2;
+
+  public static final int DEFLATED = 8;
+
+  public int deflate (byte[] buf)
+  {
+    return deflate (buf, 0, buf.length);
+  }
+
+  public native int deflate (byte[] buf, int off, int len);
+  public native void init (int level, boolean noHeader);
+  public native void update ();
+
+  public Deflater ()
+  {
+    this (DEFAULT_COMPRESSION, false);
+  }
+
+  public Deflater (int lvl)
+  {
+    this (lvl, false);
+  }
+
+  public Deflater (int lvl, boolean noHeader)
+  {
+    this.strategy = DEFAULT_STRATEGY;
+    init (lvl, noHeader);
+    setLevel (lvl);
+  }
+
+  public native void end ();
+
+  public void finalize ()
+  {
+    end ();
+  }
+
+  public native void finish ();
+
+  public synchronized boolean finished ()
+  {
+    return is_finished;
+  }
+
+  public native int getAdler ();
+  public native int getTotalIn ();
+  public native int getTotalOut ();
+  public native boolean needsInput ();
+  public native void reset ();
+
+  public void setDictionary (byte[] buf)
+  {
+    setDictionary (buf, 0, buf.length);
+  }
+
+  public native void setDictionary (byte[] buf, int off, int len);
+
+  public void setInput (byte[] buf)
+  {
+    setInput (buf, 0, buf.length);
+  }
+
+  public native void setInput (byte[] buf, int off, int len);
+
+  public synchronized void setLevel (int lvl)
+  {
+    if (lvl != -1 && (lvl < 0 || lvl > 9))
+      throw new IllegalArgumentException ();
+    level = (lvl == -1) ? 6 : lvl;
+    update ();
+  }
+
+  public synchronized void setStrategy (int stgy)
+  {
+    if (stgy != DEFAULT_STRATEGY && stgy != FILTERED
+	&& stgy != HUFFMAN_ONLY)
+      throw new IllegalArgumentException ();
+    strategy = stgy;
+    update ();
+  }
+
+  // Compression level.
+  private int level;
+
+  // Compression strategy.
+  private int strategy;
+
+  // The zlib stream.
+  private RawData zstream;
+
+  // True if finished.
+  private boolean is_finished;
+
+  // Total number of bytes made available at last setInput.
+  private int last_input_count;
+
+  // `Flush' flag to pass to next call to deflate.
+  private int flush_flag;
 }