Changeset 2618 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2009-12-12T16:38:28+01:00 (16 years ago)

Author:

Gubaer

Message:

fixed #4153: Upload dialog's "Upload to '$URL'" isn't updated when the API URL is changed in the preferences
fixed #3642: JOSM offers to use open changeset from a different server

File:

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

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

@@ -24 +24 @@
 import java.util.TreeMap;
 import java.util.Map.Entry;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -50 +51 @@
     private File preferencesDirFile = null;
 
+    public static interface PreferenceChangeEvent{
+        public String getKey();
+        public String getOldValue();
+        public String getNewValue();
+    }
+
     public static interface PreferenceChangedListener {
-        void preferenceChanged(String key, String newValue);
+        void preferenceChanged(PreferenceChangeEvent e);
+    }
+
+    private static class DefaultPreferenceChangeEvent implements PreferenceChangeEvent {
+        private String key;
+        private String oldValue;
+        private String newValue;
+
+        public DefaultPreferenceChangeEvent(String key, String oldValue, String newValue) {
+            this.key = key;
+            this.oldValue = oldValue;
+            this.newValue = newValue;
+        }
+
+        public String getKey() {
+            return key;
+        }
+        public void setKey(String key) {
+            this.key = key;
+        }
+        public String getOldValue() {
+            return oldValue;
+        }
+        public void setOldValue(String oldValue) {
+            this.oldValue = oldValue;
+        }
+        public String getNewValue() {
+            return newValue;
+        }
+        public void setNewValue(String newValue) {
+            this.newValue = newValue;
+        }
     }
 
@@ -96 +134 @@
     }
 
-    public final ArrayList<PreferenceChangedListener> listener = new ArrayList<PreferenceChangedListener>();
+    private final CopyOnWriteArrayList<PreferenceChangedListener> listeners = new CopyOnWriteArrayList<PreferenceChangedListener>();
+
+
+    public void addPreferenceChangeListener(PreferenceChangedListener listener) {
+        if (listener != null && ! listeners.contains(listener)) {
+            listeners.add(listener);
+        }
+    }
+
+    public void removePreferenceChangeListener(PreferenceChangedListener listener) {
+        if (listener != null && listeners.contains(listener)) {
+            listeners.remove(listener);
+        }
+    }
+
+    protected void firePrefrenceChanged(String key, String oldValue, String newValue) {
+        PreferenceChangeEvent evt = new DefaultPreferenceChangeEvent(key, oldValue, newValue);
+        for (PreferenceChangedListener l : listeners) {
+            l.preferenceChanged(evt);
+        }
+    }
 
     /**
@@ -289 +347 @@
                 System.out.println(tr("Warning: failed to persist preferences to ''{0}''", getPreferenceFile().getAbsoluteFile()));
             }
-            firePreferenceChanged(key, value);
+            firePrefrenceChanged(key, oldvalue, value);
             return true;
         }
@@ -311 +369 @@
     }
 
-    private final void firePreferenceChanged(final String key, final String value) {
-        for (final PreferenceChangedListener l : listener) {
-            l.preferenceChanged(key, value);
-        }
-    }
 
     /**
@@ -618 +671 @@
     synchronized public String getCollectionAsString(final String key) {
         String s = get(key);
-        if(s != null && s.length() != 0)
+        if(s != null && s.length() != 0) {
             s = s.replaceAll("\u001e",",");
+        }
         return s;
     }