MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

suggest containing class if target class not found (IDEA-67907)

Browse Source
This commit is contained in:
anna
2011-04-12 15:17:38 +02:00
parent 909f22d402
commit 0c66b6cfa4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java
+9
View File
@@ -101,6 +101,10 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog
return;
}
invoke(project, dataContext, aClass, aMember);
}
private void invoke(Project project, DataContext dataContext, PsiClass aClass, PsiElement aMember) {
Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
if (aClass == null) {
String message =
@@ -112,6 +116,11 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog
ArrayList<PsiClass> bases = RefactoringHierarchyUtil.createBasesList(aClass, false, true);
if (bases.isEmpty()) {
final PsiClass containingClass = aClass.getContainingClass();
if (containingClass != null) {
invoke(project, dataContext, containingClass, aClass);
return;
}
String message = RefactoringBundle.getCannotRefactorMessage(
RefactoringBundle.message("class.does.not.have.base.classes.interfaces.in.current.project", aClass.getQualifiedName()));
CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.MEMBERS_PULL_UP);