PrintStream (PrintStream): Fix illegal usage of "this" before "super".

1999-11-01  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/io/PrintStream (PrintStream): Fix illegal usage of "this"
          before "super".
        * java/io/OutputStreamWriter (OutputStreamWriter): ditto.
        * java/io/InputStreamReader (InputStreamReader): ditto.

From-SVN: r30300

libjava/ChangeLog

+1999-11-01  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* java/io/PrintStream (PrintStream): Fix illegal usage of "this" 
+	  before "super".
+	* java/io/OutputStreamWriter (OutputStreamWriter): ditto.
+	* java/io/InputStreamReader (InputStreamReader): ditto.
+
 1999-10-22  Tom Tromey  <tromey@cygnus.com>
 
 	* Makefile.in: Rebuilt.

libjava/java/io/InputStreamReader.java

@@ -44,9 +44,11 @@ public class InputStreamReader extends Reader
 
   private InputStreamReader(InputStream in, BytesToUnicode decoder)
   {
-    super((this.in = (in instanceof BufferedInputStream
-		      ? (BufferedInputStream) in
-		      : new BufferedInputStream(in, 250))));
+    this.in = in instanceof BufferedInputStream
+              ? (BufferedInputStream) in
+              : new BufferedInputStream(in, 250);
+    /* Don't need to call super(in) here as long as the lock gets set. */
+    this.lock = in;
     converter = decoder;
     converter.setInput(this.in.buf, 0, 0);
   }

libjava/java/io/OutputStreamWriter.java

@@ -32,11 +32,13 @@ public class OutputStreamWriter extends Writer
 
   private OutputStreamWriter(OutputStream out, UnicodeToBytes encoder)
   {
-    super((this.out = (out instanceof BufferedOutputStream
-		       ? (BufferedOutputStream) out
-		       : new BufferedOutputStream(out, 250))));
+    this.out = out instanceof BufferedOutputStream 
+	       ? (BufferedOutputStream) out
+	       : new BufferedOutputStream(out, 250);
+    /* Don't need to call super(out) here as long as the lock gets set. */
+    this.lock = out;
     this.converter = encoder;
-  } 
+  }
 
   public OutputStreamWriter(OutputStream out, String enc)
    throws UnsupportedEncodingException

libjava/java/io/PrintStream.java

@@ -238,9 +238,16 @@ public class PrintStream extends FilterOutputStream
 
   public PrintStream (OutputStream out, boolean af)
   {
-    super ((this.out = (out instanceof BufferedOutputStream
-			 ? (BufferedOutputStream) out
-			 : new BufferedOutputStream(out, 250))));
+    super(out);
+    if (out instanceof BufferedOutputStream)
+      this.out = (BufferedOutputStream) out;
+    else
+      {
+        this.out = new BufferedOutputStream(out, 250);
+	/* PrintStream redefines "out". Explicitly reset FilterOutputStream's
+	 * "out" so that they're referring to the same thing. */
+	super.out = this.out;    
+      }
     converter = UnicodeToBytes.getDefaultEncoder();
     error = false;
     auto_flush = af;