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

inline superclass should not inline throught hierarchy (IDEA-54908)

Browse Source
This commit is contained in:
anna
2010-05-14 20:04:56 +04:00
parent 45859a2bac
commit b2ebc6776b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringHandler.java
+3 -4
View File
@@ -26,8 +26,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.psi.search.searches.DirectClassInheritorsSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.inline.JavaInlineActionHandler;
import com.intellij.refactoring.util.CommonRefactoringUtil;
@@ -45,13 +44,13 @@ public class InlineSuperClassRefactoringHandler extends JavaInlineActionHandler
public boolean canInlineElement(PsiElement element) {
if (!(element instanceof PsiClass)) return false;
if (element.getLanguage() != StdLanguages.JAVA) return false;
Collection<PsiClass> inheritors = ClassInheritorsSearch.search((PsiClass)element).findAll();
Collection<PsiClass> inheritors = DirectClassInheritorsSearch.search((PsiClass)element).findAll();
return inheritors.size() > 0;
}
public void inlineElement(final Project project, final Editor editor, final PsiElement element) {
PsiClass superClass = (PsiClass) element;
Collection<PsiClass> inheritors = ClassInheritorsSearch.search((PsiClass)element).findAll();
Collection<PsiClass> inheritors = DirectClassInheritorsSearch.search((PsiClass)element).findAll();
if (!superClass.getManager().isInProject(superClass)) {
CommonRefactoringUtil.showErrorHint(project, editor, "Cannot inline non-project class", REFACTORING_NAME, null);
return;