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

IDEA-130588 dir-diff: do not confirm deletion, if deleted files are not selected

Browse Source
This commit is contained in:
Aleksey Pivovarov
2014-09-30 17:40:43 +04:00
parent 39dd01b5fd
commit dccad1641f
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+8 -6
View File
@@ -762,11 +762,12 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
}
public void synchronizeSelected() {
if (!checkCanDelete()) {
List<DirDiffElementImpl> selectedElements = getSelectedElements();
if (!checkCanDelete(selectedElements)) {
return;
}
rememberSelection();
for (DirDiffElementImpl element : getSelectedElements()) {
for (DirDiffElementImpl element : selectedElements) {
syncElement(element);
}
restoreSelection();
@@ -779,19 +780,20 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
}
public void synchronizeAll() {
if (!checkCanDelete()) {
List<DirDiffElementImpl> elements = new ArrayList<DirDiffElementImpl>(myElements);
if (!checkCanDelete(elements)) {
return;
}
for (DirDiffElementImpl element : myElements.toArray(new DirDiffElementImpl[myElements.size()])) {
for (DirDiffElementImpl element : elements) {
syncElement(element);
}
selectFirstRow();
}
private boolean checkCanDelete() {
private boolean checkCanDelete(List<DirDiffElementImpl> elements) {
if (WarnOnDeletion.isWarnWhenDeleteItems()) {
int count = 0;
for (DirDiffElementImpl element : myElements) {
for (DirDiffElementImpl element : elements) {
if (element.getOperation() == DirDiffOperation.DELETE) {
count++;
}