Merged gcj-eclipse branch to trunk.

From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions

View file

@ -39,6 +39,9 @@ exception statement from your version. */
package java.io;
import java.util.Locale;
import java.util.Formatter;
import gnu.classpath.SystemProperties;
/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
@ -58,8 +61,9 @@ import gnu.classpath.SystemProperties;
*
* @author Aaron M. Renn (arenn@urbanophile.com)
* @author Tom Tromey (tromey@cygnus.com)
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
*/
public class PrintStream extends FilterOutputStream
public class PrintStream extends FilterOutputStream implements Appendable
{
/* Notice the implementation is quite similar to OutputStreamWriter.
* This leads to some minor duplication, because neither inherits
@ -67,7 +71,7 @@ public class PrintStream extends FilterOutputStream
// Line separator string.
private static final char[] line_separator
= SystemProperties.getProperty("line.separator").toCharArray();
= SystemProperties.getProperty("line.separator", "\n").toCharArray();
/**
* Encoding name
@ -620,5 +624,51 @@ public class PrintStream extends FilterOutputStream
setError ();
}
}
} // class PrintStream
/** @since 1.5 */
public PrintStream append(char c)
{
print(c);
return this;
}
/** @since 1.5 */
public PrintStream append(CharSequence cs)
{
print(cs == null ? "null" : cs.toString());
return this;
}
/** @since 1.5 */
public PrintStream append(CharSequence cs, int start, int end)
{
print(cs == null ? "null" : cs.subSequence(start, end).toString());
return this;
}
/** @since 1.5 */
public PrintStream printf(String format, Object... args)
{
return format(format, args);
}
/** @since 1.5 */
public PrintStream printf(Locale locale, String format, Object... args)
{
return format(locale, format, args);
}
/** @since 1.5 */
public PrintStream format(String format, Object... args)
{
return format(Locale.getDefault(), format, args);
}
/** @since 1.5 */
public PrintStream format(Locale locale, String format, Object... args)
{
Formatter f = new Formatter(this, locale);
f.format(format, args);
return this;
}
} // class PrintStream