Changeset 10063 in josm for trunk/src

Timestamp:

2016-03-28T01:22:28+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #12691 - Include custom presets, map paint styles and validator rules in status report

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (3 diffs)
• data/Preferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -19 +19 @@
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.openstreetmap.josm.Main;
@@ -26 +27 @@
 import org.openstreetmap.josm.data.preferences.Setting;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.SourceEditor;
+import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
+import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;
@@ -158 +165 @@
         text.append('\n').append(PluginHandler.getBugReportText()).append('\n');
 
-        Collection<String> errorsWarnings = Main.getLastErrorAndWarnings();
-        if (!errorsWarnings.isEmpty()) {
-            text.append("Last errors/warnings:\n");
-            for (String s : errorsWarnings) {
-                text.append("- ").append(s).append('\n');
+        appendCollection(text, "Tagging presets", getCustomUrls(TaggingPresetPreference.PresetPrefHelper.INSTANCE));
+        appendCollection(text, "Map paint styles", getCustomUrls(MapPaintPreference.MapPaintPrefHelper.INSTANCE));
+        appendCollection(text, "Validator rules", getCustomUrls(ValidatorTagCheckerRulesPreference.RulePrefHelper.INSTANCE));
+        appendCollection(text, "Last errors/warnings", Main.getLastErrorAndWarnings());
+
+        return text.toString();
+    }
+
+    protected static Collection<String> getCustomUrls(SourceEditor.SourcePrefHelper helper) {
+        Set<String> set = new TreeSet<>();
+        for (SourceEntry entry : helper.get()) {
+            set.add(entry.url);
+        }
+        for (ExtendedSourceEntry def : helper.getDefault()) {
+            set.remove(def.url);
+        }
+        return set;
+    }
+
+    protected static <T> void appendCollection(StringBuilder text, String label, Collection<T> col) {
+        if (!col.isEmpty()) {
+            text.append(label+":\n");
+            for (T o : col) {
+                text.append("- ").append(o.toString()).append('\n');
             }
             text.append('\n');
         }
-
-        return text.toString();
     }
 

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

@@ -1460 +1460 @@
         }
         // drop in November 2016
-        if (loadedVersion < 9965) {
-            Setting<?> setting = settingsMap.get("mappaint.style.entries");
+        removeUrlFromEntries(loadedVersion, 9965,
+                "mappaint.style.entries",
+                "josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard");
+        // drop in December 2016
+        removeUrlFromEntries(loadedVersion, 10063,
+                "validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+                "resource://data/validator/power.mapcss");
+
+        for (String key : OBSOLETE_PREF_KEYS) {
+            if (settingsMap.containsKey(key)) {
+                settingsMap.remove(key);
+                Main.info(tr("Preference setting {0} has been removed since it is no longer used.", key));
+            }
+        }
+    }
+
+    private void removeUrlFromEntries(int loadedVersion, int versionMax, String key, String urlPart) {
+        if (loadedVersion < versionMax) {
+            Setting<?> setting = settingsMap.get(key);
             if (setting instanceof MapListSetting) {
                 List<Map<String, String>> l = new LinkedList<>();
@@ -1467 +1484 @@
                 for (Map<String, String> map: ((MapListSetting) setting).getValue()) {
                     String url = map.get("url");
-                    if (url != null && url.contains("josm.openstreetmap.de/josmfile?page=Styles/LegacyStandard")) {
+                    if (url != null && url.contains(urlPart)) {
                         modified = true;
                     } else {
@@ -1474 +1491 @@
                 }
                 if (modified) {
-                    putListOfStructs("mappaint.style.entries", l);
+                    putListOfStructs(key, l);
                 }
-            }
-        }
-
-        for (String key : OBSOLETE_PREF_KEYS) {
-            if (settingsMap.containsKey(key)) {
-                settingsMap.remove(key);
-                Main.info(tr("Preference setting {0} has been removed since it is no longer used.", key));
             }
         }