From 1e44a60d0d77debc349ac647e2b6dff38e01101a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Mon, 3 Feb 2014 14:46:07 +0200 Subject: [PATCH 1/2] Don't open code test tree for components --- .../data/validation/tests/ConditionalKeys.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java b/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java index 89f6338..195798c 100644 --- a/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java +++ b/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java @@ -65,11 +65,15 @@ public class ConditionalKeys extends Test.TagTest { return false; } 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])); + int idx = 0; + + if (isRestrictionType(parts[idx])) + idx++; + if (isTransportationMode(parts[idx])) + idx++; + if (idx > 0 && isDirection(parts[idx])) + idx++; + return (idx > 0 && idx == parts.length); } public boolean isValueValid(String key, String value) { -- 1.7.9.5