FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Bryce McKinlay 1999-11-01 01:15:37 +00:00 • committed by Bryce McKinlay
parent 14a774a9d2
commit 6b5ba2ce34
4 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -1,3 +1,10 @@
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> 1999-10-22 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt. * Makefile.in: Rebuilt.

8
libjava/java/io/InputStreamReader.java
View file

@ -44,9 +44,11 @@ public class InputStreamReader extends Reader
private InputStreamReader(InputStream in, BytesToUnicode decoder) private InputStreamReader(InputStream in, BytesToUnicode decoder)
{ {
super((this.in = (in instanceof BufferedInputStream this.in = in instanceof BufferedInputStream
? (BufferedInputStream) in ? (BufferedInputStream) in
: new BufferedInputStream(in, 250)))); : 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 = decoder;
converter.setInput(this.in.buf, 0, 0); converter.setInput(this.in.buf, 0, 0);
} }

10
libjava/java/io/OutputStreamWriter.java
View file

@ -32,11 +32,13 @@ public class OutputStreamWriter extends Writer
private OutputStreamWriter(OutputStream out, UnicodeToBytes encoder) private OutputStreamWriter(OutputStream out, UnicodeToBytes encoder)
{ {
super((this.out = (out instanceof BufferedOutputStream this.out = out instanceof BufferedOutputStream
? (BufferedOutputStream) out ? (BufferedOutputStream) out
: new BufferedOutputStream(out, 250)))); : 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; this.converter = encoder;
} }
public OutputStreamWriter(OutputStream out, String enc) public OutputStreamWriter(OutputStream out, String enc)
throws UnsupportedEncodingException throws UnsupportedEncodingException

13
libjava/java/io/PrintStream.java
View file

@ -238,9 +238,16 @@ public class PrintStream extends FilterOutputStream
public PrintStream (OutputStream out, boolean af) public PrintStream (OutputStream out, boolean af)
{ {
super ((this.out = (out instanceof BufferedOutputStream super(out);
? (BufferedOutputStream) out if (out instanceof BufferedOutputStream)
: new BufferedOutputStream(out, 250)))); 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(); converter = UnicodeToBytes.getDefaultEncoder();
error = false; error = false;
auto_flush = af; auto_flush = af;