MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not show empty conflicts dialog

Browse Source
This commit is contained in:
anna
2012-04-16 12:21:03 +02:00
parent 9dfeb9598e
commit f8cd8bc212
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ModifierIntention.java
View File

@@ -59,20 +59,26 @@ abstract class ModifierIntention extends Intention implements LowPriorityAction
return;
}
final MultiMap<PsiElement, String> conflicts = checkForConflicts(member);
final ConflictsDialog conflictsDialog = new ConflictsDialog(member.getProject(), conflicts, new Runnable() {
@Override
public void run() {
final AccessToken token = WriteAction.start();
try {
modifierList.setModifierProperty(getModifier(), true);
final boolean conflictsDialogOK;
if (conflicts.isEmpty()) {
conflictsDialogOK = true;
} else {
final ConflictsDialog conflictsDialog = new ConflictsDialog(member.getProject(), conflicts, new Runnable() {
@Override
public void run() {
final AccessToken token = WriteAction.start();
try {
modifierList.setModifierProperty(getModifier(), true);
}
finally {
token.finish();
}
}
finally {
token.finish();
}
}
});
conflictsDialog.show();
if (conflictsDialog.isOK()) {
});
conflictsDialog.show();
conflictsDialogOK = conflictsDialog.isOK();
}
if (conflictsDialogOK) {
modifierList.setModifierProperty(getModifier(), true);
}
}