diff --git a/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java b/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java index 002e5e0eaa90..d53c21379dde 100644 --- a/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java +++ b/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -73,7 +73,7 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL applyModifiersFromRegistry(); } - + @Override public void disposeComponent() { KeymapManager.getInstance().removeKeymapManagerListener(this); @@ -86,8 +86,7 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL @Override public void activeKeymapChanged(Keymap keymap) { - KeymapManager mgr = KeymapManager.getInstance(); - myKeymap = mgr.getActiveKeymap(); + myKeymap = KeymapManager.getInstance().getActiveKeymap(); } Keymap getKeymap() { @@ -131,7 +130,8 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL if (SystemInfo.isMac) { return "control alt"; - } else { + } + else { return "shift alt"; } } @@ -147,7 +147,7 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL Shortcut[] shortcuts = myKeymap.getShortcuts(actionId); for (Shortcut each : shortcuts) { if (each instanceof KeyboardShortcut) { - myKeymap.removeShortcut(actionId, each); + myKeymap.removeShortcut(actionId, each); } } } @@ -158,11 +158,14 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL for (String each : codeTexts) { if ("control".equals(each)) { mask |= InputEvent.CTRL_MASK; - } else if ("shift".equals(each)) { + } + else if ("shift".equals(each)) { mask |= InputEvent.SHIFT_MASK; - } else if ("alt".equals(each)) { + } + else if ("alt".equals(each)) { mask |= InputEvent.ALT_MASK; - } else if ("meta".equals(each)) { + } + else if ("meta".equals(each)) { mask |= InputEvent.META_MASK; } }