Changeset 16333 in josm for trunk/src

Timestamp:

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

Author:

simon04

Message:

Java 8: use Map.computeIfAbsent

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/Addresses.java (modified) (1 diff)
• data/validation/tests/Highways.java (modified) (1 diff)
• data/validation/tests/MultipolygonTest.java (modified) (2 diffs)
• gui/conflict/tags/TagConflictResolverModel.java (modified) (2 diffs)
• io/ValidatorErrorWriter.java (modified) (1 diff)

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

@@ -305 +305 @@
                     if (number != null) {
                         number = number.trim().toUpperCase(Locale.ENGLISH);
-                        List<OsmPrimitive> list = map.get(number);
-                        if (list == null) {
-                            list = new ArrayList<>();
-                            map.put(number, list);
-                        }
+                        List<OsmPrimitive> list = map.computeIfAbsent(number, k -> new ArrayList<>());
                         list.add(p);
                     }

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

@@ -125 +125 @@
                     }
                     if (!link || !linkOk) {
-                        List<Way> list = map.get(value);
-                        if (list == null) {
-                            list = new ArrayList<>();
-                            map.put(value, list);
-                        }
+                        List<Way> list = map.computeIfAbsent(value, k -> new ArrayList<>());
                         list.add(h);
                     }

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

@@ -325 +325 @@
                     continue; // cannot be a problem node
                 }
-                List<Way> ways = nodeMap.get(n);
-                if (ways == null) {
-                    ways = new ArrayList<>();
-                    nodeMap.put(n, ways);
-                }
+                List<Way> ways = nodeMap.computeIfAbsent(n, k -> new ArrayList<>());
                 ways.add(rm.getWay());
                 if (ways.size() > 2 || (ways.size() == 2 && i != 0 && i + 1 != numNodes)) {
@@ -563 +559 @@
                     boolean samePoly = false;
                     if (crossingPolys[0] != null && crossingPolys[1] != null) {
-                        List<PolyData> crossingPolygons = problemPolygonMap.get(crossingPolys[0]);
-                        if (crossingPolygons == null) {
-                            crossingPolygons = new ArrayList<>();
-                            problemPolygonMap.put(crossingPolys[0], crossingPolygons);
-                        }
+                        List<PolyData> crossingPolygons = problemPolygonMap.computeIfAbsent(crossingPolys[0], k -> new ArrayList<>());
                         crossingPolygons.add(crossingPolys[1]);
                         if (crossingPolys[0] == crossingPolys[1]) {

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);
                 }

trunk/src/org/openstreetmap/josm/io/ValidatorErrorWriter.java

@@ -81 +81 @@
                     for (Entry<String, Map<String, List<TestError>>> e2 : e1.getValue().entrySet()) {
                         ErrorClass errorClass = new ErrorClass(e1.getKey(), e2.getKey());
-                        List<TestError> list = map.get(errorClass);
-                        if (list == null) {
-                            list = new ArrayList<>();
-                            map.put(errorClass, list);
-                        }
+                        List<TestError> list = map.computeIfAbsent(errorClass, k -> new ArrayList<>());
                         e2.getValue().values().forEach(list::addAll);
                     }