Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.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/MergeNodesAction.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
@@ -176 +177 @@
             lastNode = n;
         }
-        if (targetNode == null) {
-            targetNode = oldestNode != null ? oldestNode : lastNode;
-        }
-        return targetNode;
-    }
-
+        return Optional.ofNullable(targetNode).orElse(oldestNode != null ? oldestNode : lastNode);
+    }
 
     /**