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

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

@@ -10 +10 @@
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -110 +111 @@
                 break;
             case "comment":
-                String uidStr = attrs.getValue("uid");
-                if (uidStr == null) {
-                    commentUid = 0;
-                } else {
-                    commentUid = Long.parseLong(uidStr);
-                }
+                commentUid = Long.parseLong(Optional.ofNullable(attrs.getValue("uid")).orElse("0"));
                 commentUsername = attrs.getValue("user");
                 noteAction = Action.valueOf(attrs.getValue("action").toUpperCase(Locale.ENGLISH));
                 commentCreateDate = DateUtils.fromString(attrs.getValue("timestamp"));
-                String isNew = attrs.getValue("is_new");
-                if (isNew == null) {
-                    commentIsNew = false;
-                } else {
-                    commentIsNew = Boolean.parseBoolean(isNew);
-                }
+                commentIsNew = Boolean.parseBoolean(Optional.ofNullable(attrs.getValue("is_new")).orElse("false"));
                 break;
             default: // Do nothing