Changeset 17903 in josm

Timestamp:

2021-05-17T21:27:21+02:00 (3 years ago)

Author:

simon04

Message:

see #20879 - History browser: display version "*" if tag change has not been committed

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/history/History.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/history/TagTableModel.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (modified) (1 diff)

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

@@ -192 +192 @@
     /**
      * Replies the history primitive which changed the given key.
-     * @param version the version
+     * @param primitive the reference primitive (the history up to and including this primitive is considered)
      * @param key the OSM key
+     * @param isLatest whether this relates to a not yet committed changeset
      * @return the history primitive which changed the given key
      */
-    public HistoryOsmPrimitive getWhichChangedTag(long version, String key) {
-        HistoryOsmPrimitive primitive = getByVersion(version);
+    public HistoryOsmPrimitive getWhichChangedTag(HistoryOsmPrimitive primitive, String key, boolean isLatest) {
         if (primitive == null) {
             return null;
+        } else if (isLatest && !Objects.equals(getLatest().get(key), primitive.get(key))) {
+            return primitive;
         }
         for (int i = versions.indexOf(primitive); i > 0; i--) {

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

@@ -714 +714 @@
      */
     public Color getVersionColor(HistoryOsmPrimitive primitive) {
-        return dateScale.getColor(primitive.getInstant().toEpochMilli());
+        return dateScale.getColor(isLatest(primitive) ? System.currentTimeMillis() : primitive.getInstant().toEpochMilli());
     }
 }

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

@@ -63 +63 @@
                 HistoryOsmPrimitive primitive = model.getWhichChangedTag(key);
                 if (primitive != null) {
-                    text = "v" + primitive.getVersion();
+                    text = model.getVersionString(primitive);
                     tooltip = tr("Key ''{0}'' was changed in version {1}", key, primitive.getVersion());
                     setBorder(BorderFactory.createMatteBorder(0, 0, 0, 2, model.getVersionColor(primitive)));

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

@@ -93 +93 @@
         if (primitive == null)
             return null;
-        return model.getHistory().getWhichChangedTag(primitive.getVersion(), key);
+        return model.getHistory().getWhichChangedTag(primitive, key, model.isLatest(primitive));
+    }
+
+    /**
+     * Returns a version string for the given primitive, {@code "*"} if it is {@linkplain HistoryBrowserModel#isLatest is latest}.
+     * @param primitive the history primitive
+     * @return a version string for the given primitive
+     */
+    public String getVersionString(HistoryOsmPrimitive primitive) {
+        return model.isLatest(primitive) ? "*" : "v" + primitive.getVersion();
     }
 

trunk/test/unit/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java

@@ -68 +68 @@
         assertEquals(26368284, h.getLatest().getChangesetId());
         assertEquals(Instant.ofEpochMilli(1414429134000L), h.getLatest().getInstant());
-        System.out.println(h.getByVersion(14).keySet());
-        assertEquals(11, h.getWhichChangedTag(14, "bicycle").getVersion());
-        assertEquals(1, h.getWhichChangedTag(10, "bicycle").getVersion());
-        assertEquals(5, h.getWhichChangedTag(14, "created_by").getVersion());
-        assertEquals(2, h.getWhichChangedTag(4, "created_by").getVersion());
-        assertEquals(1, h.getWhichChangedTag(1, "highway").getVersion());
+        assertEquals(11, h.getWhichChangedTag(h.getByVersion(14), "bicycle", false).getVersion());
+        assertEquals(1, h.getWhichChangedTag(h.getByVersion(10), "bicycle", false).getVersion());
+        assertEquals(5, h.getWhichChangedTag(h.getByVersion(14), "created_by", false).getVersion());
+        assertEquals(2, h.getWhichChangedTag(h.getByVersion(4), "created_by", false).getVersion());
+        assertEquals(1, h.getWhichChangedTag(h.getByVersion(1), "highway", false).getVersion());
     }