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

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -3 +3 @@
 
 import java.util.Arrays;
+import java.util.Optional;
 
 import org.openstreetmap.josm.data.osm.Storage;
@@ -44 +45 @@
 
         int idx = getIndex(selected);
-        DividedScale<StyleElementList> ds = s.states[idx];
-        if (ds == null) {
-            ds = new DividedScale<>();
-        }
-        s.states[idx] = ds.put(o, r);
+        s.states[idx] = Optional.ofNullable(s.states[idx]).orElseGet(DividedScale::new).put(o, r);
         return s.intern();
     }