Changeset 7547 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-09-16T20:33:54+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9815 - Disable CTRL-C override in relation list

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (3 diffs)

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

@@ -68 +68 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
@@ -173 +174 @@
         InputMapUtils.unassignCtrlShiftUpDown(displaylist, JComponent.WHEN_FOCUSED);
 
-        // Select relation on Ctrl-Enter
+        // Select relation on Enter
         InputMapUtils.addEnterAction(displaylist, selectRelationAction);
 
@@ -179 +180 @@
         displaylist.getActionMap().put("edit", editAction);
         displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_MASK), "edit");
+
+        // Do not hide copy action because of default JList override (fix #9815)
+        displaylist.getActionMap().put("copy", Main.main.menu.copy);
+        displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, GuiHelper.getMenuShortcutKeyMaskEx()), "copy");
 
         updateActionsRelationLists();