svn: Extracted inner "ShowRevisionSelector" class to separate file

plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeCalculatorTask.java

@@ -124,43 +124,6 @@ public class MergeCalculatorTask extends BaseMergeTask {
     return result;
   }
 
-  private static class ShowRevisionSelector extends BaseMergeTask {
-
-    @NotNull private final List<CommittedChangeList> myChangeLists;
-    @NotNull private final MergeChecker myMergeChecker;
-
-    private ShowRevisionSelector(@NotNull QuickMerge mergeProcess,
-                                 @NotNull List<CommittedChangeList> changeLists,
-                                 @NotNull MergeChecker mergeChecker) {
-      super(mergeProcess, "show revisions to merge", Where.AWT);
-
-      myChangeLists = changeLists;
-      myMergeChecker = mergeChecker;
-    }
-
-    @Override
-    public void run() {
-      QuickMergeInteraction.SelectMergeItemsResult result =
-        myInteraction.selectMergeItems(myChangeLists, myMergeContext.getTitle(), myMergeChecker);
-
-      switch (result.getResultCode()) {
-        case cancel:
-          end();
-          break;
-        case all:
-          next(getMergeAllTasks(true));
-          break;
-        default:
-          List<CommittedChangeList> lists = result.getSelectedLists();
-
-          if (!lists.isEmpty()) {
-            runChangeListsMerge(lists, myMergeContext.getTitle());
-          }
-          break;
-      }
-    }
-  }
-
   // true if errors found
   static boolean checkListForPaths(@NotNull String workingCopyRoot, @NotNull String sourceBranch, @NotNull LogHierarchyNode node) {
     // TODO: Such filtering logic is not clear enough so far (and probably not correct for all cases - for instance when we perform merge

plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2000-2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.idea.svn.integrate;
+
+import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
+import com.intellij.util.continuation.Where;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.idea.svn.mergeinfo.MergeChecker;
+
+import java.util.List;
+
+public class ShowRevisionSelector extends BaseMergeTask {
+
+  @NotNull private final List<CommittedChangeList> myChangeLists;
+  @NotNull private final MergeChecker myMergeChecker;
+
+  public ShowRevisionSelector(@NotNull QuickMerge mergeProcess,
+                              @NotNull List<CommittedChangeList> changeLists,
+                              @NotNull MergeChecker mergeChecker) {
+    super(mergeProcess, "show revisions to merge", Where.AWT);
+
+    myChangeLists = changeLists;
+    myMergeChecker = mergeChecker;
+  }
+
+  @Override
+  public void run() {
+    QuickMergeInteraction.SelectMergeItemsResult result =
+      myInteraction.selectMergeItems(myChangeLists, myMergeContext.getTitle(), myMergeChecker);
+
+    switch (result.getResultCode()) {
+      case cancel:
+        end();
+        break;
+      case all:
+        next(getMergeAllTasks(true));
+        break;
+      default:
+        List<CommittedChangeList> lists = result.getSelectedLists();
+
+        if (!lists.isEmpty()) {
+          runChangeListsMerge(lists, myMergeContext.getTitle());
+        }
+        break;
+    }
+  }
+}