Changeset 16460 in josm for trunk

Timestamp:

2020-05-18T09:57:52+02:00 (4 years ago)

Author:

GerdP

Message:

see #19254

• double click on first row did not work
• allow to use all implementations of PrimitiveId in HistoryDataSet.getHistory()
• simplify code, correct javadoc

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/history/HistoryDataSet.java (modified) (2 diffs)
• gui/history/NodeListViewer.java (modified) (1 diff)
• gui/history/RelationMemberListViewer.java (modified) (1 diff)
• gui/history/ShowHistoryAction.java (modified) (4 diffs)

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -166 +165 @@
      */
     public History getHistory(PrimitiveId pid) {
-        PrimitiveId key = pid instanceof IPrimitive ? ((IPrimitive) pid).getPrimitiveId()
-                        : pid instanceof HistoryOsmPrimitive ? ((HistoryOsmPrimitive) pid).getPrimitiveId()
-                        : pid;
+        PrimitiveId key = new SimplePrimitiveId(pid.getUniqueId(), pid.getType());
         List<HistoryOsmPrimitive> versions = data.get(Objects.requireNonNull(key, "key"));
         if (versions == null)

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

@@ -56 +56 @@
         table.addMouseListener(new ShowHistoryAction.DoubleClickAdapter(e -> {
             int row = table.rowAtPoint(e.getPoint());
-            return row <= 0 ? null : primitiveIdAtRow(tableModel, row);
+            return row < 0 ? null : primitiveIdAtRow(tableModel, row);
         }));
         return table;

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

@@ -38 +38 @@
         table.addMouseListener(new ShowHistoryAction.DoubleClickAdapter(e -> {
             int row = table.rowAtPoint(e.getPoint());
-            return row <= 0 ? null : (RelationMemberData) tableModel.getValueAt(row, 0).value;
+            return row < 0 ? null : (RelationMemberData) tableModel.getValueAt(row, 0).value;
         }));
         return table;

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

@@ -7 +7 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Collections;
 import java.util.function.Function;
 
@@ -12 +13 @@
 
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.history.History;
-import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
- * Open a history browser with the history of this node
+ * Open a history browser with the history of an object.
  */
 class ShowHistoryAction extends AbstractAction {
@@ -29 +26 @@
     ShowHistoryAction() {
         putValue(NAME, tr("Show history"));
-        putValue(SHORT_DESCRIPTION, tr("Open a history browser with the history of this node"));
+        putValue(SHORT_DESCRIPTION, tr("Display the history of the selected object."));
         new ImageProvider("dialogs", "history").getResource().attachImageIcon(this, true);
     }
@@ -46 +43 @@
 
     public void run() {
-        if (HistoryDataSet.getInstance().getHistory(primitiveId) == null) {
-            MainApplication.worker.submit(new HistoryLoadTask().add(primitiveId));
-        }
-        MainApplication.worker.submit(() -> {
-            final History h = HistoryDataSet.getInstance().getHistory(primitiveId);
-            if (h == null)
-                return;
-            GuiHelper.runInEDT(() -> HistoryBrowserDialogManager.getInstance().show(h));
-        });
+        HistoryBrowserDialogManager.getInstance().showHistory(Collections.singleton(primitiveId));
     }