Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 2 insertions, 6 deletions

diff --git a/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java b/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
index 95cd1e0f0f4c..6d28563e062c 100644
--- a/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
+++ b/spellchecker/src/com/intellij/spellchecker/tokenizer/SpellcheckingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -72,15 +72,11 @@ public class SpellcheckingStrategy {
 
   public static SpellCheckerQuickFix[] getDefaultRegularFixes(boolean useRename, String wordWithTypo) {
     return new SpellCheckerQuickFix[]{
-      (useRename ? new RenameTo(wordWithTypo) : new ChangeTo(wordWithTypo)),
+      useRename ? new RenameTo(wordWithTypo) : new ChangeTo(wordWithTypo),
       new AcceptWordAsCorrect(wordWithTypo)
     };
   }
 
-  public SpellCheckerQuickFix[] getBatchFixes(PsiElement element, int offset, @NotNull TextRange textRange) {
-    return getDefaultBatchFixes();
-  }
-
   public static SpellCheckerQuickFix[] getDefaultBatchFixes() {
     return BATCH_FIXES;
   }