Changeset 11385 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2016-12-13T01:57:37+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -849 +849 @@
             case ANY_VALUE_REGEXP:
             case EXACT_REGEXP:
-                for (String key: osm.keySet()) {
-                    if (keyPattern.matcher(key).matches()) {
-                        if (mode == Mode.ANY_VALUE_REGEXP
-                                || valuePattern.matcher(osm.get(key)).matches())
-                            return true;
-                    }
+                for (String k : osm.keySet()) {
+                    if (keyPattern.matcher(k).matches()
+                            && (mode == Mode.ANY_VALUE_REGEXP || valuePattern.matcher(osm.get(k)).matches()))
+                        return true;
                 }
                 return false;