Merged gcj-eclipse branch to trunk.

From-SVN: r120621

libjava/java/util/zip/Adler32.h

@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_Adler32__
+#define __java_util_zip_Adler32__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::Adler32 : public ::java::lang::Object
+{
+
+public:
+  Adler32();
+  virtual void reset();
+  virtual void update(jint);
+  virtual void update(JArray< jbyte > *);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual jlong getValue();
+private:
+  static const jint BASE = 65521;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) checksum;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_Adler32__

libjava/java/util/zip/CRC32.h

@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_CRC32__
+#define __java_util_zip_CRC32__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::CRC32 : public ::java::lang::Object
+{
+
+public:
+  CRC32();
+private:
+  static JArray< jint > * make_crc_table();
+public:
+  virtual jlong getValue();
+  virtual void reset();
+  virtual void update(jint);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual void update(JArray< jbyte > *);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) crc;
+  static JArray< jint > * crc_table;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_CRC32__

libjava/java/util/zip/CheckedInputStream.h

@@ -0,0 +1,28 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_CheckedInputStream__
+#define __java_util_zip_CheckedInputStream__
+
+#pragma interface
+
+#include <java/io/FilterInputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::CheckedInputStream : public ::java::io::FilterInputStream
+{
+
+public:
+  CheckedInputStream(::java::io::InputStream *, ::java::util::zip::Checksum *);
+  virtual ::java::util::zip::Checksum * getChecksum();
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual jlong skip(jlong);
+private:
+  ::java::util::zip::Checksum * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) sum;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_CheckedInputStream__

libjava/java/util/zip/CheckedOutputStream.h

@@ -0,0 +1,27 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_CheckedOutputStream__
+#define __java_util_zip_CheckedOutputStream__
+
+#pragma interface
+
+#include <java/io/FilterOutputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::CheckedOutputStream : public ::java::io::FilterOutputStream
+{
+
+public:
+  CheckedOutputStream(::java::io::OutputStream *, ::java::util::zip::Checksum *);
+  virtual ::java::util::zip::Checksum * getChecksum();
+  virtual void write(jint);
+  virtual void write(JArray< jbyte > *, jint, jint);
+private:
+  ::java::util::zip::Checksum * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) sum;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_CheckedOutputStream__

libjava/java/util/zip/Checksum.h

@@ -0,0 +1,24 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_Checksum__
+#define __java_util_zip_Checksum__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::Checksum : public ::java::lang::Object
+{
+
+public:
+  virtual jlong getValue() = 0;
+  virtual void reset() = 0;
+  virtual void update(jint) = 0;
+  virtual void update(JArray< jbyte > *, jint, jint) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __java_util_zip_Checksum__

libjava/java/util/zip/DataFormatException.h

@@ -0,0 +1,23 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_DataFormatException__
+#define __java_util_zip_DataFormatException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+
+class java::util::zip::DataFormatException : public ::java::lang::Exception
+{
+
+public:
+  DataFormatException();
+  DataFormatException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = 2219632870893641452LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_DataFormatException__

libjava/java/util/zip/Deflater.h

@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_Deflater__
+#define __java_util_zip_Deflater__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class RawData;
+    }
+  }
+}
+
+class java::util::zip::Deflater : public ::java::lang::Object
+{
+
+public:
+  Deflater();
+  Deflater(jint);
+  Deflater(jint, jboolean);
+private:
+  void init(jint, jboolean);
+  void update();
+public:
+  virtual void reset();
+  virtual void end();
+  virtual jint getAdler();
+  virtual jint getTotalIn();
+  virtual jlong getBytesRead();
+  virtual jint getTotalOut();
+  virtual jlong getBytesWritten();
+public: // actually protected
+  virtual void finalize();
+public:
+  virtual void finish();
+  virtual jboolean finished();
+  virtual jboolean needsInput();
+  virtual void setInput(JArray< jbyte > *);
+  virtual void setInput(JArray< jbyte > *, jint, jint);
+  virtual void setLevel(jint);
+  virtual void setStrategy(jint);
+  virtual jint deflate(JArray< jbyte > *);
+  virtual jint deflate(JArray< jbyte > *, jint, jint);
+  virtual void setDictionary(JArray< jbyte > *);
+  virtual void setDictionary(JArray< jbyte > *, jint, jint);
+public: // actually package-private
+  virtual void flush();
+public:
+  static const jint BEST_COMPRESSION = 9;
+  static const jint BEST_SPEED = 1;
+  static const jint DEFAULT_COMPRESSION = -1;
+  static const jint NO_COMPRESSION = 0;
+  static const jint DEFAULT_STRATEGY = 0;
+  static const jint FILTERED = 1;
+  static const jint HUFFMAN_ONLY = 2;
+  static const jint DEFLATED = 8;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) level;
+  jint strategy;
+  ::gnu::gcj::RawData * zstream;
+  jboolean is_finished;
+  jint flush_flag;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_Deflater__

