From 8e5bf0aa2eb0c42b90558e4ca0c55526f0ce5fe8 Mon Sep 17 00:00:00 2001
From: Yaroslav Lepenkin <yaroslav.lepenkin@jetbrains.com>
Date: Mon, 22 Dec 2014 21:43:40 +0200
Subject: [PATCH] RearrangeCodeProcessor: removed unused parameter

---
 .../codeInsight/actions/RearrangeCodeProcessor.java   | 11 +----------
 .../codeInsight/actions/ReformatCodeAction.java       |  8 ++++----
 .../actions/ReformatFilesWithFiltersTest.java         |  6 +-----
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
index 089d4054768b..b34fcb858108 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
@@ -40,13 +40,10 @@ public class RearrangeCodeProcessor extends AbstractLayoutCodeProcessor {
   public static final String COMMAND_NAME = "Rearrange code";
   public static final String PROGRESS_TEXT = "Rearranging code...";
 
-  @Nullable private Condition<PsiFile> myAcceptCondition;
   @Nullable private SelectionModel mySelectionModel;
 
-  public RearrangeCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor,
-                                @Nullable Condition<PsiFile> acceptCondition) {
+  public RearrangeCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor) {
     super(previousProcessor, COMMAND_NAME, PROGRESS_TEXT);
-    myAcceptCondition = acceptCondition;
   }
   
   public RearrangeCodeProcessor(@NotNull Project project,
@@ -63,18 +60,12 @@ public class RearrangeCodeProcessor extends AbstractLayoutCodeProcessor {
     super(project, files, PROGRESS_TEXT, commandName, postRunnable, false);
   }
 
-  public boolean shouldRearrangeFile(@NotNull PsiFile file) {
-    return myAcceptCondition == null || myAcceptCondition.value(file);
-  }
-
   @NotNull
   @Override
   protected FutureTask<Boolean> prepareTask(@NotNull final PsiFile file, final boolean processChangedTextOnly) {
     return new FutureTask<Boolean>(new Callable<Boolean>() {
       @Override
       public Boolean call() throws Exception {
-        if (!shouldRearrangeFile(file)) return true;
-
         Collection<TextRange> ranges = processChangedTextOnly ? FormatChangedTextUtil.getChangedTextRanges(myProject, file)
                                                               : getRangesToFormat(file);
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
index ee81aa3d4ae1..bcbd0fd6738d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
@@ -103,7 +103,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
           processor = new OptimizeImportsProcessor(processor);
         }
         if (selectedFlags.isRearrangeEntries()) {
-          processor = new RearrangeCodeProcessor(processor, null);
+          processor = new RearrangeCodeProcessor(processor);
         }
 
         processor.run();
@@ -193,7 +193,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
     }
 
     if (rearrangeEntries && editor != null) {
-      processor = new RearrangeCodeProcessor(processor, null);
+      processor = new RearrangeCodeProcessor(processor);
     }
 
     processor.run();
@@ -249,7 +249,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
       processor = new OptimizeImportsProcessor(processor);
     }
     if (options.isRearrangeEntries()) {
-      processor = new RearrangeCodeProcessor(processor, null);
+      processor = new RearrangeCodeProcessor(processor);
     }
 
     processor.run();
@@ -276,7 +276,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
     }
 
     if (selectedFlags.isRearrangeEntries()) {
-      processor = new RearrangeCodeProcessor(processor, null);
+      processor = new RearrangeCodeProcessor(processor);
     }
 
     processor.run();
diff --git a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java
index 799e924c587d..e586093aad93 100644
--- a/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java
@@ -1,8 +1,6 @@
-
 package com.intellij.codeInsight.actions;
 
 import com.intellij.lang.LanguageFormatting;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileTypes.PlainTextLanguage;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
@@ -11,13 +9,11 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.testFramework.LightPlatformTestCase;
 import com.intellij.testFramework.PlatformTestCase;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.picocontainer.MutablePicoContainer;
 
 import java.io.IOException;
-import java.util.Collection;
 import java.util.Set;
 
 import static com.intellij.psi.search.GlobalSearchScopesCore.directoryScope;
@@ -246,7 +242,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
     AbstractLayoutCodeProcessor processor = new ReformatCodeProcessor(getProject(), directory, true, false);
     ReformatCodeAction.registerScopeFilter(processor, scope);
 
-    processor = new RearrangeCodeProcessor(processor, null);
+    processor = new RearrangeCodeProcessor(processor);
     processor.run();
   }