diff --git a/platform/vcs-api/src/com/intellij/util/continuation/GatheringContinuationContext.java b/platform/vcs-api/src/com/intellij/util/continuation/GatheringContinuationContext.java deleted file mode 100644 index 100fa772add8..000000000000 --- a/platform/vcs-api/src/com/intellij/util/continuation/GatheringContinuationContext.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2000-2011 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.util.Consumer; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** -* @author irengrig -* Date: 4/7/11 -* Time: 6:43 PM -*/ -public class GatheringContinuationContext implements ContinuationContext { - private final List myList; - - public GatheringContinuationContext() { - myList = new ArrayList(); - } - - public List getList() { - return myList; - } - - @Override - public void cancelEverything() { - } - - @Override - public void cancelCurrent() { - } - - @Override - public void addExceptionHandler(Class clazz, Consumer consumer) { - } - - @Override - public boolean handleException(Exception e, boolean cancelEveryThing) { - return false; - } - - @Override - public void throwDisaster(Object disaster, final Object cure) { - } - - @Override - public void keepExisting(Object disaster, Object cure) { - } - - @Override - public void next(TaskDescriptor... next) { - myList.addAll(0, Arrays.asList(next)); - } - - @Override - public void next(List next) { - myList.addAll(0, next); - } - - @Override - public void last(TaskDescriptor... next) { - myList.addAll(Arrays.asList(next)); - } - - @Override - public void last(List next) { - myList.addAll(next); - } - - @Override - public void after(@NotNull TaskDescriptor inQueue, TaskDescriptor... next) { - int idx = -1; - for (int i = 0; i < myList.size(); i++) { - final TaskDescriptor descriptor = myList.get(i); - if (inQueue == descriptor) { - idx = i; - break; - } - } - assert idx != -1; - myList.addAll(idx, Arrays.asList(next)); - } - - @Override - public void suspend() { - } - - @Override - public void ping() { - } - - @Override - public void addNewTasksPatcher(@NotNull Consumer consumer) { - } - - @Override - public void removeNewTasksPatcher(@NotNull Consumer consumer) { - } -} diff --git a/platform/vcs-impl/src/com/intellij/util/continuation/Continuation.java b/platform/vcs-impl/src/com/intellij/util/continuation/Continuation.java index a0258742f222..f4025a0b6276 100644 --- a/platform/vcs-impl/src/com/intellij/util/continuation/Continuation.java +++ b/platform/vcs-impl/src/com/intellij/util/continuation/Continuation.java @@ -27,10 +27,6 @@ public class Continuation { myGeneralRunner = generalRunner; } - public static Continuation createForCurrentProgress(final Project project, final boolean cancellable) { - return new Continuation(new SameProgressRunner(project, cancellable)); - } - public static Continuation createFragmented(final Project project, final boolean cancellable) { SeparatePiecesRunner generalRunner = new SeparatePiecesRunner(project, cancellable); return new Continuation(generalRunner); @@ -58,21 +54,6 @@ public class Continuation { myGeneralRunner.ping(); } - public void resumeOnNewIndicator(final Project project, final boolean cancellable, final String commonTitle) { - final SameProgressRunner runner = new SameProgressRunner(project, cancellable); - runner.next(myGeneralRunner.myQueue); - myGeneralRunner = runner; - resume(); - } - - public void clearQueue() { - myGeneralRunner.cancelEverything(); - } - - public void cancelCurrent() { - myGeneralRunner.cancelCurrent(); - } - public void add(List list) { myGeneralRunner.next(list); } diff --git a/platform/vcs-impl/src/com/intellij/util/continuation/GeneralRunner.java b/platform/vcs-impl/src/com/intellij/util/continuation/GeneralRunner.java index 77d3114bce43..3fc4c2767804 100644 --- a/platform/vcs-impl/src/com/intellij/util/continuation/GeneralRunner.java +++ b/platform/vcs-impl/src/com/intellij/util/continuation/GeneralRunner.java @@ -85,12 +85,6 @@ abstract class GeneralRunner implements ContinuationContext { return myProject; } - public void clearDisasters() { - synchronized (myQueueLock) { - myDisasters.clear(); - } - } - @Override public boolean handleException(Exception e, boolean cancelEveryThing) { synchronized (myQueueLock) {