Changeset 17838 in josm for trunk/src/org

Timestamp:

2021-05-01T11:39:00+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Migrate HistoryOsmPrimitive to Instant

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmChangeTask.java (modified) (2 diffs)
• data/osm/history/History.java (modified) (5 diffs)
• data/osm/history/HistoryNode.java (modified) (3 diffs)
• data/osm/history/HistoryOsmPrimitive.java (modified) (9 diffs)
• data/osm/history/HistoryRelation.java (modified) (4 diffs)
• data/osm/history/HistoryWay.java (modified) (4 diffs)
• gui/history/VersionInfoPanel.java (modified) (6 diffs)
• gui/history/VersionTableModel.java (modified) (2 diffs)
• io/AbstractParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

@@ -6 +6 @@
 import java.time.Instant;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -160 +159 @@
                 if (history != null && date != null) {
                     // Lookup for the primitive version at the specified timestamp
-                    HistoryOsmPrimitive hp = history.getByDate(Date.from(date));
+                    HistoryOsmPrimitive hp = history.getByDate(date);
                     if (hp != null) {
                         PrimitiveData data;

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -3 +3 @@
 
 import java.text.MessageFormat;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -86 +86 @@
      * @return a new partial copy of this history, from the given date
      */
-    public History from(final Date fromDate) {
-        return filter(this, primitive -> primitive.getTimestamp().compareTo(fromDate) >= 0);
+    public History from(final Instant fromDate) {
+        return filter(this, primitive -> primitive.getInstant().compareTo(fromDate) >= 0);
     }
 
@@ -95 +95 @@
      * @return a new partial copy of this history, until the given date
      */
-    public History until(final Date untilDate) {
-        return filter(this, primitive -> primitive.getTimestamp().compareTo(untilDate) <= 0);
+    public History until(final Instant untilDate) {
+        return filter(this, primitive -> primitive.getInstant().compareTo(untilDate) <= 0);
     }
 
@@ -105 +105 @@
      * @return a new partial copy of this history, between the given dates
      */
-    public History between(Date fromDate, Date untilDate) {
+    public History between(Instant fromDate, Instant untilDate) {
         return this.from(fromDate).until(untilDate);
     }
@@ -196 +196 @@
      * @return the history primitive at given <code>date</code>
      */
-    public HistoryOsmPrimitive getByDate(Date date) {
+    public HistoryOsmPrimitive getByDate(Instant date) {
         History h = sortAscending();
 
         if (h.versions.isEmpty())
             return null;
-        if (h.get(0).getTimestamp().compareTo(date) > 0)
+        if (h.get(0).getInstant().compareTo(date) > 0)
             return null;
         for (int i = 1; i < h.versions.size(); i++) {
-            if (h.get(i-1).getTimestamp().compareTo(date) <= 0
-                    && h.get(i).getTimestamp().compareTo(date) >= 0)
+            if (h.get(i-1).getInstant().compareTo(date) <= 0
+                    && h.get(i).getInstant().compareTo(date) >= 0)
                 return h.get(i);
         }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm.history;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -31 +31 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords) {
+    public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Instant timestamp, LatLon coords) {
         this(id, version, visible, user, changesetId, timestamp, coords, true);
     }
@@ -50 +50 @@
      * @since 5440
      */
-    public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords,
+    public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Instant timestamp, LatLon coords,
             boolean checkHistoricParams) {
         super(id, version, visible, user, changesetId, timestamp, checkHistoricParams);

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -5 +5 @@
 
 import java.text.MessageFormat;
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Collections;
@@ -25 +26 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -38 +38 @@
     private final long changesetId;
     private Changeset changeset;
-    private final Date timestamp;
+    private final Instant timestamp;
     private final long version;
     private Map<String, String> tags;
@@ -54 +54 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    protected HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) {
+    protected HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Instant timestamp) {
         this(id, version, visible, user, changesetId, timestamp, true);
     }
@@ -73 +73 @@
      * @since 5440
      */
-    protected HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp,
+    protected HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Instant timestamp,
             boolean checkHistoricParams) {
         ensurePositiveLong(id, "id");
@@ -87 +87 @@
         this.user = user;
         this.changesetId = changesetId;
-        this.timestamp = DateUtils.cloneDate(timestamp);
+        this.timestamp = timestamp;
         this.tags = new HashMap<>();
     }
@@ -96 +96 @@
      */
     protected HistoryOsmPrimitive(OsmPrimitive p) {
-        this(p.getId(), p.getVersion(), p.isVisible(), p.getUser(), p.getChangesetId(), Date.from(p.getInstant()));
+        this(p.getId(), p.getVersion(), p.isVisible(), p.getUser(), p.getChangesetId(), p.getInstant());
     }
 
@@ -159 +159 @@
      * Returns the timestamp.
      * @return the timestamp
-     */
+     * @deprecated Use {@link #getInstant()}
+     */
+    @Deprecated
     public Date getTimestamp() {
-        return DateUtils.cloneDate(timestamp);
+        return Date.from(timestamp);
+    }
+
+    /**
+     * Returns the timestamp.
+     * @return the timestamp
+     */
+    public Instant getInstant() {
+        return timestamp;
     }
 
@@ -364 +374 @@
             Logging.log(Logging.LEVEL_ERROR, "Cannot change visibility for "+data+':', e);
         }
-        data.setInstant(timestamp.toInstant());
+        data.setInstant(timestamp);
         data.setKeys(tags);
         data.setOsmId(id, (int) version);

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -3 +3 @@
 
 import java.text.MessageFormat;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
@@ -35 +35 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp) {
+    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Instant timestamp) {
         super(id, version, visible, user, changesetId, timestamp);
     }
@@ -53 +53 @@
      * @since 5440
      */
-    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) {
+    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Instant timestamp, boolean checkHistoricParams) {
         super(id, version, visible, user, changesetId, timestamp, checkHistoricParams);
     }
@@ -70 +70 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Date timestamp,
+    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId, Instant timestamp,
             List<RelationMemberData> members) {
         this(id, version, visible, user, changesetId, timestamp);

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -35 +35 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp) {
+    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Instant timestamp) {
         super(id, version, visible, user, changesetId, timestamp);
     }
@@ -53 +53 @@
      * @since 5440
      */
-    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, boolean checkHistoricParams) {
+    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Instant timestamp, boolean checkHistoricParams) {
         super(id, version, visible, user, changesetId, timestamp, checkHistoricParams);
     }
