Changeset 10696 in josm for trunk

Timestamp:

2016-08-01T21:17:23+02:00 (8 years ago)

Author:

simon04

Message:

Status report: distinguish +active vs. -inactive style/preset/rule entries

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (6 diffs)
• plugins/PluginHandler.java (modified) (2 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 java.util.stream.Collectors;
 
 import org.openstreetmap.josm.Main;
@@ -28 +28 @@
 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;
@@ -37 +35 @@
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReportSender;
 import org.openstreetmap.josm.tools.bugreport.DebugTextDisplay;
@@ -153 +152 @@
             }
         }
-        text.append('\n').append(PluginHandler.getBugReportText()).append('\n');
-
+        text.append("\n");
+        appendCollection(text, "Plugins", Utils.transform(PluginHandler.getBugReportInformation(), i -> "+ " + i));
         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());
+        appendCollection(text, "Last errors/warnings", Utils.transform(Main.getLastErrorAndWarnings(), i -> "- " + i));
 
         String osmApi = OsmApi.getOsmApi().getServerUrl();
@@ -169 +168 @@
 
     private 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;
+        final Set<String> defaultUrls = helper.getDefault().stream()
+                .map(i -> i.url)
+                .collect(Collectors.toSet());
+        return helper.get().stream()
+                .filter(i -> !defaultUrls.contains(i.url))
+                .map(i -> (i.active ? "+ " : "- ") + i.url)
+                .collect(Collectors.toList());
     }
 
@@ -224 +222 @@
     }
 
-    private static <T> void appendCollection(StringBuilder text, String label, Collection<T> col) {
+    private static void appendCollection(StringBuilder text, String label, Collection<String> col) {
         if (!col.isEmpty()) {
-            text.append(label+":\n");
-            for (T o : col) {
-                text.append("- ").append(paramCleanup(o.toString())).append('\n');
+            text.append(label).append(":\n");
+            for (String o : col) {
+                text.append(paramCleanup(o)).append('\n');
             }
             text.append('\n');

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -1377 +1377 @@
     /**
      * Returns the list of loaded plugins as a {@code String} to be displayed in status report. Useful for bug reports.
-     * @return The list of loaded plugins (one plugin per line)
-     */
-    public static String getBugReportText() {
-        StringBuilder text = new StringBuilder();
-        List<String> pl = new LinkedList<>(Main.pref.getCollection("plugins", new LinkedList<String>()));
+     * @return The list of loaded plugins
+     */
+    public static Collection<String> getBugReportInformation() {
+        final Collection<String> pl = new TreeSet<>(Main.pref.getCollection("plugins", new LinkedList<>()));
         for (final PluginProxy pp : pluginList) {
             PluginInformation pi = pp.getPluginInformation();
@@ -1388 +1387 @@
                     ? pi.localversion : "unknown") + ')');
         }
-        Collections.sort(pl);
-        if (!pl.isEmpty()) {
-            text.append("Plugins:\n");
-        }
-        for (String s : pl) {
-            text.append("- ").append(s).append('\n');
-        }
-        return text.toString();
+        return pl;
     }