Changeset 2618 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-12-12T16:38:28+01:00 (14 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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (6 diffs)
• data/osm/ChangesetCache.java (modified) (3 diffs)
• gui/io/UploadDialog.java (modified) (4 diffs)
• gui/layer/RawGpsLayer.java (modified) (4 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;
     }

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -10 +10 @@
 import java.util.logging.Logger;
 
-public class ChangesetCache {
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+
+public class ChangesetCache implements PreferenceChangedListener{
     static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
     static private final ChangesetCache instance = new ChangesetCache();
@@ -24 +28 @@
 
     private ChangesetCache() {
+        Main.pref.addPreferenceChangeListener(this);
     }
 
@@ -135 +140 @@
         return ret;
     }
+
+    /* ------------------------------------------------------------------------- */
+    /* interface PreferenceChangedListener                                       */
+    /* ------------------------------------------------------------------------- */
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        if (e.getKey() == null || ! e.getKey().equals("osm-server.url"))
+            return;
+
+        // clear the cache when the API url changes
+        if (e.getOldValue() == null || e.getNewValue() == null || !e.getOldValue().equals(e.getNewValue())) {
+            clear();
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -30 +30 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -45 +47 @@
  *
  */
-public class UploadDialog extends JDialog implements PropertyChangeListener{
+public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{
     protected static final Logger logger = Logger.getLogger(UploadDialog.class.getName());
 
@@ -221 +223 @@
                 }
         );
+
+        Main.pref.addPreferenceChangeListener(this);
     }
 
@@ -453 +457 @@
         }
     }
+
+    /* -------------------------------------------------------------------------- */
+    /* Interface PreferenceChangedListener                                        */
+    /* -------------------------------------------------------------------------- */
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        if (e.getKey() == null || ! e.getKey().equals("osm-server.url"))
+            return;
+        if (e.getNewValue() == null) {
+            setTitle(tr("Upload"));
+        } else {
+            setTitle(tr("Upload to ''{0}''", e.getNewValue()));
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -34 +34 @@
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -113 +114 @@
         setAssociatedFile(associatedFile);
         this.data = data;
-        Main.pref.listener.add(this);
+        Main.pref.addPreferenceChangeListener(this);
     }
 
@@ -284 +285 @@
     }
 
-    public void preferenceChanged(String key, String newValue) {
-        if (Main.map != null && (key.equals("draw.rawgps.lines") || key.equals("draw.rawgps.lines.force"))) {
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        if (Main.map != null && (e.getKey().equals("draw.rawgps.lines") || e.getKey().equals("draw.rawgps.lines.force"))) {
             Main.map.repaint();
         }
@@ -291 +292 @@
 
     @Override public void destroy() {
-        Main.pref.listener.remove(RawGpsLayer.this);
+        Main.pref.removePreferenceChangeListener(this);
     }
 }