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

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

@@ -25 +25 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
@@ -343 +344 @@
      */
     public Changeset getChangeset() {
-        Changeset cs = pnlChangesetManagement.getSelectedChangeset();
-        if (cs == null) {
-            cs = new Changeset();
-        }
+        Changeset cs = Optional.ofNullable(pnlChangesetManagement.getSelectedChangeset()).orElseGet(Changeset::new);
         cs.setKeys(pnlTagSettings.getTags(false));
         return cs;