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 a0a0ee61fb8b..0c3dc8ad7e90 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java @@ -49,7 +49,7 @@ public interface QuickMergeInteraction { @NotNull List showRecentListsForSelection(@NotNull List list, @NotNull MergeChecker mergeChecker, - boolean everyThingLoaded); + boolean allListsLoaded); interface SelectMergeItemsResult { @NotNull 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 ef68a91a7cab..38c8e8ecfd8e 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java @@ -143,7 +143,7 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction { @Override public List showRecentListsForSelection(@NotNull List list, @NotNull MergeChecker mergeChecker, - boolean everyThingLoaded) { + boolean allListsLoaded) { ToBeMergedDialog dialog = new ToBeMergedDialog(myMergeContext, list, myMergeContext.getTitle(), mergeChecker, false); return dialog.showAndGet() ? dialog.getSelected() : emptyList(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java index 1f91553b2595..6670f157db9a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java @@ -91,8 +91,8 @@ public class ToBeMergedDialog extends DialogWrapper { private final Set myAlreadyMerged; private final MergeChecker myMergeChecker; - private final boolean myAlreadyCalculatedState; - private volatile boolean myEverythingLoaded; + private final boolean myAllStatusesCalculated; + private volatile boolean myAllListsLoaded; private final Map myStatusMap; private ToBeMergedDialog.MoreXAction myMore100Action; @@ -102,13 +102,13 @@ public class ToBeMergedDialog extends DialogWrapper { @NotNull List lists, final String title, @NotNull MergeChecker mergeChecker, - boolean everythingLoaded) { + boolean allListsLoaded) { super(mergeContext.getProject(), true); myMergeContext = mergeContext; - myEverythingLoaded = everythingLoaded; + myAllListsLoaded = allListsLoaded; myStatusMap = synchronizedMap(newHashMap()); myMergeChecker = mergeChecker; - myAlreadyCalculatedState = everythingLoaded; + myAllStatusesCalculated = allListsLoaded; setTitle(title); // Paging is not used - "Load Xxx" buttons load corresponding new elements and add them to the end of the table. Single (first) page is @@ -116,27 +116,27 @@ public class ToBeMergedDialog extends DialogWrapper { myListsEngine = new BasePageEngine<>(lists, lists.size()); myPanel = new JPanel(new BorderLayout()); - myWiseSelection = new QuantitySelection<>(myEverythingLoaded); + myWiseSelection = new QuantitySelection<>(myAllListsLoaded); myAlreadyMerged = newHashSet(); setOKButtonText("Merge Selected"); initUI(); init(); enableMore(); - if (!myAlreadyCalculatedState) { + if (!myAllStatusesCalculated) { refreshListStatus(lists); } } private void enableMore() { - myMore100Action.setVisible(!myEverythingLoaded); - myMore500Action.setVisible(!myEverythingLoaded); - myMore100Action.setEnabled(!myEverythingLoaded); - myMore500Action.setEnabled(!myEverythingLoaded); + myMore100Action.setVisible(!myAllListsLoaded); + myMore500Action.setVisible(!myAllListsLoaded); + myMore100Action.setEnabled(!myAllListsLoaded); + myMore500Action.setEnabled(!myAllListsLoaded); } - public void setEverythingLoaded(boolean everythingLoaded) { - myEverythingLoaded = everythingLoaded; + public void setAllListsLoaded() { + myAllListsLoaded = true; myMore100Action.setVisible(false); myMore500Action.setVisible(false); } @@ -210,7 +210,7 @@ public class ToBeMergedDialog extends DialogWrapper { @NotNull @Override protected Action[] createActions() { - if (myAlreadyCalculatedState) { + if (myAllStatusesCalculated) { return new Action[]{getOKAction(), new DialogWrapperAction("Merge All") { @Override protected void doAction(ActionEvent e) { @@ -525,7 +525,7 @@ public class ToBeMergedDialog extends DialogWrapper { private void updateDialog() { addMoreLists(myLists); if (myIsLastListLoaded) { - setEverythingLoaded(true); + setAllListsLoaded(); } } } @@ -541,7 +541,7 @@ public class ToBeMergedDialog extends DialogWrapper { myCheckBox.setEnabled(true); myCheckBox.setSelected(true); myRenderer = new CommittedChangeListRenderer(myMergeContext.getProject(), singletonList(list -> { - ListMergeStatus status = myAlreadyCalculatedState + ListMergeStatus status = myAllStatusesCalculated ? ListMergeStatus.NOT_MERGED : ObjectUtils.notNull(myStatusMap.get(list.getNumber()), ListMergeStatus.REFRESHING); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java index 78ff0423cd27..cdbd2f75f8cd 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java @@ -89,7 +89,7 @@ public class QuickMergeTestInteraction implements QuickMergeInteraction { @Override public List showRecentListsForSelection(@NotNull List list, @NotNull MergeChecker mergeChecker, - boolean everyThingLoaded) { + boolean allListsLoaded) { return mySelectedListsProvider != null ? mySelectedListsProvider.fun(list) : emptyList(); }