Changeset 18506 in josm for trunk

Timestamp:

2022-07-04T06:42:13+02:00 (2 years ago)

Author:

GerdP

Message:

fix #22187, see #21825: Same error code 1708 for two different problems
I introduced this annoying bug with r14990 and it probably caused lots of empty relations since users where not warned when they ignored the less important message "Role of relation member does not match template expression"

File:

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

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

@@ -53 +53 @@
     /** Empty role found when expecting one of ''{0}'' */
     public static final int ROLE_EMPTY       = 1702;
-    /** Role of relation member does not match template expression ''{0}'' in preset {1} */
-    public static final int WRONG_ROLE       = 1708;
     /** Number of ''{0}'' roles too high ({1}) */
     public static final int HIGH_COUNT       = 1704;
@@ -63 +61 @@
     /** Relation type is unknown */
     public static final int RELATION_UNKNOWN = 1707;
-    /** Relation is empty */
-    public static final int RELATION_EMPTY   = 1708;
+    /** Role of relation member does not match template expression ''{0}'' in preset {1} */
+    public static final int WRONG_ROLE       = 1708;
     /** Type ''{0}'' of relation member with role ''{1}'' does not match accepted types ''{2}'' in preset {3} */
     public static final int WRONG_TYPE       = 1709;
     /** Relations build circular dependencies */
     public static final int RELATION_LOOP    = 1710;
+    /** Relation is empty */
+    public static final int RELATION_EMPTY   = 1711; // was 1708 up to r18505
     // CHECKSTYLE.ON: SingleSpaceSeparator