Changeset 12667 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2017-08-26T21:28:55+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14704 - allow to export validator errors ("Save as" in validator layer contextual menu). Same format than Osmose

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumMap;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -15 +14 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import javax.swing.JTree;
@@ -40 +37 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
+import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -45 +43 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ListenerList;
@@ -191 +188 @@
         }
         Map<Severity, Map<String, Map<String, List<TestError>>>> errorsBySeverityMessageDescription
-            = errors.stream().filter(filterToUse).collect(
-                    Collectors.groupingBy(TestError::getSeverity, () -> new EnumMap<>(Severity.class),
-                            Collectors.groupingBy(TestError::getMessage, () -> new TreeMap<>(AlphanumComparator.getInstance()),
-                                    Collectors.groupingBy(e -> e.getDescription() == null ? "" : e.getDescription(),
-                                            () -> new TreeMap<>(AlphanumComparator.getInstance()),
-                                            Collectors.toList()
-                                    ))));
+            = OsmValidator.getErrorsBySeverityMessageDescription(errors, filterToUse);
 
         final List<TreePath> expandedPaths = new ArrayList<>();