Merge remote-tracking branch 'origin/master' into develar/is

diff --cc java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
Simple merge

diff --cc java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
Simple merge

diff --cc java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
Simple merge

diff --cc platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
Simple merge

diff --cc platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
Simple merge

diff --cc platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
index 8a81378aed5722beeec6ef9d644b2ab9743500af,6edb5b52e4e51e8f290735c6c7c357819d21e841..cc69281bfad9d5594103f4a9a260c4013646d77d
--- 1/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
--- 2/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
@@@ -136,39 -136,10 +134,10 @@@ public class KeymapImpl extends Externa
      return otherKeymap;
    }
  
-   @Nullable
-   private List<String> getChangedActionIds(@NotNull KeymapImpl otherKeymap) {
-     if (!otherKeymap.isInternalKeymapListener()) {
-       return null;
-     }
-     List<String> changedActionIds = new ArrayList<>();
-     Set<String> oldKeys = otherKeymap.myActionId2ListOfShortcuts.keySet();
-     Set<String> newKeys = new HashSet<>(myActionId2ListOfShortcuts.keySet());
- 
-     for (String key : oldKeys) {
-       if (newKeys.remove(key)) {
-         if (!Comparing.equal(otherKeymap.myActionId2ListOfShortcuts.get(key), myActionId2ListOfShortcuts.get(key))) {
-           changedActionIds.add(key);
-         }
-       }
-       else {
-         changedActionIds.add(key);
-       }
-     }
-     changedActionIds.addAll(newKeys);
- 
-     return changedActionIds;
-   }
- 
    public boolean equals(Object object) {
 -    if (!(object instanceof Keymap)) return false;
 +    if (!(object instanceof KeymapImpl)) return false;
      KeymapImpl secondKeymap = (KeymapImpl)object;
 -    if (!Comparing.equal(myName, secondKeymap.myName)) return false;
 +    if (!Comparing.equal(getName(), secondKeymap.getName())) return false;
      if (myCanModify != secondKeymap.myCanModify) return false;
      if (!Comparing.equal(myParent, secondKeymap.myParent)) return false;
      if (!Comparing.equal(myActionId2ListOfShortcuts, secondKeymap.myActionId2ListOfShortcuts)) return false;

diff --cc platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
index d63e2a8695411e83cad4cbcda60abba299a78f33,1f3fbc381cc459013cae5712492e83acb05e9774..32303862b906c366024c8c6ab4f210865a9ef13a
--- 1/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
--- 2/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapManagerImpl.java
@@@ -19,13 -19,14 +19,11 @@@ import com.intellij.ide.WelcomeWizardUt
  import com.intellij.openapi.Disposable;
  import com.intellij.openapi.components.*;
  import com.intellij.openapi.keymap.Keymap;
- import com.intellij.openapi.keymap.KeymapManager;
  import com.intellij.openapi.keymap.KeymapManagerListener;
  import com.intellij.openapi.keymap.ex.KeymapManagerEx;
 -import com.intellij.openapi.options.Scheme;
 -import com.intellij.openapi.options.SchemeProcessor;
 -import com.intellij.openapi.options.SchemesManager;
 -import com.intellij.openapi.options.SchemesManagerFactory;
 +import com.intellij.openapi.options.*;
  import com.intellij.openapi.util.*;
  import com.intellij.openapi.util.text.StringUtil;
- import com.intellij.util.ParameterizedRunnable;
  import com.intellij.util.containers.ContainerUtil;
  import org.jdom.Element;
  import org.jetbrains.annotations.NonNls;
@@@ -91,13 -92,8 +89,8 @@@ public class KeymapManagerImpl extends 
          setActiveKeymap(keymap);
        }
      }
 -    mySchemesManager.loadSchemes();
 +    mySchemeManager.loadSchemes();
  
-     ParameterizedRunnable<KeymapManager> runnable = WelcomeWizardUtil.getWizardCreateKeymapRunnable();
-     if (runnable != null) {
-       runnable.run(this);
-     }
- 
      //noinspection AssignmentToStaticFieldFromInstanceMethod
      ourKeymapManagerInitialized = true;
    }