Changeset 4592 in josm

Timestamp:

2011-11-14T15:04:41+01:00 (13 years ago)

Author:

bastiK

Message:

see #7027 - xml formatted preference data is now written to the new file preferences.xml. The old preference file is read when no xml file is found, but otherwise not touched from now on.

File:

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

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

@@ -75 +75 @@
     protected final SortedMap<String, String> colornames = new TreeMap<String, String>();
 
-    /* NOTE: FIXME: Remove when saving XML enabled */
-    private boolean loadedXML = true;
-
     public interface PreferenceChangeEvent{
         String getKey();
@@ -164 +161 @@
 
     public File getPreferenceFile() {
+        return new File(getPreferencesDirFile(), "preferences.xml");
+    }
+
+    public File getOldPreferenceFile() {
         return new File(getPreferencesDirFile(), "preferences");
     }
@@ -388 +389 @@
         final PrintWriter out = new PrintWriter(new OutputStreamWriter(
                 new FileOutputStream(prefFile + "_tmp"), "utf-8"), false);
-        /* FIXME: NOTE: loadedXML - removed 01.12.2011 */
-        if(loadedXML) {
-            out.print(toXML(false));
-        } else {
-            for (final Entry<String, String> e : properties.entrySet()) {
-                String s = defaults.get(e.getKey());
-                /* don't save default values */
-                if(s == null || !s.equals(e.getValue())) {
-                    out.println(e.getKey() + "=" + e.getValue());
-                }
-              }
-        }
+        out.print(toXML(false));
         out.close();
 
@@ -446 +436 @@
     }
 
+    public void loadOld() throws Exception {
+        load(true);
+    }
+
     public void load() throws Exception {
+        load(false);
+    }
+
+    private void load(boolean old) throws Exception {
         properties.clear();
         if(!Main.applet) {
             final BufferedReader in = new BufferedReader(new InputStreamReader(
-                    new FileInputStream(getPreferencesDir()+"preferences"), "utf-8"));
+                    new FileInputStream(old ? getOldPreferenceFile() : getPreferenceFile()), "utf-8"));
             /* FIXME: TODO: remove old style config file end of 2012 */
             try {
-                in.mark(1);
-                int v = in.read();
-                in.reset();
-                if(v == '<') {
+                if (old) {
+                    in.mark(1);
+                    int v = in.read();
+                    in.reset();
+                    if(v == '<') {
+                        fromXML(in);
+                    } else {
+                        int lineNumber = 0;
+                        ArrayList<Integer> errLines = new ArrayList<Integer>();
+                        for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) {
+                            final int i = line.indexOf('=');
+                            if (i == -1 || i == 0) {
+                                errLines.add(lineNumber);
+                                continue;
+                            }
+                            String key = line.substring(0,i);
+                            String value = line.substring(i+1);
+                            if (!value.isEmpty()) {
+                                properties.put(key, value);
+                            }
+                        }
+                        if (!errLines.isEmpty())
+                            throw new IOException(tr("Malformed config file at lines {0}", errLines));
+                    }
+                } else {
                     fromXML(in);
-                } else {
-                    loadedXML = false;
-                    int lineNumber = 0;
-                    ArrayList<Integer> errLines = new ArrayList<Integer>();
-                    for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) {
-                        final int i = line.indexOf('=');
-                        if (i == -1 || i == 0) {
-                            errLines.add(lineNumber);
-                            continue;
-                        }
-                        String key = line.substring(0,i);
-                        String value = line.substring(i+1);
-                        if (!value.isEmpty()) {
-                            properties.put(key, value);
-                        }
-                    }
-                    if (!errLines.isEmpty())
-                        throw new IOException(tr("Malformed config file at lines {0}", errLines));
                 }
             } finally {
@@ -526 +527 @@
         try {
             if (!preferenceFile.exists()) {
-                System.out.println(tr("Warning: Missing preference file ''{0}''. Creating a default preference file.", preferenceFile.getAbsoluteFile()));
-                resetToDefault();
-                save();
+                File oldPreferenceFile = getOldPreferenceFile();
+                if (!oldPreferenceFile.exists()) {
+                    System.out.println(tr("Warning: Missing preference file ''{0}''. Creating a default preference file.", preferenceFile.getAbsoluteFile()));
+                    resetToDefault();
+                    save();
+                } else {
+                    try {
+                        loadOld();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        File backupFile = new File(prefDir,"preferences.bak");
+                        JOptionPane.showMessageDialog(
+                                Main.parent,
+                                tr("<html>Preferences file had errors.<br> Making backup of old one to <br>{0}<br> and creating a new default preference file.</html>", backupFile.getAbsoluteFile()),
+                                tr("Error"),
+                                JOptionPane.ERROR_MESSAGE
+                        );
+                        Main.platform.rename(oldPreferenceFile, backupFile);
+                        try {
+                            resetToDefault();
+                            save();
+                        } catch(IOException e1) {
+                            e1.printStackTrace();
+                            System.err.println(tr("Warning: Failed to initialize preferences. Failed to reset preference file to default: {0}", getPreferenceFile()));
+                        }
+                    }
+                    return;
+                }
             } else if (reset) {
                 System.out.println(tr("Warning: Replacing existing preference file ''{0}'' with default preference file.", preferenceFile.getAbsoluteFile()));
@@ -548 +574 @@
         } catch (Exception e) {
             e.printStackTrace();
-            File backupFile = new File(prefDir,"preferences.bak");
+            File backupFile = new File(prefDir,"preferences.xml.bak");
             JOptionPane.showMessageDialog(
                     Main.parent,