Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 15610)
+++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 15611)
@@ -986,12 +986,5 @@
                 if (predicate.test(n)
                         && (dist = getPoint2D(n).distanceSq(p)) < snapDistanceSq) {
-                    List<Node> nlist;
-                    if (nearestMap.containsKey(dist)) {
-                        nlist = nearestMap.get(dist);
-                    } else {
-                        nlist = new LinkedList<>();
-                        nearestMap.put(dist, nlist);
-                    }
-                    nlist.add(n);
+                    nearestMap.computeIfAbsent(dist, k -> new LinkedList<>()).add(n);
                 }
             }
@@ -1224,12 +1217,5 @@
 
                     if (perDistSq < snapDistanceSq && a < c + snapDistanceSq && b < c + snapDistanceSq) {
-                        List<WaySegment> wslist;
-                        if (nearestMap.containsKey(perDistSq)) {
-                            wslist = nearestMap.get(perDistSq);
-                        } else {
-                            wslist = new LinkedList<>();
-                            nearestMap.put(perDistSq, wslist);
-                        }
-                        wslist.add(new WaySegment(w, i));
+                        nearestMap.computeIfAbsent(perDistSq, k -> new LinkedList<>()).add(new WaySegment(w, i));
                     }