1 files changed, 53 insertions, 12 deletions

diff --git a/libjava/java/util/zip/DeflaterOutputStream.java b/libjava/java/util/zip/DeflaterOutputStream.java
index 4f0b8b454a5..ce5ae23101f 100644
--- a/libjava/java/util/zip/DeflaterOutputStream.java
+++ b/libjava/java/util/zip/DeflaterOutputStream.java
@@ -1,3 +1,5 @@
+// DeflaterOutputStream.java - Output filter for compressing.
+
 /* Copyright (C) 1999  Cygnus Solutions
 
    This file is part of libgcj.
@@ -7,40 +9,79 @@ Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
 package java.util.zip;
-import java.io.*;
 
-/** JUST AN INCOMPLETE STUB! */
+import java.io.FilterOutputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * @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 DeflaterOutputStream extends FilterOutputStream
 {
-  protected byte[] buf;
+  public void close () throws IOException
+  {
+    finish ();
+    out.close();
+  }
 
-  protected Deflater def;
+  protected void deflate () throws IOException
+  {
+    while (true)
+      {
+	int len = def.deflate(buf, 0, buf.length);
+	if (len == 0 || len == -1)
+	  break;
+	out.write(buf, 0, len);
+      }
+  }
 
-  public DeflaterOutputStream(OutputStream out)
+  public DeflaterOutputStream (OutputStream out)
   {
-    this(out, null, 512);
+    this (out, new Deflater (), 512);
   }
 
-  public DeflaterOutputStream(OutputStream out, Deflater defl)
+  public DeflaterOutputStream (OutputStream out, Deflater defl)
   {
-    this(out, defl, 512);
+    this (out, defl, 512);
   }
 
   public DeflaterOutputStream(OutputStream out, Deflater defl, int bufsize)
   {
-    super(out);
+    super (out);
     buf = new byte[bufsize];
     def = defl;
   }
 
   public void finish () throws IOException
   {
+    def.finish();
+    deflate ();
   }
 
-  public void close () throws IOException
+  public void write (int bval) throws IOException
   {
-    finish();
-    out.close();
+    byte[] b = new byte[1];
+    b[0] = (byte) bval;
+    write (b, 0, 1);
+  }
+
+  public void write (byte[] buf, int off, int len) throws IOException
+  {
+    def.setInput (buf, off, len);
+    deflate ();
   }
+
+  // The retrieval buffer.
+  protected byte[] buf;
+
+  // Deflater used to compress data.
+  protected Deflater def;
 }