MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

svn: Removed "QuickMergeInteraction.showRecentListsForSelection()"

Browse Source 
Used "QuickMergeInteraction.selectMergeItems()" instead
This commit is contained in:
Konstantin Kolosovsky
2016-11-09 23:53:59 +03:00
parent 2041f41007
commit dd569e6b37
5 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
+3 -7
View File
@@ -34,8 +34,9 @@ public interface QuickMergeInteraction {
@NotNull
SelectMergeItemsResult selectMergeItems(@NotNull List<CommittedChangeList> 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<VcsException> exceptions);
void showErrors(@NotNull String message, boolean isError);
@NotNull
List<CommittedChangeList> showRecentListsForSelection(@NotNull List<CommittedChangeList> list,
@NotNull MergeChecker mergeChecker,
boolean allListsLoaded);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java
+5 -13
View File
@@ -79,9 +79,11 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction {
@NotNull
@Override
public SelectMergeItemsResult selectMergeItems(@NotNull List<CommittedChangeList> 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<CommittedChangeList> showRecentListsForSelection(@NotNull List<CommittedChangeList> 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;
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRecentInDialogTask.java
+4 -3
View File
@@ -33,9 +33,10 @@ public class ShowRecentInDialogTask extends BaseMergeTask {
@Override
public void run() {
List<CommittedChangeList> lists = myInteraction
.showRecentListsForSelection(myInitialChangeListsLoader.getCommittedChangeLists(), myInitialChangeListsLoader.getHelper(),
myInitialChangeListsLoader.isLastLoaded());
SelectMergeItemsResult result = myInteraction
.selectMergeItems(myInitialChangeListsLoader.getCommittedChangeLists(), myInitialChangeListsLoader.getHelper(), false,
myInitialChangeListsLoader.isLastLoaded());
List<CommittedChangeList> lists = result.getSelectedLists();
if (!lists.isEmpty()) {
runChangeListsMerge(lists, myMergeContext.getTitle());
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java
+1 -1
View File
@@ -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:
plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java
+3 -10
View File
@@ -69,22 +69,15 @@ public class QuickMergeTestInteraction implements QuickMergeInteraction {
@NotNull
@Override
public SelectMergeItemsResult selectMergeItems(@NotNull List<CommittedChangeList> 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<CommittedChangeList> showRecentListsForSelection(@NotNull List<CommittedChangeList> list,
@NotNull MergeChecker mergeChecker,
boolean allListsLoaded) {
return mySelectedListsProvider != null ? mySelectedListsProvider.fun(list) : emptyList();
}
@NotNull
@Override
public LocalChangesAction selectLocalChangesAction(boolean mergeAll) {