Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

Timestamp:

2017-02-12T16:32:18+01:00 (9 years ago)

Author:

Don-vip

Message:

refactor handling of null values - use Java 8 Optional where possible

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
@@ -62 +63 @@
         CheckParameterUtil.ensureParameterNotNull(layer, "layer");
         CheckParameterUtil.ensureParameterNotNull(strategy, "strategy");
-        if (monitor == null) {
-            monitor = NullProgressMonitor.INSTANCE;
-        }
         this.layer = layer;
-        this.monitor = monitor;
+        this.monitor = Optional.ofNullable(monitor).orElse(NullProgressMonitor.INSTANCE);
         this.changeset = changeset;
         this.strategy = strategy;