Changeset 16123 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2020-03-14T17:03:02+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18918 - Enable Ctrl-H shortcut to display history of primitives selected in changeset manager

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• HistoryInfoAction.java (modified) (2 diffs)
• downloadtasks/DownloadOsmChangeTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.swing.JTable;
 
 import org.openstreetmap.josm.data.osm.OsmData;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.OsmIdSelectionDialog;
@@ -38 +43 @@
     @Override
     public void actionPerformed(ActionEvent ae) {
+        // Generic handling of tables displaying OSM primitives
+        if (ae.getSource() instanceof JTable) {
+            JTable table = (JTable) ae.getSource();
+            Set<PrimitiveId> sel = new HashSet<>();
+            for (int row : table.getSelectedRows()) {
+                for (int col = 0; col < table.getModel().getColumnCount(); col++) {
+                    Object value = table.getModel().getValueAt(row, col);
+                    if (value instanceof PrimitiveId) {
+                        sel.add((PrimitiveId) value);
+                        break;
+                    }
+                }
+            }
+            if (!sel.isEmpty()) {
+                HistoryBrowserDialogManager.getInstance().showHistory(sel);
+                return;
+            }
+        }
+        // Otherwise show history for currently selected objects
         OsmData<?, ?, ?, ?> set = getLayerManager().getActiveData();
         if (set != null && !set.selectionEmpty()) {

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

@@ -144 +144 @@
             this.toLoad = toLoad;
             this.setChangesetDataNeeded(false);
-            add(toLoad.keySet());
+            addOsmPrimitives(toLoad.keySet());
             // Updating process is done after all history requests have been made
             HistoryDataSet.getInstance().addHistoryDataSetListener(this);