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

Safe delete for AppCode is reworked

Browse Source
This commit is contained in:
Alexander Kirillin
2012-05-04 23:28:32 +04:00
parent 94a6508163
commit 931ede593d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java
+8 -7
View File
@@ -40,6 +40,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
/**
@@ -63,15 +64,15 @@ public class SafeDeleteHandler implements RefactoringActionHandler {
invoke(project, elements, LangDataKeys.MODULE.getData(dataContext), true, null);
}
public static void invoke(final Project project, PsiElement[] elements, boolean checkSuperMethods) {
invoke(project, elements, checkSuperMethods, null);
public static void invoke(final Project project, PsiElement[] elements, boolean checkDelegates) {
invoke(project, elements, checkDelegates, null);
}
public static void invoke(final Project project, PsiElement[] elements, boolean checkSuperMethods, @Nullable final Runnable successRunnable) {
invoke(project, elements, null, checkSuperMethods, successRunnable);
public static void invoke(final Project project, PsiElement[] elements, boolean checkDelegates, @Nullable final Runnable successRunnable) {
invoke(project, elements, null, checkDelegates, successRunnable);
}
public static void invoke(final Project project, PsiElement[] elements, @Nullable Module module, boolean checkSuperMethods, @Nullable final Runnable successRunnable) {
public static void invoke(final Project project, PsiElement[] elements, @Nullable Module module, boolean checkDelegates, @Nullable final Runnable successRunnable) {
for (PsiElement element : elements) {
if (!SafeDeleteProcessor.validElement(element)) {
return;
@@ -79,9 +80,9 @@ public class SafeDeleteHandler implements RefactoringActionHandler {
}
final PsiElement[] temptoDelete = PsiTreeUtil.filterAncestors(elements);
Set<PsiElement> elementsSet = new HashSet<PsiElement>(Arrays.asList(temptoDelete));
Set<PsiElement> fullElementsSet = new HashSet<PsiElement>();
Set<PsiElement> fullElementsSet = new LinkedHashSet<PsiElement>();
if (checkSuperMethods) {
if (checkDelegates) {
for (PsiElement element : temptoDelete) {
boolean found = false;
for(SafeDeleteProcessorDelegate delegate: Extensions.getExtensions(SafeDeleteProcessorDelegate.EP_NAME)) {