From 446a5ecdfe7ed540e62622ab11a07b0f7ee2003a Mon Sep 17 00:00:00 2001
From: Vitalii Parfonov <vparfonov@codenvy.com>
Date: Mon, 13 Mar 2017 13:47:40 +0200
Subject: [PATCH] Set correct default hot key scheme. Don't use deprectaed
 method (#4402)

Signed-off-by: Vitalii Parfonov <vparfonov@codenvy.com>
---
 .../org/eclipse/che/ide/keybinding/KeyBindingManager.java     | 2 +-
 .../che/plugin/keybinding/eclipse/EclipseKeyBinding.java      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/keybinding/KeyBindingManager.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/keybinding/KeyBindingManager.java
index 6be23ec9068..8f4c88bafc0 100644
--- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/keybinding/KeyBindingManager.java
+++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/keybinding/KeyBindingManager.java
@@ -70,7 +70,7 @@ public KeyBindingManager(ActionManager actionManager, Provider<PerspectiveManage
         addScheme(new SchemeImpl(SCHEME_ECLIPSE_ID, "Eclipse Scheme"));
 
         //TODO check user settings
-        activeScheme = SCHEME_ECLIPSE_ID;
+        activeScheme = SCHEME_GLOBAL_ID;
 
         presentationFactory = new PresentationFactory();
 
diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java
index 0446853ace7..6519f01d8d9 100644
--- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java
+++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/src/main/java/org/eclipse/che/plugin/keybinding/eclipse/EclipseKeyBinding.java
@@ -13,6 +13,7 @@
 import org.eclipse.che.ide.api.extension.Extension;
 import org.eclipse.che.ide.api.keybinding.KeyBindingAgent;
 import org.eclipse.che.ide.api.keybinding.KeyBuilder;
+import org.eclipse.che.ide.keybinding.KeyBindingManager;
 import org.eclipse.che.ide.util.browser.UserAgent;
 import org.eclipse.che.ide.util.input.CharCodeWithModifiers;
 import org.eclipse.che.ide.util.input.KeyCodeMap;
@@ -39,6 +40,7 @@
 import static org.eclipse.che.ide.ext.java.client.JavaExtension.PARAMETERS_INFO;
 import static org.eclipse.che.ide.ext.java.client.JavaExtension.QUICK_FIX;
 import static org.eclipse.che.ide.ext.java.client.JavaExtension.SHOW_QUICK_DOC;
+import static org.eclipse.che.ide.keybinding.KeyBindingManager.SCHEME_ECLIPSE_ID;
 import static org.eclipse.che.plugin.debugger.ide.DebuggerExtension.DEBUG_ID;
 import static org.eclipse.che.plugin.debugger.ide.DebuggerExtension.DISCONNECT_DEBUG_ID;
 import static org.eclipse.che.plugin.debugger.ide.DebuggerExtension.EDIT_DEBUG_CONF_ID;
@@ -111,6 +113,6 @@ public EclipseKeyBinding(KeyBindingAgent agent) {
         keys.put(GIT_COMPARE_WITH_LATEST, new KeyBuilder().action().alt().charCode('d').build());
 
         // Register keys
-        agent.getEclipse().addKeys(keys);
+        agent.getScheme(SCHEME_ECLIPSE_ID).addKeys(keys);
     }
 }