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

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

@@ -13 +13 @@
 import java.util.Collections;
 import java.util.Date;
+import java.util.Optional;
 
 import org.openstreetmap.josm.Main;
@@ -112 +113 @@
 
     private Date readTime(String p) {
-        Date d = rmcTimeFmt.parse(p, new ParsePosition(0));
-        if (d == null) {
-            d = rmcTimeFmtStd.parse(p, new ParsePosition(0));
-        }
+        Date d = Optional.ofNullable(rmcTimeFmt.parse(p, new ParsePosition(0)))
+                .orElseGet(() -> rmcTimeFmtStd.parse(p, new ParsePosition(0)));
         if (d == null)
             throw new JosmRuntimeException("Date is malformed");