diff --git a/platform/vcs-impl/src/com/intellij/util/continuation/Continuation.java b/platform/vcs-impl/src/com/intellij/util/continuation/Continuation.java deleted file mode 100644 index f4025a0b6276..000000000000 --- a/platform/vcs-impl/src/com/intellij/util/continuation/Continuation.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2000-2010 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 com.intellij.util.continuation; - -import com.intellij.openapi.project.Project; -import com.intellij.util.Consumer; - -import java.util.List; - -public class Continuation { - private GeneralRunner myGeneralRunner; - - private Continuation(GeneralRunner generalRunner) { - myGeneralRunner = generalRunner; - } - - public static Continuation createFragmented(final Project project, final boolean cancellable) { - SeparatePiecesRunner generalRunner = new SeparatePiecesRunner(project, cancellable); - return new Continuation(generalRunner); - } - - public void run(final TaskDescriptor... tasks) { - if (tasks.length == 0) return; - myGeneralRunner.next(tasks); - - myGeneralRunner.ping(); - } - - public void run(final List tasks) { - if (tasks.isEmpty()) return; - myGeneralRunner.next(tasks); - - myGeneralRunner.ping(); - } - - public void addExceptionHandler(final Class clazz, final Consumer consumer) { - myGeneralRunner.addExceptionHandler(clazz, consumer); - } - - public void resume() { - myGeneralRunner.ping(); - } - - public void add(List list) { - myGeneralRunner.next(list); - } - - public boolean isEmpty() { - return myGeneralRunner.isEmpty(); - } - - public void onCancel() { - myGeneralRunner.onCancel(); - } -} diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java index c9f62b0dda27..e7d037a099de 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java @@ -17,7 +17,7 @@ package org.jetbrains.idea.svn.integrate; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.vcs.VcsException; -import com.intellij.util.continuation.Continuation; +import com.intellij.util.continuation.SeparatePiecesRunner; import com.intellij.util.continuation.TaskDescriptor; import org.jetbrains.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; @@ -71,12 +71,14 @@ public class QuickMerge { finalTask }; - createContinuation().run(mapNotNull(tasks, identity())); + SeparatePiecesRunner runner = createRunner(); + runner.next(mapNotNull(tasks, identity())); + runner.ping(); } @NotNull - private Continuation createContinuation() { - Continuation result = Continuation.createFragmented(myMergeContext.getProject(), true); + private SeparatePiecesRunner createRunner() { + SeparatePiecesRunner result = new SeparatePiecesRunner(myMergeContext.getProject(), true); result.addExceptionHandler(VcsException.class, e -> myInteraction.showErrors(myMergeContext.getTitle(), singletonList(e))); result.addExceptionHandler(SVNException.class,