aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2001-09-06 17:16:09 +0000
committerTom Tromey <tromey@gcc.gnu.org>2001-09-06 17:16:09 +0000
commitd70dd6c83509271f6a63d46bf6bc04d3d9fb2640 (patch)
treebb66194dd86aa561e71fe9369f416ca5b1369f8a /libjava/java
parent1aae372ea5a890452d51da3e0d798e8d97f92638 (diff)
downloadgcc-d70dd6c83509271f6a63d46bf6bc04d3d9fb2640.zip
gcc-d70dd6c83509271f6a63d46bf6bc04d3d9fb2640.tar.gz
gcc-d70dd6c83509271f6a63d46bf6bc04d3d9fb2640.tar.bz2
* java/util/Properties.java: Re-merged from Classpath.
From-SVN: r45442
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/util/Properties.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java
index dc679fa..5812173 100644
--- a/libjava/java/util/Properties.java
+++ b/libjava/java/util/Properties.java
@@ -1,5 +1,5 @@
/* java.util.Properties
- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -61,7 +61,8 @@ import java.io.*;
* of <code>get/put</code>.
*
* @see PropertyResourceBundle
- * @author Jochen Hoenicke */
+ * @author Jochen Hoenicke
+ */
public class Properties extends Hashtable
{
/**
@@ -128,8 +129,9 @@ public class Properties extends Hashtable
* from the input. */
public void load(InputStream inStream) throws IOException
{
+ // The spec says that the file must be encoded using ISO-8859-1.
BufferedReader reader =
- new BufferedReader(new InputStreamReader(inStream));
+ new BufferedReader(new InputStreamReader(inStream, "ISO-8859-1"));
String line;
while ((line = reader.readLine()) != null)
@@ -302,7 +304,9 @@ public class Properties extends Hashtable
*/
public void store(OutputStream out, String header) throws IOException
{
- PrintWriter writer = new PrintWriter(out);
+ // The spec says that the file must be encoded using ISO-8859-1.
+ PrintWriter writer
+ = new PrintWriter(new OutputStreamWriter (out, "ISO-8859-1"));
if (header != null)
writer.println("#" + header);
writer.println("#" + new Date().toString());