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

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

@@ -6 +6 @@
 
 import java.util.Objects;
+import java.util.Optional;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -58 +59 @@
 
     public void decide(RelationMemberConflictDecisionType decision) {
-        if (decision == null) {
-            decision = UNDECIDED;
-        }
-        this.decision = decision;
+        this.decision = Optional.ofNullable(decision).orElse(UNDECIDED);
     }