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

Timestamp:

2013-03-19T02:09:12+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8517 - Sort validator results (based on patch by windu.2b)

Location:

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

Files:

• TestError.java (modified) (3 diffs)
• tests/DuplicateRelation.java (modified) (3 diffs)
• tests/OverlappingWays.java (modified) (2 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
 
 /**
@@ -19 +20 @@
  * @author frsantos
  */
-public class TestError {
+public class TestError implements Comparable<TestError> {
     /** is this error on the ignore list */
     private Boolean ignored = false;
@@ -277 +278 @@
         return highlighted;
     }
+
+    @Override
+    public int compareTo(TestError o) {
+        if (equals(o)) return 0;
+        
+        MultipleNameVisitor v1 = new MultipleNameVisitor();
+        MultipleNameVisitor v2 = new MultipleNameVisitor();
+
+        v1.visit(getPrimitives());
+        v2.visit(o.getPrimitives());
+        return v1.toString().compareToIgnoreCase(v2.toString());
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -192 +192 @@
     public void endTest() {
         super.endTest();
-        for(LinkedHashSet<OsmPrimitive> duplicated : relations.values()) {
+        for (Set<OsmPrimitive> duplicated : relations.values()) {
             if (duplicated.size() > 1) {
                 TestError testError = new TestError(this, Severity.ERROR, tr("Duplicated relations"), DUPLICATE_RELATION, duplicated);
@@ -199 +199 @@
         }
         relations = null;
-        for(LinkedHashSet<OsmPrimitive> duplicated : relations_nokeys.values()) {
+        for (Set<OsmPrimitive> duplicated : relations_nokeys.values()) {
             if (duplicated.size() > 1) {
                 TestError testError = new TestError(this, Severity.WARNING, tr("Relations with same members"), SAME_RELATION, duplicated);

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -56 +56 @@
     @Override
     public void endTest() {
-        Map<List<Way>, LinkedHashSet<WaySegment>> ways_seen = new HashMap<List<Way>, LinkedHashSet<WaySegment>>(500);
+        Map<List<Way>, Set<WaySegment>> ways_seen = new HashMap<List<Way>, Set<WaySegment>>(500);
 
-        for (LinkedHashSet<WaySegment> duplicated : nodePairs.values()) {
+        for (Set<WaySegment> duplicated : nodePairs.values()) {
             int ways = duplicated.size();