@@ -69 +69 @@
      * @throws IllegalArgumentException if preconditions are violated
      */
-    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, List<Long> nodeIdList) {
+    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Instant timestamp, List<Long> nodeIdList) {
         this(id, version, visible, user, changesetId, timestamp);
         CheckParameterUtil.ensureParameterNotNull(nodeIdList, "nodeIdList");

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -11 +11 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
-import java.text.DateFormat;
+import java.time.Instant;
+import java.time.format.FormatStyle;
 import java.util.Collections;
-import java.util.Date;
 
 import javax.swing.AbstractAction;
@@ -170 +170 @@
     }
 
-    protected String getInfoText(final Date timestamp, final long version, final boolean isLatest) {
+    protected String getInfoText(final Instant timestamp, final long version, final boolean isLatest) {
         String text;
         if (isLatest) {
@@ -181 +181 @@
             String date = "?";
             if (timestamp != null) {
-                date = DateUtils.formatDateTime(timestamp, DateFormat.SHORT, DateFormat.SHORT);
+                date = DateUtils.getDateTimeFormatter(FormatStyle.SHORT, FormatStyle.SHORT).format(timestamp);
             }
             text = tr(
@@ -226 +226 @@
         if (primitive != null) {
             Changeset cs = primitive.getChangeset();
-            update(cs, model.isLatest(primitive), primitive.getTimestamp(), primitive.getVersion(), primitive.getPrimitiveId());
+            update(cs, model.isLatest(primitive), primitive.getInstant(), primitive.getVersion(), primitive.getPrimitiveId());
         }
     }
@@ -236 +236 @@
      */
     public void update(final OsmPrimitive primitive, final boolean isLatest) {
-        Date timestamp = Date.from(primitive.getInstant());
-        update(Changeset.fromPrimitive(primitive), isLatest, timestamp, primitive.getVersion(), primitive.getPrimitiveId());
+        update(Changeset.fromPrimitive(primitive), isLatest, primitive.getInstant(), primitive.getVersion(), primitive.getPrimitiveId());
     }
 
@@ -249 +248 @@
      * @since 14432
      */
-    public void update(final Changeset cs, final boolean isLatest, final Date timestamp, final long version, final PrimitiveId id) {
+    public void update(final Changeset cs, final boolean isLatest, final Instant timestamp, final long version, final PrimitiveId id) {
         lblInfo.setText(getInfoText(timestamp, version, isLatest));
         primitiveId = id;

trunk/src/org/openstreetmap/josm/gui/history/VersionTableModel.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
-import java.text.DateFormat;
+import java.time.format.FormatStyle;
 
 import javax.swing.table.AbstractTableModel;
@@ -53 +53 @@
         case VersionTableColumnModel.COL_DATE:
             HistoryOsmPrimitive p3 = model.getPrimitive(row);
-            if (p3 != null && p3.getTimestamp() != null)
-                return DateUtils.formatDateTime(p3.getTimestamp(), DateFormat.SHORT, DateFormat.SHORT);
+            if (p3 != null && p3.getInstant() != null)
+                return DateUtils.getDateTimeFormatter(FormatStyle.SHORT, FormatStyle.SHORT).format(p3.getInstant());
             return null;
         case VersionTableColumnModel.COL_USER:

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.util.Date;
+import java.time.Instant;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -132 +132 @@
 
         String v = getMandatoryAttributeString(atts, "timestamp");
-        Date timestamp = DateUtils.fromString(v);
+        Instant timestamp = DateUtils.parseInstant(v);
         HistoryOsmPrimitive primitive = null;
         if (type == OsmPrimitiveType.NODE) {