Changeset 8315 in josm for trunk

Timestamp:

2015-05-02T23:33:56+02:00 (10 years ago)

Author:

stoecker

Message:

remove old migration code

Location:

trunk

Files:

• data/fr.lang (modified) ( previous)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (modified) (3 diffs)

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

@@ -1709 +1709 @@
 
         String[] obsolete = {
-                "osm.notes.enableDownload" // was used prior to r8071 when notes was an hidden feature. To remove end of 2015
+                "osm.notes.enableDownload", // was used prior to r8071 when notes was an hidden feature. To remove end of 2015
+                "mappaint.style.migration.switchedToMapCSS", // was used prior to 8315 for MapCSS switch. To remove end of 2015
+                "mappaint.style.migration.changedXmlName" // was used prior to 8315 for MapCSS switch. To remove end of 2015
         };
         for (String key : obsolete) {

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -218 +218 @@
             boolean changed = false;
 
-            boolean addedMapcssStyle = false; // Migration code can be removed ~ Nov. 2014
-
             Collection<String> knownDefaults = new TreeSet<>(Main.pref.getCollection("mappaint.style.known-defaults"));
 
@@ -237 +235 @@
                     insertionIdx++;
                     changed = true;
-                    /* Migration code can be removed ~ Nov. 2014 */
-                    if ("resource://styles/standard/elemstyles.mapcss".equals(def.url)) {
-                        addedMapcssStyle = true;
-                    }
                 } else {
                     if (i >= insertionIdx) {
@@ -254 +248 @@
             knownDefaults.remove(OLD_ELEMSTYLES_XML);
             Main.pref.putCollection("mappaint.style.known-defaults", knownDefaults);
-
-            /* Migration code can be removed ~ Nov. 2014 */
-            if (addedMapcssStyle) {
-                // change title of the XML entry
-                // only do this once. If the user changes it afterward, do not touch
-                if (!Main.pref.getBoolean("mappaint.style.migration.changedXmlName", false)) {
-                    SourceEntry josmXml = Utils.find(list, new Predicate<SourceEntry>() {
-                        @Override
-                        public boolean evaluate(SourceEntry se) {
-                            return OLD_ELEMSTYLES_XML.equals(se.url);
-                        }
-                    });
-                    if (josmXml != null) {
-                        josmXml.title = tr("JOSM default (XML; old version)");
-                        changed = true;
-                    }
-                    Main.pref.put("mappaint.style.migration.changedXmlName", true);
-                }
-            }
-
-            /* Migration code can be removed ~ Nov. 2014 */
-            if (!Main.pref.getBoolean("mappaint.style.migration.switchedToMapCSS", false)) {
-                SourceEntry josmXml = Utils.find(list, new Predicate<SourceEntry>() {
-                    @Override
-                    public boolean evaluate(SourceEntry se) {
-                        return "resource://styles/standard/elemstyles.xml".equals(se.url);
-                    }
-                });
-                SourceEntry josmMapCSS = Utils.find(list, new Predicate<SourceEntry>() {
-                    @Override
-                    public boolean evaluate(SourceEntry se) {
-                        return "resource://styles/standard/elemstyles.mapcss".equals(se.url);
-                    }
-                });
-                if (josmXml != null && josmMapCSS != null && josmXml.active) {
-                    josmMapCSS.active = true;
-                    josmXml.active = false;
-                    Main.info("Switched mappaint style from XML format to MapCSS (one time migration).");
-                    changed = true;
-                }
-                // in any case, do this check only once:
-                Main.pref.put("mappaint.style.migration.switchedToMapCSS", true);
-            }
 
             // XML style is not bundled anymore