Changeset 17720 in josm for trunk/src/org

Timestamp:

2021-04-09T00:55:40+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Migrate ChangesetDiscussionComment to Instant

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/ChangesetDiscussionComment.java (modified) (4 diffs)
• io/OsmChangesetParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import java.util.Date;
-
-import org.openstreetmap.josm.tools.date.DateUtils;
+import java.time.Instant;
 
 /**
@@ -13 +11 @@
 
     /** date this comment was posted at */
-    private final Date date;
+    private final Instant date;
     /** the user who posted the comment */
     private final User user;
@@ -24 +22 @@
      * @param user the user who posted the comment
      */
-    public ChangesetDiscussionComment(Date date, User user) {
-        this.date = DateUtils.cloneDate(date);
+    public ChangesetDiscussionComment(Instant date, User user) {
+        this.date = date;
         this.user = user;
     }
@@ -49 +47 @@
      * @return date this comment was posted at
      */
-    public final Date getDate() {
-        return DateUtils.cloneDate(date);
+    public final Instant getDate() {
+        return date;
     }
 

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

@@ -9 +9 @@
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
-import java.util.Date;
+import java.time.Instant;
 import java.util.LinkedList;
 import java.util.List;
@@ -172 +172 @@
             // -- date
             String value = atts.getValue("date");
-            Date date = null;
-            if (value != null) {
-                date = DateUtils.fromString(value);
-            }
-
+            Instant date = value != null ? DateUtils.parseInstant(value) : null;
             comment = new ChangesetDiscussionComment(date, createUser(atts));
         }