Changeset 16333 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2020-04-18T10:41:25+02:00 (4 years ago)

Author:

simon04

Message:

Java 8: use Map.computeIfAbsent

File:

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

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

@@ -88 +88 @@
         for (String key: tags.getKeys()) {
             MultiValueResolutionDecision decision = new MultiValueResolutionDecision(tags.getTagsFor(key));
-            if (decisions.get(key) == null) {
-                decisions.put(key, decision);
-            }
+            decisions.putIfAbsent(key, decision);
         }
         displayedKeys.clear();
@@ -106 +104 @@
             }
             for (String key: tags.getKeys()) {
-                if (!decisions.get(key).isDecided() && !keys.contains(key)) {
+                if (!decisions.get(key).isDecided()) {
                     keys.add(key);
                 }