Changeset 32815 in osm for applications

Timestamp:

2016-08-15T13:05:33+02:00 (8 years ago)

Author:

donvip

Message:

fix #13336 - 'utilsplugin2' "Silent shortcut conflict" w/ core

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• .settings/org.eclipse.jdt.ui.prefs (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/.settings/org.eclipse.jdt.ui.prefs

@@ -16 +16 @@
 sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=false
 sp_cleanup.format_source_code_changes_only=false

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java

@@ -38 +38 @@
     public PasteRelationsAction() {
         super(TITLE, "dumbutils/pasterelations", tr("Paste relation membership from objects in the buffer onto selected object(s)"),
-                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}", tr("Paste Relations")), KeyEvent.VK_V, Shortcut.ALT_CTRL),
-                true);
+              Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}", tr("Paste Relations")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
+              true);
     }