Changeset 20 in josm for src/org/openstreetmap/josm/data

Timestamp:

2005-10-13T08:27:12+02:00 (19 years ago)

Author:

imi

Message:

Added bookmarks for importing and fixed password dialog

File:

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

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

@@ -6 +6 @@
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -79 +80 @@
          * Return the location of the preferences file
          */
-        public static String getPreferencesFile() {
-                return System.getProperty("user.home")+"/.josm-preferences";
+        public static String getPreferencesDir() {
+                return System.getProperty("user.home")+"/.josm/";
         }
         
@@ -91 +92 @@
                         super(message, cause);
                 }
+                public PreferencesException(String message) {
+                        super(message);
+                }
         }
         /**
@@ -97 +101 @@
          */
         public void load() throws PreferencesException {
-                File file = new File(System.getProperty("user.home")+"/.josm-preferences");
+                File file = new File(getPreferencesDir()+"/preferences");
                 Element root;
                 try {
@@ -159 +163 @@
 
                 try {
-                        final FileWriter file = new FileWriter(getPreferencesFile());
+                        File prefDir = new File(getPreferencesDir());
+                        if (prefDir.exists() && !prefDir.isDirectory())
+                                throw new PreferencesException("Preferences directory "+getPreferencesDir()+" is not a directory.");
+                        if (!prefDir.exists())
+                                prefDir.mkdirs();
+
+                        FileWriter file = new FileWriter(getPreferencesDir()+"/preferences");
                         new XMLOutputter(Format.getPrettyFormat()).output(root, file);
                         file.close();
-                } catch (Exception e) {
+                } catch (IOException e) {
                         throw new PreferencesException("Could not write preferences", e);
                 }