Changeset 14468 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

Timestamp:

2018-11-30T09:45:11+01:00 (5 years ago)

Author:

GerdP

Message:

fix #16978 Use distinct code number for each test group in CrossingWays and UnconnectedWays

File:

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

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

@@ -46 +46 @@
  */
 public abstract class UnconnectedWays extends Test {
+    private final int code;
 
     /**
@@ -51 +52 @@
      */
     public static class UnconnectedHighways extends UnconnectedWays {
+        static final int UNCONNECTED_HIGHWAYS = 1311;
 
         /**
@@ -56 +58 @@
          */
         public UnconnectedHighways() {
-            super(tr("Unconnected highways"));
+            super(tr("Unconnected highways"), UNCONNECTED_HIGHWAYS);
         }
 
@@ -69 +71 @@
      */
     public static class UnconnectedRailways extends UnconnectedWays {
-
+        static final int UNCONNECTED_RAILWAYS = 1321;
         /**
          * Constructs a new {@code UnconnectedRailways} test.
          */
         public UnconnectedRailways() {
-            super(tr("Unconnected railways"));
+            super(tr("Unconnected railways"), UNCONNECTED_RAILWAYS);
         }
 
@@ -87 +89 @@
      */
     public static class UnconnectedWaterways extends UnconnectedWays {
-
+        static final int UNCONNECTED_WATERWAYS = 1331;
         /**
          * Constructs a new {@code UnconnectedWaterways} test.
          */
         public UnconnectedWaterways() {
-            super(tr("Unconnected waterways"));
+            super(tr("Unconnected waterways"), UNCONNECTED_WATERWAYS);
         }
 
@@ -105 +107 @@
      */
     public static class UnconnectedNaturalOrLanduse extends UnconnectedWays {
-
+        static final int UNCONNECTED_NATURAL_OR_LANDUSE = 1341;
         /**
          * Constructs a new {@code UnconnectedNaturalOrLanduse} test.
          */
         public UnconnectedNaturalOrLanduse() {
-            super(tr("Unconnected natural lands and landuses"));
+            super(tr("Unconnected natural lands and landuses"), UNCONNECTED_NATURAL_OR_LANDUSE);
         }
 
@@ -123 +125 @@
      */
     public static class UnconnectedPower extends UnconnectedWays {
-
+        static final int UNCONNECTED_POWER = 1351;
         /**
          * Constructs a new {@code UnconnectedPower} test.
          */
         public UnconnectedPower() {
-            super(tr("Unconnected power ways"));
+            super(tr("Unconnected power ways"), UNCONNECTED_POWER);
         }
 
@@ -156 +158 @@
      */
     public UnconnectedWays(String title) {
+        this(title, UNCONNECTED_WAYS);
+
+    }
+
+    /**
+     * Constructs a new {@code UnconnectedWays} test with the given code.
+     * @param title The test title
+     * @param code The test code
+     * @since 14468
+     */
+    public UnconnectedWays(String title, int code) {
         super(title, tr("This test checks if a way has an endpoint very near to another way."));
+        this.code = code;
     }
 
@@ -268 +282 @@
     protected final void addErrors(Severity severity, Map<Node, Way> errorMap, String message) {
         for (Map.Entry<Node, Way> error : errorMap.entrySet()) {
-            errors.add(TestError.builder(this, severity, UNCONNECTED_WAYS)
+            errors.add(TestError.builder(this, severity, code)
                     .message(message)
                     .primitives(error.getKey(), error.getValue())