Changeset 16512 in josm for trunk

Timestamp:

2020-05-28T14:46:30+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19275: Relation list panel: Direct option for history viewer
Apply 19275.2c.patch which enables Ctrl+H in RelationListDialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HistoryInfoAction.java (modified) (3 diffs)
• gui/dialogs/RelationListDialog.java (modified) (2 diffs)

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.LinkedHashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
+import javax.swing.JList;
 import javax.swing.JTable;
 
@@ -44 +46 @@
     public void actionPerformed(ActionEvent ae) {
         // Generic handling of tables displaying OSM primitives
+        Set<PrimitiveId> sel = new LinkedHashSet<>();
         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++) {
@@ -56 +58 @@
                 }
             }
-            if (!sel.isEmpty()) {
-                HistoryBrowserDialogManager.getInstance().showHistory(sel);
-                return;
-            }
+        } else if (ae.getSource() instanceof JList) {
+            JList<?> list = (JList<?>) ae.getSource();
+            sel = list.getSelectedValuesList()
+                    .stream().filter(v -> v instanceof PrimitiveId)
+                    .map(v -> (PrimitiveId) v)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
+        }
+        if (!sel.isEmpty()) {
+            HistoryBrowserDialogManager.getInstance().showHistory(sel);
+            return;
         }
         // Otherwise show history for currently selected objects

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -35 +35 @@
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.HistoryInfoAction;
 import org.openstreetmap.josm.actions.relation.AddSelectionToRelations;
 import org.openstreetmap.josm.actions.relation.DeleteRelationsAction;
@@ -199 +200 @@
         displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, PlatformManager.getPlatform().getMenuShortcutKeyMaskEx()), "copy");
 
+        HistoryInfoAction historyAction = MainApplication.getMenu().historyinfo;
+        displaylist.getActionMap().put("historyAction", historyAction);
+        displaylist.getInputMap().put(historyAction.getShortcut().getKeyStroke(), "historyAction");
+
         updateActionsRelationLists();
     }