tests fixed and some duplicated shortcuts replaced by 'use-shortcut-of' attribute

platform/platform-resources/src/META-INF/XmlActions.xml

@@ -29,18 +29,15 @@
 
     <action id="DomElementsTreeView.GotoDomElementDeclarationAction"
             class="com.intellij.util.xml.tree.actions.GotoDomElementDeclarationAction"
-            text="Goto Element">
-      <keyboard-shortcut first-keystroke="F4" keymap="$default"/>
-    </action>
+            text="Goto Element"
+            use-shortcut-of="EditSource"/>
 
     <action id="DomElementsTreeView.AddElement" class="com.intellij.util.xml.tree.actions.AddElementInCollectionAction"
             text="Insert element">
       <keyboard-shortcut first-keystroke="INSERT" keymap="$default"/>
     </action>
     <action id="DomElementsTreeView.DeleteElement" class="com.intellij.util.xml.tree.actions.DeleteDomElement"
-            text="Delete element">
-      <keyboard-shortcut first-keystroke="DELETE" keymap="$default"/>
-    </action>
+            text="Delete element" use-shortcut-of="$Delete"/>
 
     <group id="DomElementsTreeView.AddElementGroup" class="com.intellij.util.xml.tree.actions.AddDomElementActionGroup"/>
 
@@ -56,12 +53,8 @@
       <action id="DomCollectionControl.Add" class="com.intellij.util.xml.ui.DomCollectionControl$AddAction" text="Add">
         <keyboard-shortcut first-keystroke="INSERT" keymap="$default"/>
       </action>
-      <action id="DomCollectionControl.Edit" class="com.intellij.util.xml.ui.DomCollectionControl$EditAction" text="Edit">
-        <keyboard-shortcut first-keystroke="F4" keymap="$default"/>
-      </action>
-      <action id="DomCollectionControl.Remove" class="com.intellij.util.xml.ui.DomCollectionControl$RemoveAction" text="Remove">
-        <keyboard-shortcut first-keystroke="DELETE" keymap="$default"/>
-      </action>
+      <action id="DomCollectionControl.Edit" class="com.intellij.util.xml.ui.DomCollectionControl$EditAction" text="Edit" use-shortcut-of="EditSource"/>
+      <action id="DomCollectionControl.Remove" class="com.intellij.util.xml.ui.DomCollectionControl$RemoveAction" text="Remove" use-shortcut-of="$Delete"/>
     </group>
 
     <group id="NewXml" text="XML">

platform/platform-resources/src/idea/Keymap_Default.xml

@@ -635,10 +635,6 @@
   <action id="EditorTab">
     <keyboard-shortcut first-keystroke="TAB"/>
   </action>
-  <action id="EditorPaste">
-    <keyboard-shortcut first-keystroke="control V"/>
-    <keyboard-shortcut first-keystroke="shift INSERT"/>
-  </action>
   <action id="IntroduceParameter">
     <keyboard-shortcut first-keystroke="control alt P"/>
   </action>
@@ -774,10 +770,6 @@
   <action id="EditorSplitLine">
     <keyboard-shortcut first-keystroke="control ENTER"/>
   </action>
-  <action id="EditorCut">
-    <keyboard-shortcut first-keystroke="shift DELETE"/>
-    <keyboard-shortcut first-keystroke="control X"/>
-  </action>
   <action id="FindUsagesInFile">
     <keyboard-shortcut first-keystroke="control F7"/>
   </action>
@@ -821,10 +813,6 @@
   <action id="SafeDelete">
     <keyboard-shortcut first-keystroke="alt DELETE"/>
   </action>
-  <action id="EditorCopy">
-    <keyboard-shortcut first-keystroke="control INSERT"/>
-    <keyboard-shortcut first-keystroke="control C"/>
-  </action>
   <action id="NextTemplateVariable">
     <keyboard-shortcut first-keystroke="TAB"/>
     <keyboard-shortcut first-keystroke="ENTER"/>

