Changeset 10678 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-07-30T13:01:26+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12472 - fix "OperatorPrecedence" warnings

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (modified) (1 diff)

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

@@ -76 +76 @@
         }
         final String[] parts = key.replaceAll(":conditional", "").split(":");
-        return parts.length == 3 && isRestrictionType(parts[0]) && isTransportationMode(parts[1]) && isDirection(parts[2])
-                || parts.length == 1 && (isRestrictionType(parts[0]) || isTransportationMode(parts[0]))
-                || parts.length == 2 && (
-                isRestrictionType(parts[0]) && (isTransportationMode(parts[1]) || isDirection(parts[1]))
-                        || isTransportationMode(parts[0]) && isDirection(parts[1]));
+        return isKeyValid3Parts(parts) || isKeyValid1Part(parts) || isKeyValid2Parts(parts);
+    }
+
+    private static boolean isKeyValid3Parts(String[] parts) {
+        return parts.length == 3 && isRestrictionType(parts[0]) && isTransportationMode(parts[1]) && isDirection(parts[2]);
+    }
+
+    private static boolean isKeyValid2Parts(String[] parts) {
+        return parts.length == 2 && ((isRestrictionType(parts[0]) && (isTransportationMode(parts[1]) || isDirection(parts[1])))
+                                  || (isTransportationMode(parts[0]) && isDirection(parts[1])));
+    }
+
+    private static boolean isKeyValid1Part(String[] parts) {
+        return parts.length == 1 && (isRestrictionType(parts[0]) || isTransportationMode(parts[0]));
     }