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

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Optional;
 
 import org.openstreetmap.josm.actions.upload.UploadNotesTask;
@@ -29 +31 @@
     public UploadNoteLayerTask(NoteLayer layer, ProgressMonitor monitor) {
         CheckParameterUtil.ensureParameterNotNull(layer, "layer");
-        if (monitor == null) {
-            monitor = NullProgressMonitor.INSTANCE;
-        }
         this.layer = layer;
-        this.monitor = monitor;
+        this.monitor = Optional.ofNullable(monitor).orElse(NullProgressMonitor.INSTANCE);
     }