Changeset 16579 in josm for trunk/src/org

Timestamp:

2020-06-08T21:53:03+02:00 (4 years ago)

Author:

simon04

Message:

fix #19058 - Corrupt line "imagery.entries" in status report

File:

• trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (2 diffs)

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

@@ -277 +277 @@
     }
 
+    private static String valueCleanup(Object value) {
+        String valueString = value.toString();
+        if (valueString.length() > 512 && value instanceof Collection<?>) {
+            valueString = ((Collection<?>) value).stream().map(v -> {
+                if (v instanceof Map<?, ?>) {
+                    LinkedHashMap<Object, Object> map = new LinkedHashMap<>(((Map<?, ?>) v));
+                    map.computeIfPresent("icon", (k, icon) -> Utils.shortenString(icon.toString(), 32)); // see #19058
+                    return map.toString();
+                } else {
+                    return String.valueOf(v);
+                }
+            }).collect(Collectors.joining(",\n  ", "[", "\n]"));
+        }
+        return paramCleanup(valueString);
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
@@ -295 +311 @@
             text.append(paramCleanup(key))
                     .append('=')
-                    .append(paramCleanup(setting.getValue().toString()))
+                    .append(valueCleanup(setting.getValue()))
                     .append('\n');
         });