Changeset 17716 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-04-09T00:19:50+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Migrate UserInfo to Instant

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/UserInfo.java (modified) (4 diffs)
• io/OsmServerUserInfoReader.java (modified) (1 diff)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import java.util.Date;
+import java.time.Instant;
 import java.util.List;
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -18 +17 @@
     private String displayName;
     /** the date this user was created */
-    private Date accountCreated;
+    private Instant accountCreated;
     /** the home location */
     private LatLon home;
@@ -73 +72 @@
      * @return the user account creation date
      */
-    public Date getAccountCreated() {
-        return DateUtils.cloneDate(accountCreated);
+    public Instant getAccountCreated() {
+        return accountCreated;
     }
 
@@ -81 +80 @@
      * @param accountCreated user account creation date
      */
-    public void setAccountCreated(Date accountCreated) {
-        this.accountCreated = DateUtils.cloneDate(accountCreated);
+    public void setAccountCreated(Instant accountCreated) {
+        this.accountCreated = accountCreated;
     }
 

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

@@ -61 +61 @@
             v = getAttribute(xmlNode, "account_created");
             if (v != null) {
-                userInfo.setAccountCreated(DateUtils.fromString(v));
+                userInfo.setAccountCreated(DateUtils.parseInstant(v));
             }
             // -- description