Changeset 11913 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

Timestamp:

2017-04-15T01:38:46+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1192 - String literals should not be duplicated

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.validation.tests;
 
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.RAILWAY;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.WATERWAY;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -99 +102 @@
 
     private static final String[] TYPES = {
-            "none", "highway", "railway", "waterway", "boundary", "power", "natural", "landuse", "building"};
+            "none", HIGHWAY, RAILWAY, WATERWAY, "boundary", "power", "natural", "landuse", "building"};
 
     /** The map of potential duplicates.
@@ -210 +213 @@
                             .primitives(primitives)
                             .build());
-                } else if (typeMap.get("highway")) {
+                } else if (typeMap.get(HIGHWAY)) {
                     errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_HIGHWAY)
                             .message(tr("Highway duplicated nodes"))
                             .primitives(primitives)
                             .build());
-                } else if (typeMap.get("railway")) {
+                } else if (typeMap.get(RAILWAY)) {
                     errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_RAILWAY)
                             .message(tr("Railway duplicated nodes"))
                             .primitives(primitives)
                             .build());
-                } else if (typeMap.get("waterway")) {
+                } else if (typeMap.get(WATERWAY)) {
                     errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_WATERWAY)
                             .message(tr("Waterway duplicated nodes"))