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

push down: do not add the same interface twice (check class equivalence over non-copied element)

Browse Source
This commit is contained in:
anna
2011-09-05 13:01:00 +02:00
parent d1a5dacee3
commit 5471e8e202
4 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,7 +385,7 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
}
else if (member instanceof PsiClass) {
if (Boolean.FALSE.equals(memberInfo.getOverrides())) {
final PsiClass aClass = (PsiClass)member;
final PsiClass aClass = (PsiClass)memberInfo.getMember();
if (!targetClass.isInheritor(aClass, false)) {
PsiJavaCodeReferenceElement classRef = factory.createClassReferenceElement(aClass);
if (aClass.isInterface()) {

3
java/java-tests/testData/refactoring/pushDown/SameClassInterface.java Normal file
View File

@@ -0,0 +1,3 @@
interface Int {}
public class Test implements In<caret>t {}
class B extends Test implements Int {}

3
java/java-tests/testData/refactoring/pushDown/SameClassInterface.java.after Normal file
View File

@@ -0,0 +1,3 @@
interface Int {}
public class Test {}
class B extends Test implements Int {}

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

@@ -9,6 +9,7 @@ import com.intellij.psi.*;
import com.intellij.refactoring.memberPushDown.PushDownProcessor;
import com.intellij.refactoring.util.DocCommentPolicy;
import com.intellij.refactoring.util.classMembers.MemberInfo;
import com.intellij.refactoring.util.classMembers.MemberInfoStorage;
import com.intellij.testFramework.LightCodeInsightTestCase;
import com.intellij.JavaTestUtil;
import com.intellij.usageView.UsageInfo;
@@ -28,7 +29,7 @@ public class PushDownTest extends LightCodeInsightTestCase {
}
private void doTest(final boolean failure) throws Exception {
final String filePath = "/refactoring/pushDown/" + getTestName(false)+ ".java";
final String filePath = "/refactoring/pushDown/" + getTestName(false) + ".java";
configureByFile(filePath);
final PsiElement targetElement = TargetElementUtilBase.findTargetElement(getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
@@ -53,7 +54,8 @@ public class PushDownTest extends LightCodeInsightTestCase {
memberInfo.setChecked(true);
membersToMove.add(memberInfo);
new PushDownProcessor(getProject(), membersToMove.toArray(new MemberInfo[membersToMove.size()]), currentClass, new DocCommentPolicy(DocCommentPolicy.ASIS)){
new PushDownProcessor(getProject(), membersToMove.toArray(new MemberInfo[membersToMove.size()]), currentClass,
new DocCommentPolicy(DocCommentPolicy.ASIS)) {
@Override
protected boolean showConflicts(MultiMap<PsiElement, String> conflicts, UsageInfo[] usages) {
if (failure ? conflicts.isEmpty() : !conflicts.isEmpty()) {
@@ -109,4 +111,30 @@ public class PushDownTest extends LightCodeInsightTestCase {
public void testMethodTypeParametersList() throws Exception {
doTest();
}
public void testSameClassInterface() throws Exception {
final String filePath = "/refactoring/pushDown/" + getTestName(false) + ".java";
configureByFile(filePath);
PsiClass currentClass = JavaPsiFacade.getInstance(getProject()).findClass("Test");
MemberInfoStorage memberInfoStorage = new MemberInfoStorage(currentClass, new MemberInfo.Filter<PsiMember>() {
public boolean includeMember(PsiMember element) {
return true;
}
});
List<MemberInfo> members = memberInfoStorage.getClassMemberInfos(currentClass);
for (MemberInfo member : members) {
member.setChecked(true);
}
new PushDownProcessor(getProject(), members.toArray(new MemberInfo[members.size()]), currentClass,
new DocCommentPolicy(DocCommentPolicy.ASIS)) {
@Override
protected boolean showConflicts(MultiMap<PsiElement, String> conflicts, UsageInfo[] usages) {
return true;
}
}.run();
checkResultByFile(filePath + ".after");
}
}