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

push down from interface to abstract class fixed (IDEA-82286)

Browse Source
This commit is contained in:
anna
2012-03-12 12:43:05 +01:00
parent e0e2622efd
commit 3c5d7a568d
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+5 -2
View File
@@ -356,11 +356,14 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
}
else if (member instanceof PsiMethod) {
PsiMethod method = (PsiMethod)member;
final PsiMethod methodBySignature = targetClass.findMethodBySignature(method, false);
if (methodBySignature == null) {
final boolean wasInterface = myClass.isInterface();
newMember = (PsiMethod)targetClass.add(method);
if (memberInfo.isToAbstract()) {
if (wasInterface) {
PsiUtil.setModifierProperty(newMember, PsiModifier.ABSTRACT, true);
PsiUtil.setModifierProperty(newMember, PsiModifier.PUBLIC, true);
} else if (memberInfo.isToAbstract()) {
if (newMember.hasModifierProperty(PsiModifier.PRIVATE)) {
PsiUtil.setModifierProperty(newMember, PsiModifier.PROTECTED, true);
}