Changeset 16694 in josm for trunk

Timestamp:

2020-06-21T12:16:35+02:00 (4 years ago)

Author:

simon04

Message:

see #19367 - History browser: do not reset UI after (re)loading of history (version table)

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowser.java (modified) (2 diffs)
• HistoryBrowserModel.java (modified) (3 diffs)

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

@@ -7 +7 @@
 import java.awt.Dimension;
 import java.util.Arrays;
-import java.util.Objects;
 
 import javax.swing.JPanel;
@@ -115 +114 @@
      */
     public void populate(History history) {
-        boolean samePrimitive = model.getHistory() != null && Objects.equals(model.getHistory().getPrimitiveId(), history.getPrimitiveId());
+        boolean samePrimitive = model.isSamePrimitive(history); // needs to be before setHistory
         model.setHistory(history);
         if (samePrimitive) {

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

@@ -5 +5 @@
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
@@ -128 +129 @@
     }
 
+    boolean isSamePrimitive(History history) {
+        return getHistory() != null && Objects.equals(getHistory().getPrimitiveId(), history.getPrimitiveId());
+    }
+
     private boolean canShowAsLatest(OsmPrimitive primitive) {
         if (primitive == null)
@@ -164 +169 @@
      */
     public void setHistory(History history) {
+        boolean samePrimitive = isSamePrimitive(history); // needs to be before `this.history = history`
         this.history = history;
-        if (history.getNumVersions() > 0) {
+        if (samePrimitive && history.getNumVersions() > 0) {
+            reference = history.getByVersion(reference.getVersion());
+            current = history.getByVersion(current.getVersion());
+        } else if (history.getNumVersions() > 0) {
             HistoryOsmPrimitive newLatest = null;
             DataSet ds = MainApplication.getLayerManager().getActiveDataSet();