libjava/java/util/zip/Deflater.java

@@ -174,12 +174,32 @@ public class Deflater
   /** 
    * Gets the number of input bytes processed so far.
    */
-  public native int getTotalIn();
+  @Deprecated
+  public int getTotalIn()
+  {
+    return (int) getBytesRead();
+  }
+
+  /** 
+   * Gets the number of input bytes processed so far.
+   * @since 1.5
+   */
+  public native long getBytesRead();
 
   /** 
    * Gets the number of output bytes so far.
    */
-  public native int getTotalOut();
+  @Deprecated
+  public int getTotalOut()
+  {
+    return (int) getBytesWritten();
+  }
+
+  /** 
+   * Gets the number of output bytes so far.
+   * @since 1.5
+   */
+  public native long getBytesWritten();
 
   /** 
    * Finalizes this object.

libjava/java/util/zip/DeflaterOutputStream.h

@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_DeflaterOutputStream__
+#define __java_util_zip_DeflaterOutputStream__
+
+#pragma interface
+
+#include <java/io/FilterOutputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::DeflaterOutputStream : public ::java::io::FilterOutputStream
+{
+
+public: // actually protected
+  virtual void deflate();
+public:
+  DeflaterOutputStream(::java::io::OutputStream *);
+  DeflaterOutputStream(::java::io::OutputStream *, ::java::util::zip::Deflater *);
+  DeflaterOutputStream(::java::io::OutputStream *, ::java::util::zip::Deflater *, jint);
+  virtual void flush();
+  virtual void finish();
+  virtual void close();
+  virtual void write(jint);
+  virtual void write(JArray< jbyte > *, jint, jint);
+public: // actually protected
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) buf;
+  ::java::util::zip::Deflater * def;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_DeflaterOutputStream__

libjava/java/util/zip/GZIPInputStream.h

@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_GZIPInputStream__
+#define __java_util_zip_GZIPInputStream__
+
+#pragma interface
+
+#include <java/util/zip/InflaterInputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::GZIPInputStream : public ::java::util::zip::InflaterInputStream
+{
+
+public:
+  GZIPInputStream(::java::io::InputStream *);
+  GZIPInputStream(::java::io::InputStream *, jint);
+  virtual void close();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+private:
+  void readHeader();
+  void readFooter();
+public:
+  static const jint GZIP_MAGIC = 35615;
+public: // actually package-private
+  static const jint FTEXT = 1;
+  static const jint FHCRC = 2;
+  static const jint FEXTRA = 4;
+  static const jint FNAME = 8;
+  static const jint FCOMMENT = 16;
+public: // actually protected
+  ::java::util::zip::CRC32 * __attribute__((aligned(__alignof__( ::java::util::zip::InflaterInputStream)))) crc;
+  jboolean eos;
+private:
+  jboolean readGZIPHeader;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_GZIPInputStream__

libjava/java/util/zip/GZIPOutputStream.h

@@ -0,0 +1,28 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_GZIPOutputStream__
+#define __java_util_zip_GZIPOutputStream__
+
+#pragma interface
+
+#include <java/util/zip/DeflaterOutputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::GZIPOutputStream : public ::java::util::zip::DeflaterOutputStream
+{
+
+public:
+  GZIPOutputStream(::java::io::OutputStream *);
+  GZIPOutputStream(::java::io::OutputStream *, jint);
+  virtual void write(JArray< jbyte > *, jint, jint);
+  virtual void close();
+  virtual void finish();
+public: // actually protected
+  ::java::util::zip::CRC32 * __attribute__((aligned(__alignof__( ::java::util::zip::DeflaterOutputStream)))) crc;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_GZIPOutputStream__

libjava/java/util/zip/Inflater.h

@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_Inflater__
+#define __java_util_zip_Inflater__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace gcj
+    {
+        class RawData;
+    }
+  }
+}
+
+class java::util::zip::Inflater : public ::java::lang::Object
+{
+
+public:
+  Inflater();
+  Inflater(jboolean);
+public: // actually protected
+  virtual void finalize();
+public:
+  virtual void end();
+  virtual jboolean finished();
+  virtual jint getAdler();
+  virtual jint getRemaining();
+  virtual jint getTotalIn();
+  virtual jint getTotalOut();
+  virtual jint inflate(JArray< jbyte > *);
+  virtual jint inflate(JArray< jbyte > *, jint, jint);
+private:
+  void init(jboolean);
+public:
+  virtual jboolean needsDictionary();
+  virtual jboolean needsInput();
+  virtual void reset();
+  virtual void setDictionary(JArray< jbyte > *);
+  virtual void setDictionary(JArray< jbyte > *, jint, jint);
+  virtual void setInput(JArray< jbyte > *);
+  virtual void setInput(JArray< jbyte > *, jint, jint);
+private:
+  ::gnu::gcj::RawData * __attribute__((aligned(__alignof__( ::java::lang::Object)))) zstream;
+  jboolean is_finished;
+  jboolean dict_needed;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_Inflater__

libjava/java/util/zip/InflaterInputStream.h

@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_InflaterInputStream__
+#define __java_util_zip_InflaterInputStream__
+
+#pragma interface
+
+#include <java/io/FilterInputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::InflaterInputStream : public ::java::io::FilterInputStream
+{
+
+public:
+  InflaterInputStream(::java::io::InputStream *);
+  InflaterInputStream(::java::io::InputStream *, ::java::util::zip::Inflater *);
+  InflaterInputStream(::java::io::InputStream *, ::java::util::zip::Inflater *, jint);
+  virtual jint available();
+  virtual void close();
+public: // actually protected
+  virtual void fill();
+public:
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual jlong skip(jlong);
+  virtual jboolean markSupported();
+  virtual void mark(jint);
+  virtual void reset();
+public: // actually protected
+  ::java::util::zip::Inflater * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) inf;
+  JArray< jbyte > * buf;
+  jint len;
+private:
+  JArray< jbyte > * onebytebuffer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_InflaterInputStream__

libjava/java/util/zip/ZipConstants.h

@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipConstants__
+#define __java_util_zip_ZipConstants__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+
+class java::util::zip::ZipConstants : public ::java::lang::Object
+{
+
+public:
+  static const jint LOCHDR = 30;
+  static const jlong LOCSIG = 67324752LL;
+  static const jint LOCVER = 4;
+  static const jint LOCFLG = 6;
+  static const jint LOCHOW = 8;
+  static const jint LOCTIM = 10;
+  static const jint LOCCRC = 14;
+  static const jint LOCSIZ = 18;
+  static const jint LOCLEN = 22;
+  static const jint LOCNAM = 26;
+  static const jint LOCEXT = 28;
+  static const jlong EXTSIG = 134695760LL;
+  static const jint EXTHDR = 16;
+  static const jint EXTCRC = 4;
+  static const jint EXTSIZ = 8;
+  static const jint EXTLEN = 12;
+  static const jlong CENSIG = 33639248LL;
+  static const jint CENHDR = 46;
+  static const jint CENVEM = 4;
+  static const jint CENVER = 6;
+  static const jint CENFLG = 8;
+  static const jint CENHOW = 10;
+  static const jint CENTIM = 12;
+  static const jint CENCRC = 16;
+  static const jint CENSIZ = 20;
+  static const jint CENLEN = 24;
+  static const jint CENNAM = 28;
+  static const jint CENEXT = 30;
+  static const jint CENCOM = 32;
+  static const jint CENDSK = 34;
+  static const jint CENATT = 36;
+  static const jint CENATX = 38;
+  static const jint CENOFF = 42;
+  static const jlong ENDSIG = 101010256LL;
+  static const jint ENDHDR = 22;
+  static const jint ENDSUB = 8;
+  static const jint ENDTOT = 10;
+  static const jint ENDSIZ = 12;
+  static const jint ENDOFF = 16;
+  static const jint ENDCOM = 20;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __java_util_zip_ZipConstants__

libjava/java/util/zip/ZipEntry.h

@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipEntry__
+#define __java_util_zip_ZipEntry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::ZipEntry : public ::java::lang::Object
+{
+
+public:
+  ZipEntry(::java::lang::String *);
+  ZipEntry(::java::util::zip::ZipEntry *);
+public: // actually package-private
+  ZipEntry(::java::util::zip::ZipEntry *, ::java::lang::String *);
+  virtual void setDOSTime(jint);
+  virtual jint getDOSTime();
+public:
+  virtual ::java::lang::Object * clone();
+  virtual ::java::lang::String * getName();
+  virtual void setTime(jlong);
+  virtual jlong getTime();
+private:
+  static ::java::util::Calendar * getCalendar();
+public:
+  virtual void setSize(jlong);
+  virtual jlong getSize();
+  virtual void setCompressedSize(jlong);
+  virtual jlong getCompressedSize();
+  virtual void setCrc(jlong);
+  virtual jlong getCrc();
+  virtual void setMethod(jint);
+  virtual jint getMethod();
+  virtual void setExtra(JArray< jbyte > *);
+private:
+  void parseExtra();
+public:
+  virtual JArray< jbyte > * getExtra();
+  virtual void setComment(::java::lang::String *);
+  virtual ::java::lang::String * getComment();
+  virtual jboolean isDirectory();
+  virtual ::java::lang::String * toString();
+  virtual jint hashCode();
+private:
+  static const jint KNOWN_SIZE = 1;
+  static const jint KNOWN_CSIZE = 2;
+  static const jint KNOWN_CRC = 4;
+  static const jint KNOWN_TIME = 8;
+  static const jint KNOWN_EXTRA = 16;
+  static ::java::util::Calendar * cal;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  jint size;
+  jlong compressedSize;
+  jint crc;
+  jint dostime;
+  jshort known;
+  jshort method;
+  JArray< jbyte > * extra;
+  ::java::lang::String * comment;
+public: // actually package-private
+  jint flags;
+  jint offset;
+public:
+  static const jint STORED = 0;
+  static const jint DEFLATED = 8;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipEntry__

libjava/java/util/zip/ZipException.h

@@ -0,0 +1,23 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipException__
+#define __java_util_zip_ZipException__
+
+#pragma interface
+
+#include <java/io/IOException.h>
+
+class java::util::zip::ZipException : public ::java::io::IOException
+{
+
+public:
+  ZipException();
+  ZipException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = 8000196834066748623LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipException__

libjava/java/util/zip/ZipFile$1.h

@@ -0,0 +1,26 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipFile$1__
+#define __java_util_zip_ZipFile$1__
+
+#pragma interface
+
+#include <java/util/zip/InflaterInputStream.h>
+
+class java::util::zip::ZipFile$1 : public ::java::util::zip::InflaterInputStream
+{
+
+public: // actually package-private
+  ZipFile$1(::java::util::zip::ZipFile *, ::java::io::InputStream *, ::java::util::zip::Inflater *, jint);
+public:
+  jint available();
+public: // actually package-private
+  ::java::util::zip::ZipFile * __attribute__((aligned(__alignof__( ::java::util::zip::InflaterInputStream)))) this$0;
+private:
+  jint val$sz;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipFile$1__

libjava/java/util/zip/ZipFile$PartialInputStream.h

@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipFile$PartialInputStream__
+#define __java_util_zip_ZipFile$PartialInputStream__
+
+#pragma interface
+
+#include <java/io/InputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+      namespace charset
+      {
+          class Charset;
+          class CharsetDecoder;
+      }
+    }
+  }
+}
+
+class java::util::zip::ZipFile$PartialInputStream : public ::java::io::InputStream
+{
+
+public:
+  ZipFile$PartialInputStream(::java::io::RandomAccessFile *, jint);
+public: // actually package-private
+  void setLength(jlong);
+private:
+  void fillBuffer();
+public:
+  jint available();
+  jint read();
+  jint read(JArray< jbyte > *, jint, jint);
+  jlong skip(jlong);
+public: // actually package-private
+  void seek(jlong);
+  void readFully(JArray< jbyte > *);
+  void readFully(JArray< jbyte > *, jint, jint);
+  jint readLeShort();
+  jint readLeInt();
+private:
+  ::java::lang::String * decodeChars(JArray< jbyte > *, jint, jint);
+public: // actually package-private
+  ::java::lang::String * readString(jint);
+public:
+  void addDummyByte();
+private:
+  static ::java::nio::charset::Charset * UTF8CHARSET;
+  ::java::nio::charset::CharsetDecoder * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) utf8Decoder;
+  ::java::io::RandomAccessFile * raf;
+  JArray< jbyte > * buffer;
+  jlong bufferOffset;
+  jint pos;
+  jlong end;
+  jint dummyByteCount;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipFile$PartialInputStream__

libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h

@@ -0,0 +1,25 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipFile$ZipEntryEnumeration__
+#define __java_util_zip_ZipFile$ZipEntryEnumeration__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+
+class java::util::zip::ZipFile$ZipEntryEnumeration : public ::java::lang::Object
+{
+
+public:
+  ZipFile$ZipEntryEnumeration(::java::util::Iterator *);
+  virtual jboolean hasMoreElements();
+  virtual ::java::util::zip::ZipEntry * target$nextElement();
+  virtual ::java::lang::Object * nextElement();
+private:
+  ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elements;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipFile$ZipEntryEnumeration__

libjava/java/util/zip/ZipFile.h

@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipFile__
+#define __java_util_zip_ZipFile__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+
+class java::util::zip::ZipFile : public ::java::lang::Object
+{
+
+  ::java::io::RandomAccessFile * openFile(::java::lang::String *, ::java::io::File *);
+public:
+  ZipFile(::java::lang::String *);
+  ZipFile(::java::io::File *);
+  ZipFile(::java::io::File *, jint);
+private:
+  void checkZipFile();
+  void checkClosed();
+  void readEntries();
+public:
+  virtual void close();
+public: // actually protected
+  virtual void finalize();
+public:
+  virtual ::java::util::Enumeration * entries();
+private:
+  ::java::util::LinkedHashMap * getEntries();
+public:
+  virtual ::java::util::zip::ZipEntry * getEntry(::java::lang::String *);
+  virtual ::java::io::InputStream * getInputStream(::java::util::zip::ZipEntry *);
+  virtual ::java::lang::String * getName();
+  virtual jint size();
+  static const jint OPEN_READ = 1;
+  static const jint OPEN_DELETE = 4;
+public: // actually package-private
+  static const jint ENDNRD = 4;
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
+  ::java::io::RandomAccessFile * raf;
+  ::java::util::LinkedHashMap * entries__;
+  jboolean closed;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipFile__

libjava/java/util/zip/ZipInputStream.h

@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipInputStream__
+#define __java_util_zip_ZipInputStream__
+
+#pragma interface
+
+#include <java/util/zip/InflaterInputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::ZipInputStream : public ::java::util::zip::InflaterInputStream
+{
+
+public:
+  ZipInputStream(::java::io::InputStream *);
+private:
+  void fillBuf();
+  jint readBuf(JArray< jbyte > *, jint, jint);
+  void readFully(JArray< jbyte > *);
+  jint readLeByte();
+  jint readLeShort();
+  jint readLeInt();
+public:
+  virtual ::java::util::zip::ZipEntry * getNextEntry();
+private:
+  void readDataDescr();
+public:
+  virtual void closeEntry();
+  virtual jint available();
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual void close();
+public: // actually protected
+  virtual ::java::util::zip::ZipEntry * createZipEntry(::java::lang::String *);
+private:
+  ::java::util::zip::CRC32 * __attribute__((aligned(__alignof__( ::java::util::zip::InflaterInputStream)))) crc;
+  ::java::util::zip::ZipEntry * entry;
+  jint csize;
+  jint size;
+  jint method;
+  jint flags;
+  jint avail;
+  jboolean entryAtEOF;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipInputStream__

libjava/java/util/zip/ZipOutputStream.h

@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_zip_ZipOutputStream__
+#define __java_util_zip_ZipOutputStream__
+
+#pragma interface
+
+#include <java/util/zip/DeflaterOutputStream.h>
+#include <gcj/array.h>
+
+
+class java::util::zip::ZipOutputStream : public ::java::util::zip::DeflaterOutputStream
+{
+
+public:
+  ZipOutputStream(::java::io::OutputStream *);
+  virtual void setComment(::java::lang::String *);
+  virtual void setMethod(jint);
+  virtual void setLevel(jint);
+private:
+  void writeLeShort(jint);
+  void writeLeInt(jint);
+  void writeLeInt(jlong);
+public:
+  virtual void putNextEntry(::java::util::zip::ZipEntry *);
+  virtual void closeEntry();
+  virtual void write(JArray< jbyte > *, jint, jint);
+  virtual void finish();
+private:
+  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::util::zip::DeflaterOutputStream)))) entries;
+  ::java::util::zip::CRC32 * crc;
+  ::java::util::zip::ZipEntry * curEntry;
+  jint curMethod;
+  jint size;
+  jint offset;
+  JArray< jbyte > * zipComment;
+  jint defaultMethod;
+  static const jint ZIP_STORED_VERSION = 10;
+  static const jint ZIP_DEFLATED_VERSION = 20;
+public:
+  static const jint STORED = 0;
+  static const jint DEFLATED = 8;
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_zip_ZipOutputStream__

libjava/java/util/zip/natDeflater.cc

@@ -1,6 +1,6 @@
 // natDeflater.cc - Implementation of Deflater native methods.
 
-/* Copyright (C) 1999, 2002  Free Software Foundation
+/* Copyright (C) 1999, 2002, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -93,16 +93,16 @@ java::util::zip::Deflater::getAdler ()
   return s->adler;
 }
 
-jint
-java::util::zip::Deflater::getTotalIn ()
+jlong
+java::util::zip::Deflater::getBytesRead ()
 {
   JvSynchronize sync (this);
   z_streamp s = (z_streamp) zstream;
   return s->total_in;
 }
 
-jint
-java::util::zip::Deflater::getTotalOut ()
+jlong
+java::util::zip::Deflater::getBytesWritten ()
 {
   JvSynchronize sync (this);
   z_streamp s = (z_streamp) zstream;