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

push down: do not create subclass if class was final

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-29 19:22:54 +02:00
parent ee28567312
commit 4bdfd976cd
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownHandler.java
+13 -2
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.refactoring.memberPushDown;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.editor.Editor;
@@ -62,7 +63,7 @@ public class JavaPushDownHandler implements RefactoringActionHandler, ElementsHa
return;
}
invoke(project, elements.toArray(new PsiElement[0]), dataContext);
invoke(project, elements.toArray(PsiElement.EMPTY_ARRAY), dataContext);
}
private static String collectElementsUnderCaret(PsiElement element, List<PsiElement> elements) {
@@ -71,7 +72,7 @@ public class JavaPushDownHandler implements RefactoringActionHandler, ElementsHa
return RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("the.caret.should.be.positioned.inside.a.class.to.push.members.from"));
}
if (element instanceof PsiClass || element instanceof PsiField || element instanceof PsiMethod) {
if (element instanceof PsiClass && ((PsiClass)element).getQualifiedName() != null || element instanceof PsiField || element instanceof PsiMethod) {
if (element instanceof JspClass) {
return RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("refactoring.is.not.supported.for.jsp.classes"));
}
@@ -86,6 +87,16 @@ public class JavaPushDownHandler implements RefactoringActionHandler, ElementsHa
PsiClass aClass = PsiTreeUtil.getParentOfType(PsiTreeUtil.findCommonParent(elements), PsiClass.class, false);
if (aClass == null) return;
String qualifiedName = aClass.getQualifiedName();
if (qualifiedName == null) return;
final Editor editor = dataContext != null ? CommonDataKeys.EDITOR.getData(dataContext) : null;
if (aClass.hasModifierProperty(PsiModifier.FINAL)) {
CommonRefactoringUtil.showErrorHint(project, editor, RefactoringBundle.message("refactoring.cannot.be.performed") +
": Class " + aClass.getName() + " is final", REFACTORING_NAME, HelpID.MEMBERS_PUSH_DOWN);
return;
}
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, aClass)) return;
MemberInfoStorage memberInfoStorage = new MemberInfoStorage(aClass, element -> !(element instanceof PsiEnumConstant));