Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.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/data/osm/visitor/paint/relations/Multipolygon.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -11 +11 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
@@ -668 +669 @@
 
             for (PolyData pdInner: innerPolygons) {
-                PolyData o = findOuterPolygon(pdInner, combinedPolygons);
-                if (o == null) {
-                    o = outerPolygons.get(0);
-                }
-                o.addInner(pdInner);
+                Optional.ofNullable(findOuterPolygon(pdInner, combinedPolygons)).orElseGet(() -> outerPolygons.get(0))
+                    .addInner(pdInner);
             }
         }