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 - rearrange

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-09-26 15:10:42 +03:00
parent 0462b3c30f
commit f35292a997
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RemoveChangeListAction.java
+7 -9
View File
@@ -70,27 +70,25 @@ public class RemoveChangeListAction extends AnAction implements DumbAware {
ChangeListRemoveConfirmation.processLists(project, true, (Collection)Arrays.asList(selectedLists), new ChangeListRemoveConfirmation() {
@Override
public boolean askIfShouldRemoveChangeLists(@NotNull List<? extends LocalChangeList> lists) {
return RemoveChangeListAction.askIfShouldRemoveChangeLists(lists, project);
return RemoveChangeListAction.askIfShouldRemoveChangeLists(project, lists);
}
});
}
private static boolean askIfShouldRemoveChangeLists(@NotNull List<? extends LocalChangeList> lists, Project project) {
private static boolean askIfShouldRemoveChangeLists(@NotNull Project project, @NotNull List<? extends LocalChangeList> lists) {
boolean activeChangelistSelected = lists.stream().anyMatch(LocalChangeList::isDefault);
boolean haveNoChanges = lists.stream().allMatch(l -> l.getChanges().isEmpty());
if (activeChangelistSelected) {
return confirmActiveChangeListRemoval(project, lists);
}
boolean haveNoChanges = lists.stream().allMatch(l -> l.getChanges().isEmpty());
if (haveNoChanges) return true;
String message = lists.size() == 1
? VcsBundle.message("changes.removechangelist.warning.text", lists.get(0).getName())
: VcsBundle.message("changes.removechangelist.multiple.warning.text", lists.size());
return haveNoChanges ||
Messages.YES ==
Messages
.showYesNoDialog(project, message, VcsBundle.message("changes.removechangelist.warning.title"), Messages.getQuestionIcon());
return Messages.YES == Messages.showYesNoDialog(project, message, VcsBundle.message("changes.removechangelist.warning.title"),
Messages.getQuestionIcon());
}
static boolean confirmActiveChangeListRemoval(@NotNull Project project, @NotNull List<? extends LocalChangeList> lists) {