Changeset 3883 in josm

Timestamp:

Feb 10, 2011 11:50:23 AM (2 years ago)

Author:

bastiK

Message:

fixed #5921 - legacy stuff

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.BorderFactory;
@@ -29 +32 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
+import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetMenu;
@@ -300 +304 @@
 
         @Override
+        public List<SourceEntry> get() {
+            List<SourceEntry> ls = new ArrayList<SourceEntry>(super.get());
+            if (removeDeprecated(ls)) {
+                put(ls);
+            }
+            return ls;
+        }
+
+        /**
+         * The internal path of elemstyles.xml has changed, this
+         * can be removed when a few months have passed.
+         */
+        private boolean removeDeprecated(List<SourceEntry> ls) {
+            boolean changed = false;
+            Iterator<SourceEntry> it = ls.iterator();
+            while (it.hasNext()) {
+                SourceEntry se = it.next();
+                if (se.url.equals("resource://data/elemstyles.xml")) {
+                    it.remove();
+                    changed = true;
+                }
+            }
+            return changed;
+        }
+
+        @Override
         public Collection<ExtendedSourceEntry> getDefault() {
             ExtendedSourceEntry i = new ExtendedSourceEntry("defaultpresets.xml", "resource://data/defaultpresets.xml");