From a4191ba2513e5a9b4a0ecf4b9c82e23e45b13668 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Thu, 22 Apr 2010 17:52:41 +0400
Subject: [PATCH] fix keymap test

---
 .../platform-resources/src/idea/Keymap_Eclipse.xml     | 10 ++--------
 platform/platform-resources/src/idea/Keymap_Emacs.xml  |  2 +-
 platform/platform-resources/src/idea/Keymap_KDE.xml    |  2 +-
 .../platform-resources/src/idea/Keymap_Netbeans.xml    | 10 +++-------
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/platform/platform-resources/src/idea/Keymap_Eclipse.xml b/platform/platform-resources/src/idea/Keymap_Eclipse.xml
index de8626efc763..6108e7648f1a 100644
--- a/platform/platform-resources/src/idea/Keymap_Eclipse.xml
+++ b/platform/platform-resources/src/idea/Keymap_Eclipse.xml
@@ -22,19 +22,13 @@
       <keyboard-shortcut first-keystroke="shift alt C" />
     </action>
     <action id="CheckinProject" />
-    <action id="CloseActiveTab">
-      <keyboard-shortcut first-keystroke="control F4" />
-      <keyboard-shortcut first-keystroke="control W" />
-    </action>
+    <action id="CloseActiveTab" />
     <action id="CloseAllEditors">
       <keyboard-shortcut first-keystroke="shift control F4" />
       <keyboard-shortcut first-keystroke="shift control W" />
     </action>
     <action id="CloseEditor" />
-    <action id="CloseWindow">
-      <keyboard-shortcut first-keystroke="control F4" />
-      <keyboard-shortcut first-keystroke="control W" />
-    </action>
+    <action id="CloseWindow" />
     <action id="CodeInspection.OnEditor" />
     <action id="CollapseAllRegions">
       <keyboard-shortcut first-keystroke="shift control DIVIDE" />
diff --git a/platform/platform-resources/src/idea/Keymap_Emacs.xml b/platform/platform-resources/src/idea/Keymap_Emacs.xml
index bd928b8b397a..7025ec286e34 100644
--- a/platform/platform-resources/src/idea/Keymap_Emacs.xml
+++ b/platform/platform-resources/src/idea/Keymap_Emacs.xml
@@ -224,7 +224,7 @@
       <keyboard-shortcut first-keystroke="UP"/>
       <keyboard-shortcut first-keystroke="control P"/>
     </action>
-    <action id="CloseEditor">
+    <action id="CloseContent">
       <keyboard-shortcut first-keystroke="control F4"/>
       <keyboard-shortcut first-keystroke="control X" second-keystroke="K"/>
     </action>
diff --git a/platform/platform-resources/src/idea/Keymap_KDE.xml b/platform/platform-resources/src/idea/Keymap_KDE.xml
index 377d5c094ff6..0751bed27d80 100644
--- a/platform/platform-resources/src/idea/Keymap_KDE.xml
+++ b/platform/platform-resources/src/idea/Keymap_KDE.xml
@@ -6,7 +6,7 @@
     <action id="CloseActiveTab">
       <keyboard-shortcut first-keystroke="shift control 4" />
     </action>
-    <action id="CloseEditor">
+    <action id="CloseContent">
       <keyboard-shortcut first-keystroke="control 4" />
     </action>
     <action id="CompileDirty">
diff --git a/platform/platform-resources/src/idea/Keymap_Netbeans.xml b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
index 93095e74205f..024c60ceed38 100644
--- a/platform/platform-resources/src/idea/Keymap_Netbeans.xml
+++ b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
@@ -42,20 +42,16 @@
       <keyboard-shortcut first-keystroke="control alt BACK_SLASH" />
     </action>
     <action id="CloneElement" />
-    <action id="CloseActiveTab">
-      <keyboard-shortcut first-keystroke="control W" />
-    </action>
+    <action id="CloseActiveTab" />
     <action id="CloseAllEditors">
       <keyboard-shortcut first-keystroke="shift control W" />
       <keyboard-shortcut first-keystroke="shift control F4" />
     </action>
-    <action id="CloseEditor">
+    <action id="CloseContent">
       <keyboard-shortcut first-keystroke="control F4" />
       <keyboard-shortcut first-keystroke="control W" />
     </action>
-    <action id="CloseWindow">
-      <keyboard-shortcut first-keystroke="control W" />
-    </action>
+    <action id="CloseWindow" />
     <action id="CodeCompletion">
       <keyboard-shortcut first-keystroke="control SPACE" />
       <keyboard-shortcut first-keystroke="control BACK_SLASH" />