### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.compiler Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java,v retrieving revision 1.25 diff -u -r1.25 JavadocTest_1_5.java --- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java 29 Mar 2006 03:50:23 -0000 1.25 +++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java 15 May 2006 17:04:36 -0000 @@ -21,6 +21,7 @@ String docCommentSupport = CompilerOptions.ENABLED; String reportInvalidJavadoc = CompilerOptions.ERROR; String reportMissingJavadocTags = CompilerOptions.ERROR; + String reportMissingJavadocTagsOverriding = CompilerOptions.ENABLED; String reportMissingJavadocComments = null; String reportMissingJavadocCommentsVisibility = null; @@ -54,10 +55,14 @@ options.put(CompilerOptions.OPTION_ReportMissingJavadocComments, reportInvalidJavadoc); if (reportMissingJavadocCommentsVisibility != null) options.put(CompilerOptions.OPTION_ReportMissingJavadocCommentsVisibility, reportMissingJavadocCommentsVisibility); - if (reportMissingJavadocTags != null) + if (reportMissingJavadocTags != null) { options.put(CompilerOptions.OPTION_ReportMissingJavadocTags, reportMissingJavadocTags); - else + if (this.reportMissingJavadocTagsOverriding != null) { + options.put(CompilerOptions.OPTION_ReportMissingJavadocTagsOverriding, reportMissingJavadocTagsOverriding); + } + } else { options.put(CompilerOptions.OPTION_ReportMissingJavadocTags, reportInvalidJavadoc); + } options.put(CompilerOptions.OPTION_ReportFieldHiding, CompilerOptions.IGNORE); options.put(CompilerOptions.OPTION_ReportSyntheticAccessEmulation, CompilerOptions.IGNORE); options.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR); @@ -72,6 +77,7 @@ this.docCommentSupport = CompilerOptions.ENABLED; reportInvalidJavadoc = CompilerOptions.ERROR; reportMissingJavadocTags = CompilerOptions.ERROR; + reportMissingJavadocTagsOverriding = CompilerOptions.ENABLED; reportMissingJavadocComments = CompilerOptions.IGNORE; } @@ -2164,4 +2170,38 @@ } ); } + + /** + * Bug 132430: [1.5][javadoc] Unwanted missing tag warning for overridden method with parameter containing type variable + * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=132430" + */ + public void testBug132430() { + runConformTest( + new String[] { + "A.java", + "public class A {\n" + + "\n" + + " /**\n" + + " * @param object\n" + + " */\n" + + " public void aMethod(E object) {\n" + + " }\n" + + "}\n" + + "\n", + "B.java", + "public class B extends A {\n" + + "\n" + + " /**\n" + + " * @see A#aMethod(java.lang.Object)\n" + + " */\n" + + " @Override\n" + + " public void aMethod(E object) {\n" + + " // TODO Auto-generated method stub\n" + + " super.aMethod(object);\n" + + " }\n" + + "\n" + + "}\n" + } + ); + } } #P org.eclipse.jdt.core Index: compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java,v retrieving revision 1.40 diff -u -r1.40 Javadoc.java --- compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java 28 Mar 2006 20:29:56 -0000 1.40 +++ compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java 15 May 2006 17:04:38 -0000 @@ -174,6 +174,14 @@ } } + // Look at @Override annotations + if (!superRef && methDecl != null && methDecl.annotations != null) { + int length = methDecl.annotations.length; + for (int i=0; i