Changeset 3507 in josm for trunk

Timestamp:

2010-09-02T19:26:26+02:00 (14 years ago)

Author:

stoecker

Message:

fix #6506 - applet destroys josm prefs

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (3 diffs)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)

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

@@ -382 +382 @@
 
         updateSystemProperties();
+        if(Main.applet)
+            return;
         File prefFile = new File(getPreferencesDirFile(), "preferences");
 
@@ -434 +436 @@
     public void load() throws IOException {
         properties.clear();
-        final BufferedReader in = new BufferedReader(new InputStreamReader(
-                new FileInputStream(getPreferencesDir()+"preferences"), "utf-8"));
-        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;
-            }
-            properties.put(line.substring(0,i), line.substring(i+1));
-        }
-        if (!errLines.isEmpty())
-            throw new IOException(tr("Malformed config file at lines {0}", errLines));
+        if(!Main.applet) {
+            final BufferedReader in = new BufferedReader(new InputStreamReader(
+                    new FileInputStream(getPreferencesDir()+"preferences"), "utf-8"));
+            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;
+                }
+                properties.put(line.substring(0,i), line.substring(i+1));
+            }
+            if (!errLines.isEmpty())
+                throw new IOException(tr("Malformed config file at lines {0}", errLines));
+        }
         updateSystemProperties();
     }
 
     public void init(boolean reset){
+        if(Main.applet)
+            return;
         // get the preferences.
         File prefDir = getPreferencesDirFile();
@@ -525 +531 @@
     }
 
+    /* TODO: Bookmarks should be stored in preferences */
     public File getBookmarksFile() {
         return new File(getPreferencesDir(),"bookmarks");

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -133 +133 @@
 
     public void savePreferences() {
-
+        if(Main.applet)
+            return;
         // create a task for downloading plugins if the user has activated, yet not downloaded,
         // new plugins