From 2127637945ea6b763966398130e0770fa993c860 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 17 Jan 2006 18:09:40 +0000 Subject: Imported GNU Classpath 0.20 Imported GNU Classpath 0.20 * Makefile.am (AM_CPPFLAGS): Add classpath/include. * java/nio/charset/spi/CharsetProvider.java: New override file. * java/security/Security.java: Likewise. * sources.am: Regenerated. * Makefile.in: Likewise. From-SVN: r109831 --- libjava/classpath/java/io/PrintStream.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libjava/classpath/java/io/PrintStream.java') diff --git a/libjava/classpath/java/io/PrintStream.java b/libjava/classpath/java/io/PrintStream.java index 8e50559..99af255 100644 --- a/libjava/classpath/java/io/PrintStream.java +++ b/libjava/classpath/java/io/PrintStream.java @@ -1,5 +1,6 @@ /* PrintStream.java -- OutputStream for printing output - Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,6 +39,8 @@ exception statement from your version. */ package java.io; +import gnu.classpath.SystemProperties; + /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 * Status: Believed complete and correct to 1.3 @@ -64,7 +67,7 @@ public class PrintStream extends FilterOutputStream // Line separator string. private static final char[] line_separator - = System.getProperty("line.separator").toCharArray(); + = SystemProperties.getProperty("line.separator").toCharArray(); /** * Encoding name @@ -112,7 +115,7 @@ public class PrintStream extends FilterOutputStream super (out); try { - this.encoding = System.getProperty("file.encoding"); + this.encoding = SystemProperties.getProperty("file.encoding"); } catch (SecurityException e){ this.encoding = "ISO8859_1"; } catch (IllegalArgumentException e){ -- cgit v1.1