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

disable copy impls when interface extends; disable implement methods when methods with access problems exist (IDEA-93017)

Browse Source 
(cherry picked from commit 3d50c0c08eaee71d14604ca9dfb0fcb2218c9b5c)
This commit is contained in:
anna
2012-11-22 15:04:53 +01:00
parent 1ecf71f23e
commit 6d2b2ced11
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java
View File

@@ -120,6 +120,7 @@ public class ImplementAbstractMethodAction extends BaseIntentionAction {
public boolean execute(@NotNull PsiElement element) {
if (element instanceof PsiClass) {
PsiClass aClass = (PsiClass) element;
if (aClass.isInterface()) return true;
final PsiMethod existingImplementation = findExistingImplementation(aClass, myMethod);
if (existingImplementation != null && !existingImplementation.hasModifierProperty(PsiModifier.ABSTRACT)) {
myHasExistingImplementations = true;
@@ -141,7 +142,7 @@ public class ImplementAbstractMethodAction extends BaseIntentionAction {
static PsiMethod findExistingImplementation(final PsiClass aClass, PsiMethod method) {
final PsiMethod[] methods = aClass.findMethodsByName(method.getName(), false);
for(PsiMethod candidate: methods) {
final PsiMethod[] superMethods = candidate.findSuperMethods(aClass);
final PsiMethod[] superMethods = candidate.findSuperMethods(false);
for(PsiMethod superMethod: superMethods) {
if (superMethod.equals(method)) {
return candidate;

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/copyAbstractMethodImplementation/beforeInterfaceExtends.java Normal file
View File

@@ -0,0 +1,11 @@
// "Use existing implementation of 'foo'" "false"
interface I {
void <caret>foo();
}
class IImpl implements I {
@Override
public void foo() {}
}
interface II extends I {}
class IImpl2 extends IImpl implements II {}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod/beforeExistButPrivate.java Normal file
View File

@@ -0,0 +1,8 @@
// "Implement method 'foo'" "false"
abstract class Test {
public abstract void f<caret>oo();
}
class TImple extends Test {
private void foo(){}
}