Changeset 12958 in josm for trunk

Timestamp:

2017-10-09T01:17:00+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14645 - distinguish crossing ways validator error subtypes to properly ignore the selected group only

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java (modified) (10 diffs)

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

@@ -30 +30 @@
  */
 public abstract class CrossingWays extends Test {
-    protected static final int CROSSING_WAYS = 601;
 
     static final String HIGHWAY = "highway";
@@ -41 +40 @@
     private final Map<List<Way>, List<WaySegment>> seenWays = new HashMap<>(50);
 
+    private final int code;
+
     /**
      * General crossing ways test.
      */
     public static class Ways extends CrossingWays {
+
+        protected static final int CROSSING_WAYS = 601;
 
         /**
@@ -50 +53 @@
          */
         public Ways() {
-            super(tr("Crossing ways"));
+            super(tr("Crossing ways"), CROSSING_WAYS);
         }
 
@@ -107 +110 @@
     public static class Boundaries extends CrossingWays {
 
+        protected static final int CROSSING_BOUNDARIES = 602;
+
         /**
          * Constructs a new crossing {@code Boundaries} test.
          */
         public Boundaries() {
-            super(tr("Crossing boundaries"));
+            super(tr("Crossing boundaries"), CROSSING_BOUNDARIES);
         }
 
@@ -142 +147 @@
      */
     public static class Barrier extends CrossingWays {
+
+        protected static final int CROSSING_BARRIERS = 603;
 
         /**
@@ -147 +154 @@
          */
         public Barrier() {
-            super(tr("Crossing barriers"));
+            super(tr("Crossing barriers"), CROSSING_BARRIERS);
         }
 
@@ -170 +177 @@
      */
     public static class SelfCrossing extends CrossingWays {
+
+        protected static final int CROSSING_SELF = 604;
+
         CrossingWays.Ways normalTest = new Ways();
         CrossingWays.Barrier barrierTest = new Barrier();
@@ -178 +188 @@
          */
         public SelfCrossing() {
-            super(tr("Self crossing"));
+            super(tr("Self crossing"), CROSSING_SELF);
         }
 
@@ -201 +211 @@
      * Constructs a new {@code CrossingWays} test.
      * @param title The test title
-     * @since 6691
-     */
-    public CrossingWays(String title) {
+     * @param code The test code
+     * @since 12958
+     */
+    public CrossingWays(String title, int code) {
         super(title, tr("This test checks if two roads, railways, waterways or buildings crosses in the same layer, " +
                 "but are not connected by a node."));
+        this.code = code;
     }
 
@@ -290 +302 @@
 
                         final String message = createMessage(es1.way, es2.way);
-                        errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
+                        errors.add(TestError.builder(this, Severity.WARNING, code)
                                 .message(message)
                                 .primitives(prims)