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

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -9 +9 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -122 +123 @@
      */
     public void setNew(String value) {
-        if (value == null) {
-            value = "";
-        }
-        this.value = value;
+        this.value = Optional.ofNullable(value).orElse("");
         this.type = MultiValueDecisionType.KEEP_ONE;
-
     }