Changeset 11424 in josm for trunk/src

Timestamp:

2016-12-31T17:29:54+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #10387, fix #12914 - enable territorial rules by default

File:

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

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

@@ -68 +68 @@
 import org.openstreetmap.josm.data.preferences.Setting;
 import org.openstreetmap.josm.data.preferences.StringSetting;
+import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
+import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference.RulePrefHelper;
 import org.openstreetmap.josm.io.OfflineAccessException;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -1521 +1523 @@
             migrateOldColorKeys();
         }
+        // drop in September 2017
+        if (loadedVersion < 11424) {
+            addNewerDefaultEntry(
+                    "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+                    "resource://data/validator/territories.mapcss");
+        }
 
         for (String key : OBSOLETE_PREF_KEYS) {
@@ -1570 +1578 @@
     }
 
+    private void addNewerDefaultEntry(String key, final String url) {
+        Setting<?> setting = settingsMap.get(key);
+        if (setting instanceof MapListSetting) {
+            List<Map<String, String>> l = new ArrayList<>(((MapListSetting) setting).getValue());
+            if (l.stream().noneMatch(x -> x.values().contains(url))) {
+                RulePrefHelper helper = ValidatorTagCheckerRulesPreference.RulePrefHelper.INSTANCE;
+                l.add(helper.serialize(helper.getDefault().stream().filter(x -> url.equals(x.url)).findFirst().get()));
+                putListOfStructs(key, l);
+            }
+        }
+    }
+
     /**
      * Enables or not the preferences file auto-save mechanism (save each time a setting is changed).