Changeset 17989 in josm for trunk

Timestamp:

2021-07-11T00:37:41+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #20991 - see #18232 - restore ability to export validator errors, broken since r15463

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/ValidatorErrorWriter.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/io/ValidatorErrorWriterTest.java (added)

trunk/src/org/openstreetmap/josm/io/ValidatorErrorWriter.java

@@ -11 +11 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
@@ -63 +64 @@
      */
     public void write(Collection<TestError> validationErrors) throws IOException {
-        Set<Test> analysers = validationErrors.stream().map(TestError::getTester).collect(Collectors.toCollection(TreeSet::new));
+        Set<Test> analysers = validationErrors.stream().map(TestError::getTester)
+                .sorted(Comparator.comparing(t -> t.getSource().toString())).collect(Collectors.toCollection(LinkedHashSet::new));
         String timestamp = Instant.now().toString();
 
@@ -100 +102 @@
                         out.println("/>");
                         for (OsmPrimitive p : error.getPrimitives()) {
+                            out.print("    ");
                             p.accept(osmWriter);
                         }
@@ -126 +129 @@
                 out.println("  </analyser>");
             }
+
+            out.println("</analysers>");
+            out.flush();
         }
-
-        out.println("</analysers>");
-        out.flush();
     }