Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/command

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/command/AddPrimitivesCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.swing.Icon;
@@ -169 +170 @@
         Collection<OsmPrimitive> prims = new HashSet<>();
         for (PrimitiveData d : data) {
-            OsmPrimitive osm = getAffectedDataSet().getPrimitiveById(d);
-            if (osm == null)
-                throw new JosmRuntimeException("No primitive found for " + d);
-            prims.add(osm);
+            prims.add(Optional.ofNullable(getAffectedDataSet().getPrimitiveById(d)).orElseThrow(
+                    () -> new JosmRuntimeException("No primitive found for " + d)));
         }
         return prims;