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

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -27 +27 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -160 +161 @@
             if (ico != null)
                 return ico;
-            Object o = action.getValue(Action.LARGE_ICON_KEY);
-            if (o == null)
-                o = action.getValue(Action.SMALL_ICON);
-            return (Icon) o;
+            return (Icon) Optional.ofNullable(action.getValue(Action.LARGE_ICON_KEY)).orElseGet(() -> action.getValue(Action.SMALL_ICON));
         }
 
@@ -1193 +1191 @@
         }
 
-        String tt = action.getDisplayTooltip();
-        if (tt == null) {
-            tt = "";
-        }
+        String tt = Optional.ofNullable(action.getDisplayTooltip()).orElse("");
 
         if (sc == null || paramCode != 0) {
-            String name = (String) action.getAction().getValue("toolbar");
-            if (name == null) {
-                name = action.getDisplayName();
-            }
+            String name = Optional.ofNullable((String) action.getAction().getValue("toolbar")).orElseGet(action::getDisplayName);
             if (paramCode != 0) {
                 name = name+paramCode;