Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -95 +95 @@
             keys.retainAll(keysWithConflicts);
             if (showTagsWithMultiValuesOnly) {
-                Set<String> keysWithMultiValues = new HashSet<>();
-                for (String key: keys) {
-                    if (decisions.get(key).canKeepAll()) {
-                        keysWithMultiValues.add(key);
-                    }
-                }
-                keys.retainAll(keysWithMultiValues);
+                keys.removeIf(key -> !decisions.get(key).canKeepAll());
             }
             for (String key: tags.getKeys()) {