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

trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java

@@ -4 +4 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Optional;
 
 import javax.swing.Action;
@@ -152 +153 @@
     @Override
     public Icon getIcon() {
-        Object o = getSafeActionValue(Action.LARGE_ICON_KEY);
-        if (o == null)
-            o = getSafeActionValue(Action.SMALL_ICON);
-        return (Icon) o;
+        return (Icon) Optional.ofNullable(getSafeActionValue(Action.LARGE_ICON_KEY)).orElseGet(() -> getSafeActionValue(Action.SMALL_ICON));
     }