Changeset 441 in josm for trunk

Timestamp:

2007-10-30T02:41:13+01:00 (17 years ago)

Author:

framm

Message:

• revert change 439. do not use Java properties.

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -4 +4 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -14 +12 @@
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Properties;
 import java.util.SortedMap;
 import java.util.StringTokenizer;
@@ -174 +171 @@
          */
         protected void save() {
-                final Properties props = new Properties();
-                for (Map.Entry<String, String> e : properties.entrySet()) {
-                        props.setProperty(e.getKey(), e.getValue());
-                }
-
                 try {
-                        props.store(new FileOutputStream(getPreferencesDir() + "preferences"), null);
+                        final PrintWriter out = new PrintWriter(new FileWriter(getPreferencesDir() + "preferences"), false);
+                        for (final Entry<String, String> e : properties.entrySet()) {
+                                if (!e.getValue().equals(""))
+                                        out.println(e.getKey() + "=" + e.getValue());
+                        }
+                        out.close();
                 } catch (final IOException e) {
                         e.printStackTrace();
@@ -189 +186 @@
 
         public void load() throws IOException {
-                final Properties props = new Properties();
-                props.load(new FileInputStream(getPreferencesDir()+"preferences"));
-
                 properties.clear();
-                for (String key : props.stringPropertyNames()) {
-                        properties.put(key, props.getProperty(key));
+                final BufferedReader in = new BufferedReader(new FileReader(getPreferencesDir()+"preferences"));
+                int lineNumber = 0;
+                for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) {
+                        final int i = line.indexOf('=');
+                        if (i == -1 || i == 0)
+                                throw new IOException("Malformed config file at line "+lineNumber);
+                        properties.put(line.substring(0,i), line.substring(i+1));
                 }
         }