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

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -18 +18 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.jar.Attributes;
@@ -199 +200 @@
         Attributes attr = manifest.getMainAttributes();
         className = attr.getValue("Plugin-Class");
-        String s = attr.getValue(lang+"Plugin-Link");
-        if (s == null) {
-            s = attr.getValue("Plugin-Link");
-        }
+        String s = Optional.ofNullable(attr.getValue(lang+"Plugin-Link")).orElseGet(() -> attr.getValue("Plugin-Link"));
         if (s != null && !Utils.isValidUrl(s)) {
             Main.info(tr("Invalid URL ''{0}'' in plugin {1}", s, name));