### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java,v retrieving revision 1.11 diff -u -r1.11 JavadocTextCompletionModelTest.java --- src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java 6 Mar 2007 04:43:19 -0000 1.11 +++ src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java 3 Mar 2008 09:53:46 -0000 @@ -1236,5 +1236,29 @@ "}\n"; completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTestTextIns(int, float, Class)"); assertSortedResults(""); - } } + +public void testONLY_086() throws JavaModelException { + String source = + "package javadoc.text;\n" + + "public abstract class BasicTest extends BasicTestSecondaryClass implements BasicTestSecondaryInterface{\n" + + " /**\n" + + " * Completion after:\n" + + " * #meth\n" + + " */\n" + + " BasicTest() {}\n" + + "}\n" + + "class BasicTestSecondaryClass\n" + + " void method1() {}\n" + + "}\n" + + "interface BasicTestSecondaryInterface\n" + + " void method2() {}\n" + + "}\n"; + completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#meth"); + assertSortedResults( + "method1[JAVADOC_METHOD_REF]{{@link #method1()}, Ljavadoc.text.BasicTestSecondaryClass;, ()V, method1, null, "+this.positions+R_DRICNRNSIT+"}\n" + + "method2[JAVADOC_METHOD_REF]{{@link #method2()}, Ljavadoc.text.BasicTestSecondaryInterface;, ()V, method2, null, "+this.positions+R_DRICNRNSIT+"}" + ); +} +} + #P org.eclipse.jdt.core Index: codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java,v retrieving revision 1.352 diff -u -r1.352 CompletionEngine.java --- codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java 25 Feb 2008 16:09:46 -0000 1.352 +++ codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java 3 Mar 2008 09:53:51 -0000 @@ -7100,8 +7100,7 @@ } } - if (notInJavadoc && - hasPotentialDefaultAbstractMethods && + if (hasPotentialDefaultAbstractMethods && (currentType.isAbstract() || currentType.isTypeVariable() || currentType.isIntersectionType() ||