* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26996 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 101 insertions, 0 deletions

diff --git a/libjava/java/util/zip/Inflater.java b/libjava/java/util/zip/Inflater.java
new file mode 100644
index 00000000000..724b5b4a1b5
--- /dev/null
+++ b/libjava/java/util/zip/Inflater.java
@@ -0,0 +1,101 @@
+// Inflater.java - Decompress a data stream.
+
+/* Copyright (C) 1999  Cygnus Solutions
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+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 Inflater
+{
+  public native void end ();
+
+  protected void finalize ()
+  {
+    end ();
+  }
+
+  public synchronized boolean finished ()
+  {
+    return is_finished;
+  }
+
+  public native int getAdler ();
+  public native int getRemaining ();
+  public native int getTotalIn ();
+  public native int getTotalOut ();
+
+  public int inflate (byte[] buf) throws DataFormatException
+  {
+    return inflate (buf, 0, buf.length);
+  }
+
+  public native int inflate (byte[] buf, int off, int len)
+    throws DataFormatException;
+
+  private native void init (boolean noHeader);
+
+  public Inflater ()
+  {
+    this (false);
+  }
+
+  public Inflater (boolean noHeader)
+  {
+    init (noHeader);
+  }
+
+  public synchronized boolean needsDictionary ()
+  {
+    return dict_needed;
+  }
+
+  public synchronized boolean needsInput ()
+  {
+    return getRemaining () == 0;
+  }
+
+  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);
+
+  // The zlib stream.
+  private RawData zstream;
+
+  // True if finished.
+  private boolean is_finished;
+
+  // True if dictionary needed.
+  private boolean dict_needed;
+
+  // Total number of bytes made available at last setInput.
+  private int last_input_count;
+}