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

trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -12 +12 @@
 import java.awt.event.WindowEvent;
 import java.util.Arrays;
+import java.util.Optional;
 
 import javax.swing.BorderFactory;
@@ -168 +169 @@
 
     public void setCoordinates(LatLon ll) {
-        if (ll == null) {
-            ll = LatLon.ZERO;
-        }
-        this.latLonCoordinates = ll;
-        tfLatLon.setText(ll.latToString(CoordinateFormat.getDefaultFormat()) + ' ' + ll.lonToString(CoordinateFormat.getDefaultFormat()));
-        EastNorth en = Main.getProjection().latlon2eastNorth(ll);
+        latLonCoordinates = Optional.ofNullable(ll).orElse(LatLon.ZERO);
+        tfLatLon.setText(latLonCoordinates.latToString(CoordinateFormat.getDefaultFormat()) + ' ' +
+                         latLonCoordinates.lonToString(CoordinateFormat.getDefaultFormat()));
+        EastNorth en = Main.getProjection().latlon2eastNorth(latLonCoordinates);
         tfEastNorth.setText(Double.toString(en.east()) + ' ' + Double.toString(en.north()));
         setOkEnabled(true);