From 4493d98ccdf33686d8bae2cc4cf5368355efb3d1 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 18 Nov 2014 13:06:19 +0100
Subject: [PATCH] cleanup

---
 .../intellij/ui/switcher/QuickAccessSettings.java    | 12 +++++++++---
 .../ui/switcher/QuickAccessConfigurable.java         |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

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 f806e29ce289..002e5e0eaa90 100644
--- a/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java
+++ b/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java
@@ -50,14 +50,17 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL
   @NonNls public static final String SWITCH_APPLY = "SwitchApply";
   private RegistryValue myModifiersValue;
 
+  @Override
   @NotNull
   public String getComponentName() {
     return "QuickAccess";
   }
 
+  @Override
   public void initComponent() {
     myModifiersValue = Registry.get("actionSystem.quickAccessModifiers");
     myModifiersValue.addListener(new RegistryValueListener.Adapter() {
+      @Override
       public void afterValueChanged(RegistryValue value) {
         applyModifiersFromRegistry();
       }
@@ -71,14 +74,17 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL
     applyModifiersFromRegistry();
   }
       
+  @Override
   public void disposeComponent() {
     KeymapManager.getInstance().removeKeymapManagerListener(this);
     Disposer.dispose(this);
   }
 
+  @Override
   public void dispose() {
   }
 
+  @Override
   public void activeKeymapChanged(Keymap keymap) {
     KeymapManager mgr = KeymapManager.getInstance();
     myKeymap = mgr.getActiveKeymap();
@@ -89,7 +95,7 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL
   }
 
   void saveModifiersToRegistry(Set<String> codeTexts) {
-    StringBuffer value = new StringBuffer();
+    StringBuilder value = new StringBuilder();
     for (String each : codeTexts) {
       if (value.length() > 0) {
         value.append(" ");
@@ -109,7 +115,7 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL
     HashSet<String> vksSet = new HashSet<String>();
     ContainerUtil.addAll(vksSet, vks);
     myModifierVks.clear();
-    int mask = getModiferMask(vksSet);
+    int mask = getModifierMask(vksSet);
     myModifierVks.addAll(getModifiersVKs(mask));
 
     reassignActionShortcut(SWITCH_UP, mask, KeyEvent.VK_UP);
@@ -147,7 +153,7 @@ public class QuickAccessSettings implements ApplicationComponent, KeymapManagerL
   }
 
   @JdkConstants.InputEventMask
-  int getModiferMask(Set<String> codeTexts) {
+  int getModifierMask(Set<String> codeTexts) {
     int mask = 0;
     for (String each : codeTexts) {
       if ("control".equals(each)) {
diff --git a/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java b/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java
index feab7d7e544e..559653d0c6e9 100644
--- a/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java
@@ -199,7 +199,7 @@ public class QuickAccessConfigurable extends JPanel implements SearchableConfigu
   private boolean printConflict(GridBagConstraints c, int actionKey, String actionId) {
     boolean hasConflicts = false;
 
-    int mask = myQuickAccessSettings.getModiferMask(myModifiers);
+    int mask = myQuickAccessSettings.getModifierMask(myModifiers);
 
     KeyboardShortcut sc = new KeyboardShortcut(KeyStroke.getKeyStroke(actionKey, mask), null);