MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-91679 (same, for push up)

Browse Source
This commit is contained in:
Roman Shevchenko
2012-09-18 19:33:32 +02:00
parent b4cf161740
commit 908de0d6a2
6 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
View File

@@ -51,6 +51,7 @@ import java.util.*;
public class PushDownProcessor extends BaseRefactoringProcessor {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.memberPushDown.PushDownProcessor");
private final MemberInfo[] myMemberInfos;
private PsiClass myClass;
private final DocCommentPolicy myJavaDocPolicy;
@@ -362,15 +363,25 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
final boolean wasInterface = myClass.isInterface();
newMember = (PsiMethod)targetClass.add(method);
if (wasInterface) {
PsiUtil.setModifierProperty(newMember, PsiModifier.ABSTRACT, true);
PsiUtil.setModifierProperty(newMember, PsiModifier.PUBLIC, true);
} else if (memberInfo.isToAbstract()) {
if (!targetClass.isInterface()) {
PsiUtil.setModifierProperty(newMember, PsiModifier.PUBLIC, true);
final PsiJavaToken extMethodMarker = PsiUtil.findExtensionMethodMarker((PsiMethod)newMember);
if (extMethodMarker == null) {
PsiUtil.setModifierProperty(newMember, PsiModifier.ABSTRACT, true);
}
else {
extMethodMarker.delete();
}
}
}
else if (memberInfo.isToAbstract()) {
if (newMember.hasModifierProperty(PsiModifier.PRIVATE)) {
PsiUtil.setModifierProperty(newMember, PsiModifier.PROTECTED, true);
}
myJavaDocPolicy.processNewJavaDoc(((PsiMethod)newMember).getDocComment());
}
} else { //abstract method: remove @Override
}
else { //abstract method: remove @Override
final PsiAnnotation annotation = AnnotationUtil.findAnnotation(methodBySignature, "java.lang.Override");
if (annotation != null) {
annotation.delete();
@@ -378,10 +389,12 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
final PsiDocComment oldDocComment = method.getDocComment();
if (oldDocComment != null) {
final PsiDocComment docComment = methodBySignature.getDocComment();
if (myJavaDocPolicy.getJavaDocPolicy() == DocCommentPolicy.COPY || myJavaDocPolicy.getJavaDocPolicy() == DocCommentPolicy.MOVE) {
final int policy = myJavaDocPolicy.getJavaDocPolicy();
if (policy == DocCommentPolicy.COPY || policy == DocCommentPolicy.MOVE) {
if (docComment != null) {
docComment.replace(oldDocComment);
} else {
}
else {
methodBySignature.getParent().addBefore(oldDocComment, methodBySignature);
}
}
@@ -427,7 +440,5 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
((JavaRefactoringListenerManagerImpl)listenerManager).fireMemberMoved(myClass, newMember);
}
}
}
}

8
java/java-tests/testData/refactoring/pushDown/ExtensionMethodToClass.java Normal file
View File

@@ -0,0 +1,8 @@
interface Base {
void foo<caret>() default {
System.out.println("Hi there.");
}
}
class C implements Base {
}

8
java/java-tests/testData/refactoring/pushDown/ExtensionMethodToClass_after.java Normal file
View File

@@ -0,0 +1,8 @@
interface Base {
}
class C implements Base {
public void foo() {
System.out.println("Hi there.");
}
}

8
java/java-tests/testData/refactoring/pushDown/ExtensionMethodToInterface.java Normal file
View File

@@ -0,0 +1,8 @@
interface Base {
void foo<caret>() default {
System.out.println("Hi there.");
}
}
interface I2 extends Base {
}

8
java/java-tests/testData/refactoring/pushDown/ExtensionMethodToInterface_after.java Normal file
View File

@@ -0,0 +1,8 @@
interface Base {
}
interface I2 extends Base {
void foo() default {
System.out.println("Hi there.");
}
}

2
java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
View File

@@ -51,6 +51,8 @@ public class PushDownTest extends LightRefactoringTestCase {
public void testSameClassInterface() { doTestImplements(); }
public void testPreserveTypeArgs() { doTestImplements(); }
public void testSubstTypeArgs() { doTestImplements(); }
public void testExtensionMethodToInterface() { doTest(); }
public void testExtensionMethodToClass() { doTest(); }
private void doTest() {
doTest(false);