2003-03-24 Michael Koch <konqueror@gmx.de>

* java/io/DataOutputStream.java
	(write): Merged from classpath.
	* java/io/File.java:
	Merged copyrigth with classpath.
	* java/io/FileInputStream.java
	(getChannel): Made it synchronized instead of using a synchronized
	block.
	* java/io/FileOutputStream.java: Reformatted.
	* java/io/InputStreamReader.java
	(InputStreamReader): Renamed enc to encoding_name.
	(close): Merged documentation from classpath.
	(getEncoding): Merged documentation from classpath.
	(ready): Merged documentation from classpath.
	(read): Merged documentation from classpath.
	* java/io/LineNumberReader.java
	(lineNumber): Made it private.
	(LineNumberReader): Use Constant instead of a direct value.
	* java/io/OutputStreamWriter.java
	(OutputStreamWriter): Renamed enc to encoding_scheme, merged
	documentation from classpath.
	(close): Merged documentation from classpath.
	(flush): Merged documentation from classpath.
	(write): Merged documentation from classpath.
	* java/io/PrintStream.java: Reformatted.

From-SVN: r64806
This commit is contained in:
Michael Koch 2003-03-24 15:43:22 +00:00 committed by Michael Koch
parent 6db450f90a
commit 950ebbeaf0
9 changed files with 140 additions and 50 deletions

View file

@ -55,12 +55,30 @@ public class PrintStream extends FilterOutputStream
* This leads to some minor duplication, because neither inherits
* from the other, and we want to maximize performance. */
public PrintStream (OutputStream out)
{
this(out, false);
}
public PrintStream (OutputStream out, boolean auto_flush)
{
super(out);
converter = UnicodeToBytes.getDefaultEncoder();
error = false;
this.auto_flush = auto_flush;
}
public boolean checkError ()
{
flush();
return error;
}
protected void setError ()
{
error = true;
}
public void close ()
{
try
@ -258,24 +276,6 @@ public class PrintStream extends FilterOutputStream
print(charArray, 0, charArray.length, true);
}
public PrintStream (OutputStream out)
{
this(out, false);
}
public PrintStream (OutputStream out, boolean af)
{
super(out);
converter = UnicodeToBytes.getDefaultEncoder();
error = false;
auto_flush = af;
}
protected void setError ()
{
error = true;
}
public void write (int oneByte)
{
try