Changeset 12667 in josm for trunk/src/org/openstreetmap/josm/data/validation

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

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• OsmValidator.java (modified) (3 diffs)
• Severity.java (modified) (3 diffs)
• Test.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -17 +17 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -62 +66 @@
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -389 +394 @@
     }
 
+    /**
+     * Groups the given collection of errors by severity, then message, then description.
+     * @param errors list of errors to group
+     * @param filterToUse optional filter
+     * @return collection of errors grouped by severity, then message, then description
+     * @since 12667
+     */
+    public static Map<Severity, Map<String, Map<String, List<TestError>>>> getErrorsBySeverityMessageDescription(
+            Collection<TestError> errors, Predicate<? super TestError> filterToUse) {
+        return 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()
+                                ))));
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/Severity.java

@@ -14 +14 @@
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     /** Error messages */
-    ERROR(tr("Errors"), /* ICON(data/) */"error",       new ColorProperty(marktr("validation error"), Color.RED).get()),
+    ERROR(1, tr("Errors"), /* ICON(data/) */"error",       new ColorProperty(marktr("validation error"), Color.RED).get()),
     /** Warning messages */
-    WARNING(tr("Warnings"), /* ICON(data/) */"warning", new ColorProperty(marktr("validation warning"), Color.YELLOW).get()),
+    WARNING(2, tr("Warnings"), /* ICON(data/) */"warning", new ColorProperty(marktr("validation warning"), Color.YELLOW).get()),
     /** Other messages */
-    OTHER(tr("Other"), /* ICON(data/) */"other",        new ColorProperty(marktr("validation other"), Color.CYAN).get());
+    OTHER(3, tr("Other"), /* ICON(data/) */"other",        new ColorProperty(marktr("validation other"), Color.CYAN).get());
     // CHECKSTYLE.ON: SingleSpaceSeparator
+
+    /** Numeric ordering of the severities, 1 being major, 3 being minor */
+    private final int level;
 
     /** Description of the severity code */
@@ -33 +36 @@
      * Constructor
      *
+     * @param level Numeric ordering, 1 being major, 3 being minor
      * @param message Description
      * @param icon Associated icon
      * @param color The color of this severity
      */
-    Severity(String message, String icon, Color color) {
+    Severity(int level, String message, String icon, Color color) {
+        this.level = level;
         this.message = message;
         this.icon = icon;
@@ -72 +77 @@
         return color;
     }
+
+    /**
+     * Gets the severity level, 1 being major, 3 being minor
+     * @return The severity level
+     * @since 12667
+     */
+    public int getLevel() {
+        return level;
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -39 +39 @@
  * @author frsantos
  */
-public class Test extends AbstractVisitor {
+public class Test extends AbstractVisitor implements Comparable<Test> {
 
     protected static final Predicate<OsmPrimitive> IN_DOWNLOADED_AREA = new NotOutsideDataSourceArea();
@@ -359 +359 @@
                Objects.equals(description, test.description);
     }
+
+    @Override
+    public int compareTo(Test t) {
+        return name.compareTo(t.name);
+    }
 }