diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java index 130430599642..25073ef3e66a 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java @@ -23,7 +23,6 @@ import com.intellij.openapi.vcs.annotate.FileAnnotation; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.CommitResultHandler; import com.intellij.openapi.vcs.changes.LocalChangeList; -import com.intellij.openapi.vcs.history.VcsFileRevision; import com.intellij.openapi.vcs.history.VcsHistoryProvider; import com.intellij.openapi.vcs.history.VcsRevisionNumber; import com.intellij.openapi.vcs.merge.MergeDialogCustomizer; @@ -36,7 +35,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.awt.*; -import java.io.File; import java.util.*; import java.util.List; @@ -91,10 +89,6 @@ public abstract class AbstractVcsHelper { public abstract void showWhatDiffersBrowser(@Nullable Component parent, Collection changes, @Nls String title); - @Nullable - public abstract T chooseCommittedChangeList(@NotNull CommittedChangesProvider provider, - RepositoryLocation location); - public abstract void openCommittedChangesTab(AbstractVcs vcs, VirtualFile root, ChangeBrowserSettings settings, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java index 939bd67da5ee..1895706810bc 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java @@ -544,27 +544,6 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper { } } - @Nullable - public T chooseCommittedChangeList(@NotNull CommittedChangesProvider provider, - RepositoryLocation location) { - final List changes; - try { - changes = provider.getCommittedChanges(provider.createDefaultSettings(), location, 0); - } - catch (VcsException e) { - return null; - } - final ChangesBrowserDialog dlg = new ChangesBrowserDialog(myProject, new CommittedChangesTableModel((List)changes, - provider.getColumns(), false), - ChangesBrowserDialog.Mode.Choose, null); - if (dlg.showAndGet()) { - return (T)dlg.getSelectedChangeList(); - } - else { - return null; - } - } - @Override @NotNull public List showMergeDialog(@NotNull List files, diff --git a/plugins/git4idea/tests/git4idea/test/MockVcsHelper.kt b/plugins/git4idea/tests/git4idea/test/MockVcsHelper.kt index 740e0e65ed19..4fb2d757f696 100644 --- a/plugins/git4idea/tests/git4idea/test/MockVcsHelper.kt +++ b/plugins/git4idea/tests/git4idea/test/MockVcsHelper.kt @@ -96,10 +96,6 @@ class MockVcsHelper(project: Project) : AbstractVcsHelper(project) { throw UnsupportedOperationException() } - override fun chooseCommittedChangeList(provider: CommittedChangesProvider, location: RepositoryLocation): T? { - throw UnsupportedOperationException() - } - override fun showRollbackChangesDialog(changes: List) { throw UnsupportedOperationException() } diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java index 08ad5e8befbb..a1ef07aea56b 100644 --- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java +++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMockVcsHelper.java @@ -100,12 +100,6 @@ public class HgMockVcsHelper extends AbstractVcsHelper { public void showWhatDiffersBrowser(@Nullable Component parent, Collection changes, @Nls String title) { } - @Override - public T chooseCommittedChangeList(@NotNull CommittedChangesProvider provider, - RepositoryLocation location) { - return null; - } - @Override public void openCommittedChangesTab(AbstractVcs vcs, VirtualFile root, ChangeBrowserSettings settings, int maxCount, String title) { }