Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2017-02-12T16:32:18+01:00 (7 years ago)

Author:

Don-vip

Message:

refactor handling of null values - use Java 8 Optional where possible

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -17 +17 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.Stack;
@@ -520 +521 @@
 
         protected List<NodePair> getOutboundPairs(Node node) {
-            List<NodePair> l = successors.get(node);
-            if (l == null)
-                return Collections.emptyList();
-            return l;
+            return Optional.ofNullable(successors.get(node)).orElseGet(Collections::emptyList);
         }