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

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

@@ -13 +13 @@
 import java.text.MessageFormat;
 import java.time.Year;
+import java.util.Optional;
 
 import javax.swing.JButton;
@@ -223 +224 @@
         if (enable) {
             if (copyrightYear.getText().isEmpty()) {
-                String sCopyrightYear = data.getString(META_COPYRIGHT_YEAR);
-                if (sCopyrightYear == null) {
-                    sCopyrightYear = Year.now().toString();
-                }
-                copyrightYear.setText(sCopyrightYear);
+                copyrightYear.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_YEAR)).orElseGet(
+                        () -> Year.now().toString()));
             }
             if (copyright.getText().isEmpty()) {
-                String sCopyright = data.getString(META_COPYRIGHT_LICENSE);
-                if (sCopyright == null) {
-                    sCopyright = Main.pref.get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5");
-                }
-                copyright.setText(sCopyright);
+                copyright.setText(Optional.ofNullable(data.getString(META_COPYRIGHT_LICENSE)).orElseGet(
+                        () -> Main.pref.get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5")));
                 copyright.setCaretPosition(0);
             }
@@ -282 +277 @@
             emailLabel.setEnabled(b);
             if (b) {
-                String sAuthorName = data.getString(META_AUTHOR_NAME);
-                if (sAuthorName == null) {
-                    sAuthorName = Main.pref.get("lastAuthorName");
-                }
-                authorName.setText(sAuthorName);
-                String sEmail = data.getString(META_AUTHOR_EMAIL);
-                if (sEmail == null) {
-                    sEmail = Main.pref.get("lastAuthorEmail");
-                }
-                email.setText(sEmail);
+                authorName.setText(Optional.ofNullable(data.getString(META_AUTHOR_NAME)).orElseGet(() -> Main.pref.get("lastAuthorName")));
+                email.setText(Optional.ofNullable(data.getString(META_AUTHOR_EMAIL)).orElseGet(() -> Main.pref.get("lastAuthorEmail")));
             } else {
                 authorName.setText("");