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

trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java

@@ -7 +7 @@
 import java.io.InputStream;
 import java.net.URLConnection;
+import java.util.Optional;
 
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
@@ -31 +32 @@
     public ProgressInputStream(InputStream in, long size, ProgressMonitor progressMonitor) {
         CheckParameterUtil.ensureParameterNotNull(in, "in");
-        if (progressMonitor == null) {
-            progressMonitor = NullProgressMonitor.INSTANCE;
-        }
-        this.updater = new StreamProgressUpdater(size, progressMonitor, tr("Downloading data..."));
+        this.updater = new StreamProgressUpdater(size,
+                Optional.ofNullable(progressMonitor).orElse(NullProgressMonitor.INSTANCE), tr("Downloading data..."));
         this.in = in;
     }