platform/platform-resources/src/idea/Keymap_Eclipse.xml

@@ -51,7 +51,6 @@
     <action id="DelegateMethods">
       <keyboard-shortcut first-keystroke="shift alt E" />
     </action>
-    <action id="DomElementsTreeView.GotoDomElementDeclarationAction" />
     <action id="EditSource">
       <keyboard-shortcut first-keystroke="F12" />
       <keyboard-shortcut first-keystroke="shift control E" />

platform/platform-resources/src/idea/Keymap_Emacs.xml

@@ -128,11 +128,6 @@
       <keyboard-shortcut first-keystroke="alt R"/>
       <keyboard-shortcut first-keystroke="control R"/>
     </action>
-    <action id="EditorCut">
-      <keyboard-shortcut first-keystroke="shift DELETE"/>
-      <keyboard-shortcut first-keystroke="alt X"/>
-      <keyboard-shortcut first-keystroke="control W"/>
-    </action>
     <action id="NextTab">
       <keyboard-shortcut first-keystroke="alt RIGHT"/>
       <keyboard-shortcut first-keystroke="control X" second-keystroke="N"/>
@@ -205,12 +200,6 @@
       <keyboard-shortcut first-keystroke="alt B"/>
       <keyboard-shortcut first-keystroke="ESCAPE" second-keystroke="control B"/>
     </action>
-    <action id="EditorCopy">
-      <keyboard-shortcut first-keystroke="control INSERT"/>
-      <keyboard-shortcut first-keystroke="alt C"/>
-      <keyboard-shortcut first-keystroke="alt W"/>
-      <keyboard-shortcut first-keystroke="ESCAPE" second-keystroke="W"/>
-    </action>
     <action id="EditorCodeBlockStart">
       <keyboard-shortcut first-keystroke="control OPEN_BRACKET"/>
       <keyboard-shortcut first-keystroke="control alt OPEN_BRACKET"/>
@@ -255,11 +244,6 @@
       <keyboard-shortcut first-keystroke="shift alt PERIOD"/>
     </action>
     <action id="GotoImplementation"/>
-    <action id="EditorPaste">
-      <keyboard-shortcut first-keystroke="alt P"/>
-      <keyboard-shortcut first-keystroke="shift INSERT"/>
-      <keyboard-shortcut first-keystroke="control Y"/>
-    </action>
     <action id="EditorPageDown">
       <keyboard-shortcut first-keystroke="PAGE_DOWN"/>
       <keyboard-shortcut first-keystroke="control V"/>

platform/platform-resources/src/idea/PlatformActions.xml

@@ -25,9 +25,9 @@
       <action id="EditorPageDown" class="com.intellij.openapi.editor.actions.PageDownAction"/>
       <action id="EditorPageUpWithSelection" class="com.intellij.openapi.editor.actions.PageUpWithSelectionAction"/>
       <action id="EditorPageDownWithSelection" class="com.intellij.openapi.editor.actions.PageDownWithSelectionAction"/>
-      <action id="EditorCopy" class="com.intellij.openapi.editor.actions.CopyAction"/>
-      <action id="EditorCut" class="com.intellij.openapi.editor.actions.CutAction"/>
-      <action id="EditorPaste" class="com.intellij.openapi.editor.actions.PasteAction"/>
+      <action id="EditorCopy" class="com.intellij.openapi.editor.actions.CopyAction" use-shortcut-of="$Copy"/>
+      <action id="EditorCut" class="com.intellij.openapi.editor.actions.CutAction" use-shortcut-of="$Cut"/>
+      <action id="EditorPaste" class="com.intellij.openapi.editor.actions.PasteAction" use-shortcut-of="$Paste"/>
       <action id="EditorPasteSimple" class="com.intellij.openapi.editor.actions.SimplePasteAction"/>
       <action id="EditorPasteFromX11" class="com.intellij.openapi.editor.actions.PasteFromX11Action"/>
       <action id="EditorDelete" class="com.intellij.openapi.editor.actions.DeleteAction"/>