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

Timestamp:

2019-04-20T19:38:30+02:00 (5 years ago)

Author:

GerdP

Message:

fix #17567: apply 17567-rephrase.patch

File:

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

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

@@ -29 +29 @@
     protected static final int MORE_FROM = 1805;
     protected static final int MORE_TO = 1806;
-    protected static final int UNKNOWN_ROLE = 1807;
-    protected static final int UNKNOWN_TYPE = 1808;
+    protected static final int UNEXPECTED_ROLE = 1807;
+    protected static final int UNEXPECTED_TYPE = 1808;
     protected static final int FROM_VIA_NODE = 1809;
     protected static final int TO_VIA_NODE = 1810;
@@ -115 +115 @@
                     break;
                 default:
-                    errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_ROLE)
-                            .message(tr("Unknown role in restriction"))
+                    errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_ROLE)
+                            .message(tr("Unexpected role ''{0}'' in restriction", m.getRole()))
                             .primitives(l)
                             .highlight(m.getMember())
@@ -123 +123 @@
             } else if (m.isNode()) {
                 Node n = m.getNode();
-                switch (m.getRole()) {
-                case "via":
+                if ("via".equals(m.getRole())) {
                     if (!via.isEmpty()) {
                         if (via.get(0) instanceof Node) {
@@ -134 +133 @@
                         via.add(n);
                     }
-                    break;
-                case "location_hint":
-                    errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_ROLE)
-                            .message(tr("Role ''{0}'' is not in templates", m.getRole()))
-                            .primitives(l)
-                            .highlight(m.getMember())
-                            .build());
-                    break;
-                default:
-                    errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_ROLE)
-                            .message(tr("Unknown role in restriction"))
+                } else {
+                    errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_ROLE)
+                            .message(tr("Unexpected role ''{0}'' in restriction", m.getRole()))
                             .primitives(l)
                             .highlight(m.getMember())
@@ -150 +141 @@
                 }
             } else {
-                errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_TYPE)
-                        .message(tr("Unknown member type"))
+                errors.add(TestError.builder(this, Severity.WARNING, UNEXPECTED_TYPE)
+                        .message(tr("Unexpected member type in restriction"))
                         .primitives(l)
                         .highlight(m.getMember())