diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java index 821629f6b567..10466365900a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java @@ -34,8 +34,9 @@ public interface QuickMergeInteraction { @NotNull SelectMergeItemsResult selectMergeItems(@NotNull List lists, - @NotNull String mergeTitle, - @NotNull MergeChecker mergeChecker); + @NotNull MergeChecker mergeChecker, + boolean allStatusesCalculated, + boolean allListsLoaded); @NotNull LocalChangesAction selectLocalChangesAction(boolean mergeAll); @@ -45,9 +46,4 @@ public interface QuickMergeInteraction { void showErrors(@NotNull String message, @NotNull List exceptions); void showErrors(@NotNull String message, boolean isError); - - @NotNull - List showRecentListsForSelection(@NotNull List list, - @NotNull MergeChecker mergeChecker, - boolean allListsLoaded); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java index 06a49bcec769..4a55657054ed 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java @@ -79,9 +79,11 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction { @NotNull @Override public SelectMergeItemsResult selectMergeItems(@NotNull List lists, - @NotNull String mergeTitle, - @NotNull MergeChecker mergeChecker) { - ToBeMergedDialog dialog = new ToBeMergedDialog(myMergeContext, lists, mergeTitle, mergeChecker, true, true); + @NotNull MergeChecker mergeChecker, + boolean allStatusesCalculated, + boolean allListsLoaded) { + ToBeMergedDialog dialog = + new ToBeMergedDialog(myMergeContext, lists, myMergeContext.getTitle(), mergeChecker, allStatusesCalculated, allListsLoaded); dialog.show(); QuickMergeContentsVariants resultCode = toMergeVariant(dialog.getExitCode()); @@ -124,16 +126,6 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction { VcsBalloonProblemNotifier.showOverChangesView(myProject, message, isError ? MessageType.ERROR : MessageType.WARNING); } - @NotNull - @Override - public List showRecentListsForSelection(@NotNull List list, - @NotNull MergeChecker mergeChecker, - boolean allListsLoaded) { - ToBeMergedDialog dialog = new ToBeMergedDialog(myMergeContext, list, myMergeContext.getTitle(), mergeChecker, false, allListsLoaded); - - return dialog.showAndGet() ? dialog.getSelected() : emptyList(); - } - private boolean prompt(@NotNull String question) { return showOkCancelDialog(myProject, question, myTitle, getQuestionIcon()) == OK; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRecentInDialogTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRecentInDialogTask.java index 3659356c1158..9aa22df9930b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRecentInDialogTask.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRecentInDialogTask.java @@ -33,9 +33,10 @@ public class ShowRecentInDialogTask extends BaseMergeTask { @Override public void run() { - List lists = myInteraction - .showRecentListsForSelection(myInitialChangeListsLoader.getCommittedChangeLists(), myInitialChangeListsLoader.getHelper(), - myInitialChangeListsLoader.isLastLoaded()); + SelectMergeItemsResult result = myInteraction + .selectMergeItems(myInitialChangeListsLoader.getCommittedChangeLists(), myInitialChangeListsLoader.getHelper(), false, + myInitialChangeListsLoader.isLastLoaded()); + List lists = result.getSelectedLists(); if (!lists.isEmpty()) { runChangeListsMerge(lists, myMergeContext.getTitle()); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java index 46fa7b3f3997..134acc72c1d4 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java @@ -38,7 +38,7 @@ public class ShowRevisionSelector extends BaseMergeTask { @Override public void run() { - SelectMergeItemsResult result = myInteraction.selectMergeItems(myChangeLists, myMergeContext.getTitle(), myMergeChecker); + SelectMergeItemsResult result = myInteraction.selectMergeItems(myChangeLists, myMergeChecker, true, true); switch (result.getResultCode()) { case cancel: diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java index 9be5cdffd1cf..70f72508301a 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java @@ -69,22 +69,15 @@ public class QuickMergeTestInteraction implements QuickMergeInteraction { @NotNull @Override public SelectMergeItemsResult selectMergeItems(@NotNull List lists, - @NotNull String mergeTitle, - @NotNull MergeChecker mergeChecker) { + @NotNull MergeChecker mergeChecker, + boolean allStatusesCalculated, + boolean allListsLoaded) { return new SelectMergeItemsResult( mySelectedListsProvider != null ? QuickMergeContentsVariants.select : QuickMergeContentsVariants.all, mySelectedListsProvider != null ? mySelectedListsProvider.fun(lists) : emptyList() ); } - @NotNull - @Override - public List showRecentListsForSelection(@NotNull List list, - @NotNull MergeChecker mergeChecker, - boolean allListsLoaded) { - return mySelectedListsProvider != null ? mySelectedListsProvider.fun(list) : emptyList(); - } - @NotNull @Override public LocalChangesAction selectLocalChangesAction(boolean mergeAll) {