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

vcs: cleanup - remove unnecessary parameter

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-09-26 15:10:42 +03:00
parent a01ad0f2a7
commit 0462b3c30f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeListRemoveConfirmation.kt
+1 -1
View File
@@ -67,7 +67,7 @@ abstract class ChangeListRemoveConfirmation() {
toRemove.forEach { manager.removeChangeList(it.name) }
if (shouldRemoveDefault && RemoveChangeListAction.confirmActiveChangeListRemoval(project, listOf(defaultList), defaultList.getChanges().isEmpty())) {
if (shouldRemoveDefault && RemoveChangeListAction.confirmActiveChangeListRemoval(project, listOf(defaultList))) {
manager.removeChangeList(defaultList.name)
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java
+6 -4
View File
@@ -80,7 +80,7 @@ public class RemoveChangeListAction extends AnAction implements DumbAware {
boolean haveNoChanges = lists.stream().allMatch(l -> l.getChanges().isEmpty());
if (activeChangelistSelected) {
return confirmActiveChangeListRemoval(project, lists, haveNoChanges);
return confirmActiveChangeListRemoval(project, lists);
}
String message = lists.size() == 1
@@ -93,7 +93,9 @@ public class RemoveChangeListAction extends AnAction implements DumbAware {
.showYesNoDialog(project, message, VcsBundle.message("changes.removechangelist.warning.title"), Messages.getQuestionIcon());
}
static boolean confirmActiveChangeListRemoval(@NotNull Project project, @NotNull List<? extends LocalChangeList> lists, boolean empty) {
static boolean confirmActiveChangeListRemoval(@NotNull Project project, @NotNull List<? extends LocalChangeList> lists) {
boolean haveNoChanges = lists.stream().allMatch(l -> l.getChanges().isEmpty());
List<LocalChangeList> remainingLists = ChangeListManager.getInstance(project).getChangeListsCopy();
remainingLists.removeAll(lists);
@@ -104,13 +106,13 @@ public class RemoveChangeListAction extends AnAction implements DumbAware {
// don't ask "Which changelist to make active" if there is only one option anyway
// unless there are some changes to be moved - give user a chance to cancel deletion
if (remainingLists.size() == 1 && empty) {
if (remainingLists.size() == 1 && haveNoChanges) {
ChangeListManager.getInstance(project).setDefaultChangeList(remainingLists.get(0));
return true;
}
String[] remainingListsNames = remainingLists.stream().map(ChangeList::getName).toArray(String[]::new);
int nameIndex = Messages.showChooseDialog(project, empty
int nameIndex = Messages.showChooseDialog(project, haveNoChanges
? VcsBundle.message("changes.remove.active.empty.prompt")
: VcsBundle.message("changes.remove.active.prompt"),
VcsBundle.message("changes.remove.active.title"), Messages.getQuestionIcon(),