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

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -12 +12 @@
 import java.io.Serializable;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.swing.JComponent;
@@ -376 +377 @@
 
     private static EastNorth calculateDefaultCenter() {
-        Bounds b = DownloadDialog.getSavedDownloadBounds();
-        if (b == null) {
-            b = Main.getProjection().getWorldBoundsLatLon();
-        }
+        Bounds b = Optional.ofNullable(DownloadDialog.getSavedDownloadBounds()).orElseGet(
+                () -> Main.getProjection().getWorldBoundsLatLon());
         return Main.getProjection().latlon2eastNorth(b.getCenter());
     }