Changeset 16489 in josm for trunk/src/org

Timestamp:

2020-05-23T22:03:33+02:00 (5 years ago)

Author:

GerdP

Message:

fix #19275: Relation list: Direct option for history viewer
Enable Ctrl+H and add History to right click popup menu for member list.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -14 +14 @@
 import javax.swing.AbstractAction;
 import javax.swing.DropMode;
+import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
@@ -23 +24 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.AutoScaleAction.AutoScaleMode;
+import org.openstreetmap.josm.actions.HistoryInfoAction;
 import org.openstreetmap.josm.actions.ZoomToAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -31 +33 @@
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction;
+import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -70 +73 @@
         setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
+        HistoryInfoAction historyAction = MainApplication.getMenu().historyinfo;
+        getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(historyAction.getShortcut().getKeyStroke(), "historyAction");
+        getActionMap().put("historyAction", historyAction);
 
         installCustomNavigation(0);
@@ -100 +106 @@
         menu.add(new SelectPreviousGapAction());
         menu.add(new SelectNextGapAction());
+        menu.add(new HistoryInfoAction() {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                Collection<OsmPrimitive> sel = getMemberTableModel().getSelectedChildPrimitives();
+                HistoryBrowserDialogManager.getInstance().showHistory(sel);
+            }
+        });
         return menu;
     }