Attachment 189260 Details for Bug 222188 – Patch on HEAD

[patch] Patch on HEAD

patch1.txt (text/plain), 35.06 KB, created by Satyam Kandula

on 2011-02-18 05:02:25 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Satyam Kandula

Created: 2011-02-18 05:02:25 EST

Size: 35.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.72
>diff -u -r1.72 Javadoc.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java	11 Feb 2011 14:55:06 -0000	1.72
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java	18 Feb 2011 10:00:06 -0000
>@@ -835,6 +835,35 @@
> 						}
> 					}
> 				}
>+				if (typeReference instanceof JavadocQualifiedTypeReference && !scope.isDefinedInSameUnit(resolvedType)) {
>+					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=222188
>+					// partially qualified references from a different CU should be warned
>+					char[][] typeRefName = ((JavadocQualifiedTypeReference) typeReference).getTypeName();
>+					int skipLength = 0;
>+					if (topLevelScope.getCurrentPackage() == resolvedType.getPackage()
>+							&& typeRefName.length < computedCompoundName.length) {
>+						// https://bugs.eclipse.org/bugs/show_bug.cgi?id=221539: references can be partially qualified
>+						// in same package and hence if the package name is not given, ignore package name check
>+						skipLength = resolvedType.fPackage.compoundName.length;
>+					}
>+					boolean valid = true;
>+					if (typeRefName.length == computedCompoundName.length - skipLength) {
>+						checkQualification: for (int i = 0; i < typeRefName.length; i++) {
>+							if (!CharOperation.equals(typeRefName[i], computedCompoundName[i + skipLength])) {
>+								valid = false;
>+								break checkQualification;
>+							}
>+						}
>+					} else {
>+						valid = false;
>+					}
>+					// report invalid reference
>+					if (!valid) {
>+						if (scopeModifiers == -1) scopeModifiers = scope.getDeclarationModifiers();
>+						scope.problemReporter().javadocInvalidMemberTypeQualification(typeReference.sourceStart, typeReference.sourceEnd, scopeModifiers);
>+						return;
>+					}
>+				}
> 			}
> 			/*
> 			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=286918
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java,v
>retrieving revision 1.74
>diff -u -r1.74 JavadocBugsTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java	12 Feb 2011 23:21:59 -0000	1.74
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java	18 Feb 2011 10:00:08 -0000
>@@ -8653,4 +8653,168 @@
> 				"}\n"
> 		});
> }
>-}
>\ No newline at end of file
>+/**
>+ * @bug 222188: [javadoc] Incorrect usage of inner type not reported
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=222188"
>+ */
>+public void testBug222188a() {
>+	// case 1: partially qualified reference in another package
>+	String[] units = new String[] {
>+		"pack/Test.java",
>+		"package pack;\n" +
>+		"public class Test {\n" +
>+		"        public interface Inner { }\n" +
>+		"}\n"
>+		,
>+		"pack2/X.java",
>+		"package pack2;\n" +
>+		"import pack.Test;\n" +
>+		"public class X {\n" +
>+		"/**\n" +
>+		" * See also {@link Test.Inner} -- error/warning \n" +
>+		" */\n" +
>+		"     public void m() { }\n" +
>+		"}\n"
>+	};
>+	runNegativeTest(units,
>+		// warning - Tag @link: reference not found: Test.Inner
>+		"----------\n" + 
>+		"1. ERROR in pack2\\X.java (at line 5)\n" + 
>+		"	* See also {@link Test.Inner} -- error/warning \n" + 
>+		"	                  ^^^^^^^^^^\n" + 
>+		"Javadoc: Invalid member type qualification\n" + 
>+		"----------\n",
>+		JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
>+	);
>+}
>+public void testBug222188b() {
>+	// case 2: fully but invalid qualified reference in another package
>+	String[] units = new String[] {
>+		"pack/Test.java",
>+		"package pack;\n" +
>+		"public class Test {\n" +
>+		"        public interface Inner { }\n" +
>+		"}\n"
>+		,
>+		"pack2/X.java",
>+		"package pack2;\n" +
>+		"public class X {\n" +
>+		"/**\n" +
>+		" * See also {@link pack.Test.Inners} -- error/warning \n" +
>+		" */\n" +
>+		"     public void m() { }\n" +
>+		"}\n"
>+	};
>+	runNegativeTest(units,
>+		// warning - Tag @link: reference not found: Test.Inner
>+		"----------\n" + 
>+		"1. ERROR in pack2\\X.java (at line 4)\n" + 
>+		"	* See also {@link pack.Test.Inners} -- error/warning \n" + 
>+		"	                  ^^^^^^^^^^^^^^^^\n" + 
>+		"Javadoc: pack.Test.Inners cannot be resolved to a type\n" + 
>+		"----------\n",
>+		JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
>+	);
>+}
>+
>+/**
>+ * @bug 221539: [javadoc] doesn't detect non visible inner class
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=221539"
>+ */
>+public void testBug221539a() {
>+	// partially qualified reference in the same package
>+	String[] units = new String[] {
>+		"p/Test.java",
>+		"package p;\n" +
>+		"/**\n" + 
>+		" * {@link Test.Inner} not ok for Javadoc\n" + 
>+		" * {@link Foo.Inner} ok for Javadoc\n" + 
>+		" */\n" +
>+		"public class Test extends Foo {\n" +
>+		"}\n"
>+		,
>+		"p/Foo.java",
>+		"package p;\n" +
>+		"public class Foo {\n" +
>+		"	static class Inner {}\n" +
>+		"}\n"
>+	};
>+	runNegativeTest(units,
>+		// warning - Tag @link: reference not found: Test.Inner
>+		"----------\n" + 
>+		"1. ERROR in p\\Test.java (at line 3)\n" + 
>+		"	* {@link Test.Inner} not ok for Javadoc\n" + 
>+		"	         ^^^^^^^^^^\n" + 
>+		"Javadoc: Invalid member type qualification\n" + 
>+		"----------\n",
>+		JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
>+	);
>+}
>+public void testBug221539b() {
>+	// partially qualified reference in different package
>+	String[] units = new String[] {
>+		"p1/Test.java",
>+		"package p1;\n" +
>+		"import p2.Foo;\n" + 
>+		"/**\n" + 
>+		" * {@link Test.Inner} not ok for Javadoc\n" + 
>+		" * {@link Foo.Inner} not ok Javadoc\n" + 
>+		" * {@link p2.Foo.Inner} ok for Javadoc as fully qualified\n" + 
>+		" */\n" +
>+		"public class Test extends Foo {\n" +
>+		"}\n"
>+		,
>+		"p2/Foo.java",
>+		"package p2;\n" +
>+		"public class Foo {\n" +
>+		"	public static class Inner {}\n" +
>+		"}\n"
>+	};
>+	runNegativeTest(units,
>+		// warning - Tag @link: reference not found: Test.Inner
>+		// warning - Tag @link: reference not found: Foo.Inner
>+		"----------\n" + 
>+		"1. ERROR in p1\\Test.java (at line 4)\n" + 
>+		"	* {@link Test.Inner} not ok for Javadoc\n" + 
>+		"	         ^^^^^^^^^^\n" + 
>+		"Javadoc: Invalid member type qualification\n" + 
>+		"----------\n" + 
>+		"2. ERROR in p1\\Test.java (at line 5)\n" + 
>+		"	* {@link Foo.Inner} not ok Javadoc\n" + 
>+		"	         ^^^^^^^^^\n" + 
>+		"Javadoc: Invalid member type qualification\n" + 
>+		"----------\n",
>+		JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
>+	);
>+}
>+
>+public void testBug221539c() {
>+	// case 3: partially qualified references are valid within the same CU
>+	this.reportInvalidJavadocVisibility = CompilerOptions.PRIVATE;
>+	runConformTest(
>+		new String[] {
>+			"pack/Test.java",
>+			"package pack;\n" +
>+			"/**\n" + 
>+			" * @see Inner.Level2.Level3\n" + 
>+			" * @see Test.Inner.Level2.Level3\n" + 
>+			" */\n" + 
>+			"public class Test {\n" + 
>+			"	public class Inner {\n" + 
>+			"		/**\n" + 
>+			"		 * @see Level3\n" + 
>+			"		 * @see Level2.Level3\n" + 
>+			"		 * @see Inner.Level2.Level3\n" + 
>+			"		 * @see Test.Inner.Level2.Level3\n" + 
>+			"		 */\n" + 
>+			"		public class Level2 {\n" + 
>+			"			class Level3 {\n" + 
>+			"			}\n" + 
>+			"		}\n" + 
>+			"	}\n" + 
>+			"}\n"
>+		}
>+	);
>+}
>+}
>+
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java,v
>retrieving revision 1.23
>diff -u -r1.23 JavadocTestForClass.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java	4 Jan 2010 19:28:16 -0000	1.23
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java	18 Feb 2011 10:00:08 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -336,10 +336,10 @@
> 					+ "	 *\n"
> 					+ "	 * @see Visibility Valid ref: local class \n"
> 					+ "	 * @see Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 * @see test.Visibility Valid ref: local class \n"
> 					+ "	 * @see test.Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see test.Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see test.AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 */\n"
> 					+ "public class X {\n"
> 					+ "	public void s_foo() {\n"
>@@ -544,8 +544,8 @@
> 				"	/**\n" +
> 				"	 * Valid other package visible class fields references\n" +
> 				"	 *\n" +
>-				"	 * @see VisibilityPublic#vf_public Valid ref to not visible field of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
>+				"	 * @see VisibilityPublic#vf_public Valid ref to visible field of other package class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vf_public Valid ref to visible field of other package public inner class\n" +
> 				"	 */\n" +
> 				"public class X {\n" +
> 				"	public void s_foo() {\n" +
>@@ -567,7 +567,7 @@
> 					+ "	 * @see VisibilityPackage#unknown Invalid ref to non existent field of other package non visible class\n"
> 					+ "	 * @see VisibilityPublic#unknown Invalid ref to non existent field of other package class\n"
> 					+ "	 * @see VisibilityPublic#vf_private Invalid ref to not visible field of other package class\n"
>-					+ "	 * @see VisibilityPublic.VpPrivate#unknown Invalid ref to a non visible other package private inner class (non existent field)\n"
>+					+ "	 * @see VisibilityPublic.VpPrivate#unknown Invalid ref to a non visible other package private inner class (non existent field)\n"	
> 					+ "	 * @see VisibilityPublic.VpPublic#unknown Invalid ref to non existent field of other package public inner class\n"
> 					+ "	 * @see VisibilityPublic.VpPublic#vf_private Invalid ref to not visible field of other package public inner class\n"
> 					+ "	 */\n"
>@@ -972,7 +972,7 @@
> 				"	 * Valid other package visible class methods references \n" +
> 				"	 * \n" +
> 				"	 * @see VisibilityPublic#vm_public() Valid ref to not visible method of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
> 				"	 */\n" +
> 				"public class X {\n" +
> 				"	public void s_foo() {\n" +
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java,v
>retrieving revision 1.22
>diff -u -r1.22 JavadocTestForConstructor.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java	18 Mar 2010 16:22:36 -0000	1.22
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java	18 Feb 2011 10:00:08 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -276,10 +276,10 @@
> 					+ "	 *\n"
> 					+ "	 * @see Visibility Valid ref: local class \n"
> 					+ "	 * @see Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 * @see test.Visibility Valid ref: local class \n"
> 					+ "	 * @see test.Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see test.Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see test.AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 */\n"
> 					+ "	public X() {\n"
> 					+ "	}\n"
>@@ -485,7 +485,7 @@
> 				"	 * Valid other package visible class fields references\n" +
> 				"	 *\n" +
> 				"	 * @see VisibilityPublic#vf_public Valid ref to not visible field of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public X() {\n" +
> 				"	}\n" +
>@@ -507,7 +507,7 @@
> 					+ "	 * @see VisibilityPackage#unknown Invalid ref to non existent field of other package non visible class\n"
> 					+ "	 * @see VisibilityPublic#unknown Invalid ref to non existent field of other package class\n"
> 					+ "	 * @see VisibilityPublic#vf_private Invalid ref to not visible field of other package class\n"
>-					+ "	 * @see VisibilityPublic.VpPrivate#unknown Invalid ref to a non visible other package private inner class (non existent field)\n"
>+					+ "	 * @see VisibilityPublic.VpPrivate#unknown Invalid ref to a non visible other package private inner class (non existent field)\n"	
> 					+ "	 * @see VisibilityPublic.VpPublic#unknown Invalid ref to non existent field of other package public inner class\n"
> 					+ "	 * @see VisibilityPublic.VpPublic#vf_private Invalid ref to not visible field of other package public inner class\n"
> 					+ "	 */\n"
>@@ -926,7 +926,7 @@
> 				"	 * Valid other package visible class methods references \n" +
> 				"	 * \n" +
> 				"	 * @see VisibilityPublic#vm_public() Valid ref to not visible method of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public X() {\n" +
> 				"	}\n" +
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java,v
>retrieving revision 1.19
>diff -u -r1.19 JavadocTestForField.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java	27 Jun 2008 16:04:45 -0000	1.19
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java	18 Feb 2011 10:00:08 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -360,10 +360,10 @@
> 					+ "	 *\n"
> 					+ "	 * @see Visibility Valid ref: local class \n"
> 					+ "	 * @see Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see AbstractVisibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
> 					+ "	 * @see test.Visibility Valid ref: local class \n"
> 					+ "	 * @see test.Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see test.Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see test.AbstractVisibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
> 					+ "	 */\n"
> 					+ "	public int x;\n"
> 					+ "}\n" });
>@@ -562,7 +562,7 @@
> 				"	 * Invalid other package non visible class fields references\n" +
> 				"	 *\n" +
> 				"	 * @see VisibilityPublic#vf_public Valid ref to not visible field of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public int x;\n" +
> 				"}\n"
>@@ -1000,7 +1000,7 @@
> 				"	 * Valid other package visible class methods references \n" +
> 				"	 * \n" +
> 				"	 * @see VisibilityPublic#vm_public() Valid ref to not visible method of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public int x;\n" +
> 				"}\n"
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java,v
>retrieving revision 1.25
>diff -u -r1.25 JavadocTestForInterface.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java	18 Mar 2010 16:22:36 -0000	1.25
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java	18 Feb 2011 10:00:08 -0000
>@@ -314,10 +314,10 @@
> 					+ "	 *\n"
> 					+ "	 * @see Visibility Valid ref: local class \n"
> 					+ "	 * @see Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 * @see test.Visibility Valid ref: local class \n"
> 					+ "	 * @see test.Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see test.Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see test.AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 */\n"
> 					+ "public interface IX {\n"
> 					+ "	public void foo();\n"
>@@ -514,7 +514,7 @@
> 				"	 * Valid other package visible class fields references\n" +
> 				"	 *\n" +
> 				"	 * @see VisibilityPublic#vf_public Valid ref to not visible field of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
> 				"	 */\n" +
> 				"public interface IX {\n" +
> 				"	public void foo();\n" +
>@@ -535,7 +535,7 @@
> 					+ "	 * @see VisibilityPackage#unknown Invalid ref to non existent field of other package non visible class\n"
> 					+ "	 * @see VisibilityPublic#unknown Invalid ref to non existent field of other package class\n"
> 					+ "	 * @see VisibilityPublic#vf_private Invalid ref to not visible field of other package class\n"
>-					+ "	 * @see VisibilityPublic.VpPrivate#unknown Invalid ref to a non visible other package private inner class (non existent field)\n"
>+					+ "	 * @see VisibilityPublic.VpPrivate#unknown Invalid ref to a non visible other package private inner class (non existent field)\n"	
> 					+ "	 * @see VisibilityPublic.VpPublic#unknown Invalid ref to non existent field of other package public inner class\n"
> 					+ "	 * @see VisibilityPublic.VpPublic#vf_private Invalid ref to not visible field of other package public inner class\n"
> 					+ "	 */\n"
>@@ -932,7 +932,7 @@
> 				"	 * Valid other package visible class methods references \n" +
> 				"	 * \n" +
> 				"	 * @see VisibilityPublic#vm_public() Valid ref to not visible method of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
> 				"	 */\n" +
> 				"public interface IX {\n" +
> 				"	public void foo();\n" +
>@@ -1600,10 +1600,10 @@
> 					+ "	 *\n"
> 					+ "	 * @see Visibility Valid ref: local class \n"
> 					+ "	 * @see Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 * @see test.Visibility Valid ref: local class \n"
> 					+ "	 * @see test.Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see test.Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see test.AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 */\n"
> 					+ "	public void foo();\n"
> 					+ "}\n" });
>@@ -1800,7 +1800,7 @@
> 				"	 * Invalid other package non visible class fields references\n" +
> 				"	 *\n" +
> 				"	 * @see VisibilityPublic#vf_public Valid ref to not visible field of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public void foo();\n" +
> 				"}\n"
>@@ -2221,7 +2221,7 @@
> 				"	 * Valid other package visible class methods references \n" +
> 				"	 * \n" +
> 				"	 * @see VisibilityPublic#vm_public() Valid ref to not visible method of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public void foo();\n" +
> 				"}\n"
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java,v
>retrieving revision 1.29
>diff -u -r1.29 JavadocTestForMethod.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java	18 Mar 2010 16:22:35 -0000	1.29
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java	18 Feb 2011 10:00:08 -0000
>@@ -2006,10 +2006,10 @@
> 					+ "	 *\n"
> 					+ "	 * @see Visibility Valid ref: local class \n"
> 					+ "	 * @see Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 * @see test.Visibility Valid ref: local class \n"
> 					+ "	 * @see test.Visibility.VcPublic Valid ref: visible inner class of local class \n"
>-					+ "	 * @see test.Visibility.AvcPublic Valid ref: visible inherited inner class of local class \n"
>+					+ "	 * @see test.AbstractVisibility.AvcPublic Valid ref: visible inner class of local class \n"
> 					+ "	 */\n"
> 					+ "	public void s_foo() {\n"
> 					+ "	}\n"
>@@ -2073,7 +2073,7 @@
> 				"	 * Valid external classes references \n" +
> 				"	 *\n" +
> 				"	 * @see VisibilityPublic Valid ref: visible class through import => no warning on import\n" +
>-				"	 * @see VisibilityPublic.VpPublic Valid ref: visible inner class in visible class \n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic Valid ref: visible inner class in visible class \n" +
> 				"	 */\n" +
> 				"	public void s_foo() {\n" +
> 				"	}\n" +
>@@ -2270,7 +2270,7 @@
> 					+ "	 * Valid super class field references in the same package\n"
> 					+ "	 *\n"
> 					+ "	 * @see Visibility#avf_public Valid ref: visible inherited field\n"
>-					+ "	 * @see Visibility.AvcPublic#avf_public Valid ref: visible field of inherited visible inner class\n"
>+					+ "	 * @see AbstractVisibility.AvcPublic#avf_public Valid ref: visible field of visible inner class\n"
> 					+ "	 */\n"
> 					+ "	public void s_foo() {\n"
> 					+ "	}\n"
>@@ -2538,8 +2538,8 @@
> 				"	/**\n" +
> 				"	 * Invalid other package non visible class fields references\n" +
> 				"	 *\n" +
>-				"	 * @see VisibilityPublic#vf_public Valid ref to not visible field of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vf_public Valid ref to not visible field of other package public inner class\n" +
>+				"	 * @see VisibilityPublic#vf_public Valid ref to visible field of other package class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vf_public Fully Qualified valid ref to visible field of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public void s_foo() {\n" +
> 				"	}\n" +
>@@ -4024,9 +4024,9 @@
> 					+ "	 * Valid package super class methods references\n"
> 					+ "	 * \n"
> 					+ "	 * @see Visibility#avm_public() Valid ref: visible inherited method\n"
>-					+ "	 * @see Visibility.AvcPublic#avm_public() Valid ref: visible inherited method in visible inner class\n"
>+					+ "	 * @see AbstractVisibility.AvcPublic#avm_public() Valid ref: visible method in visible inner class\n"
> 					+ "	 * @see test.Visibility#avm_public() Valid ref: visible inherited method\n"
>-					+ "	 * @see test.Visibility.AvcPublic#avm_public() Valid ref: visible inherited method in visible inner class\n"
>+					+ "	 * @see test.AbstractVisibility.AvcPublic#avm_public() Valid ref: visible method in visible inner class\n"
> 					+ "	 */  \n"
> 					+ "	public void s_foo() {\n"
> 					+ "	}\n"
>@@ -4518,7 +4518,7 @@
> 				"	 * Valid other package visible class methods references \n" +
> 				"	 * \n" +
> 				"	 * @see VisibilityPublic#vm_public() Valid ref to not visible method of other package class\n" +
>-				"	 * @see VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
>+				"	 * @see test.copy.VisibilityPublic.VpPublic#vm_public() Valid ref to visible method of other package public inner class\n" +
> 				"	 */\n" +
> 				"	public void s_foo() {\n" +
> 				"	}\n" +
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java,v
>retrieving revision 1.39
>diff -u -r1.39 JavadocTest_1_3.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java	19 Nov 2010 14:21:59 -0000	1.39
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java	18 Feb 2011 10:00:09 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -2441,6 +2441,12 @@
> 			"	* See also {@link Inner}\n" +
> 			"	                  ^^^^^\n" +
> 			"Javadoc: Invalid member type qualification\n" +
>+			"----------\n" + 
>+			"----------\n" +
>+			"1. ERROR in comment6a\\test\\Invalid2.java (at line 4)\n" + 
>+			"	* @see Test.Inner\n" + 
>+			"	       ^^^^^^^^^^\n" + 
>+			"Javadoc: Invalid member type qualification\n" +
> 			"----------\n"
> 		);
> 	}
>@@ -2762,6 +2768,12 @@
> 			"	* See also {@link Inner}\n" +
> 			"	                  ^^^^^\n" +
> 			"Javadoc: Invalid member type qualification\n" +
>+			"----------\n" + 
>+			"----------\n" +
>+			"1. ERROR in comment6a\\test\\Invalid2.java (at line 4)\n" + 
>+			"	* @see Test.Inner\n" + 
>+			"	       ^^^^^^^^^^\n" + 
>+			"Javadoc: Invalid member type qualification\n" + 
> 			"----------\n"
> 		);
> 	}
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java,v
>retrieving revision 1.42
>diff -u -r1.42 JavadocTest_1_4.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java	19 Nov 2010 14:21:58 -0000	1.42
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java	18 Feb 2011 10:00:09 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -2661,7 +2661,13 @@
> 			"	* See also {@link Inner}\n" +
> 			"	                  ^^^^^\n" +
> 			"Javadoc: Invalid member type qualification\n" +
>-			"----------\n"
>+			"----------\n" +
>+			"----------\n" + 
>+			"1. ERROR in comment6a\\test\\Invalid2.java (at line 4)\n" + 
>+			"	* @see Test.Inner\n" + 
>+			"	       ^^^^^^^^^^\n" + 
>+			"Javadoc: Invalid member type qualification\n" + 
>+			"----------\n"	
> 		);
> 	}
> 	public void testBug96237_Public04() {
>@@ -2982,6 +2988,12 @@
> 			"	* See also {@link Inner}\n" +
> 			"	                  ^^^^^\n" +
> 			"Javadoc: Invalid member type qualification\n" +
>+			"----------\n" + 
>+			"----------\n" +
>+			"1. ERROR in comment6a\\test\\Invalid2.java (at line 4)\n" + 
>+			"	* @see Test.Inner\n" + 
>+			"	       ^^^^^^^^^^\n" + 
>+			"Javadoc: Invalid member type qualification\n" + 
> 			"----------\n"
> 		);
> 	}
>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.50
>diff -u -r1.50 JavadocTest_1_5.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java	6 Dec 2010 18:40:28 -0000	1.50
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java	18 Feb 2011 10:00:09 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -2014,6 +2014,12 @@
> 			"	* See also {@link Inner}\n" +
> 			"	                  ^^^^^\n" +
> 			"Javadoc: Invalid member type qualification\n" +
>+			"----------\n" + 
>+			"----------\n" +
>+			"1. ERROR in comment6a\\test\\Invalid2.java (at line 4)\n" + 
>+			"	* @see Test.Inner\n" + 
>+			"	       ^^^^^^^^^^\n" + 
>+			"Javadoc: Invalid member type qualification\n" + 
> 			"----------\n",
> 			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
> 		);
>@@ -2322,6 +2328,12 @@
> 			"	* See also {@link Inner}\n" +
> 			"	                  ^^^^^\n" +
> 			"Javadoc: Invalid member type qualification\n" +
>+			"----------\n" + 
>+			"----------\n" +
>+			"1. ERROR in comment6a\\test\\Invalid2.java (at line 4)\n" + 
>+			"	* @see Test.Inner\n" + 
>+			"	       ^^^^^^^^^^\n" + 
>+			"Javadoc: Invalid member type qualification\n" + 
> 			"----------\n",
> 			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
> 		);
>@@ -3399,7 +3411,7 @@
> 				"					/**\n" +
> 									// qualified single type reference
> 				"			 		 * @see A3.A4#foo(V)\n" +
>-				"			 		 * @see A3.A4#foo(Object)\n" +
>+				"			 		 * @see p1.A.A1.A2.A3.A4#foo(Object)\n" +
> 				"					 */\n" +
> 				"					public void foo(V v) {}\n" +
> 				"				}\n" +
>@@ -3445,8 +3457,8 @@
> 				"				public class X4<V> extends A4<V> {\n" +
> 				"					/**\n" +
> 									// fully qualified type reference
>-				"			 		 * @see A.A1.A2.A3.A4#foo(V)\n" +
>-				"			 		 * @see A.A1.A2.A3.A4#foo(Object)\n" +
>+				"			 		 * @see p1.A.A1.A2.A3.A4#foo(V)\n" +
>+				"			 		 * @see p1.A.A1.A2.A3.A4#foo(Object)\n" +
> 				"					 */\n" +
> 				"					public void foo(V v) {}\n" +
> 				"				}\n" +
>@@ -3457,8 +3469,8 @@
> 			},
> 			"----------\n" +
> 			"1. ERROR in p2\\X.java (at line 9)\n" +
>-			"	* @see A.A1.A2.A3.A4#foo(V)\n" +
>-			"	                     ^^^\n" +
>+			"	* @see p1.A.A1.A2.A3.A4#foo(V)\n" +
>+			"	                        ^^^\n" +
> 			"Javadoc: The method foo(Object) in the type A.A1.A2.A3.A4 is not applicable for the arguments (V)\n" +
> 			"----------\n",
> 			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError
>@@ -3754,9 +3766,7 @@
> 				"				public class X4 extends A4 {\n" +
> 				"					/**\n" +
> 									// qualified single type reference
>-				"			 		 * @see A3.A4#foo(Object)\n" +
>-				"			 		 * @see A2.A3.A4#foo(Object)\n" +
>-				"			 		 * @see A1.A2.A3.A4#foo(Object)\n" +
>+				"			 		 * @see p1.A.A1.A2.A3.A4#foo(Object)\n" +
> 				"					 */\n" +
> 				"					public void foo(S s) {}\n" +
> 				"				}\n" +
>@@ -3803,8 +3813,7 @@
> 				"						public class X6 extends A6 {\n" +
> 				"							/**\n" +
> 											// qualified single type reference
>-				"			 				 * @see A5.A6#foo(Object)\n" +
>-				"			 				 * @see A4.A5.A6#foo(Object)\n" +
>+				"			 				 * @see p1.A.A1.A2.A3.A4.A5.A6#foo(Object)\n" +
> 				"							 */\n" +
> 				"							public void foo(S s) {}\n" +
> 				"						}\n" +
>@@ -3846,8 +3855,8 @@
> 				"				public class X4 extends A4 {\n" +
> 				"					/**\n" +
> 									// fully qualified type reference
>-				"			 		 * @see A.A1.A2.A3.A4#foo(Object)\n" +
>-				"			 		 * @see A.A1.A2.A3.A4#foo(R)\n" +
>+				"			 		 * @see p1.A.A1.A2.A3.A4#foo(Object)\n" +
>+				"			 		 * @see p1.A.A1.A2.A3.A4#foo(R)\n" +
> 				"					 */\n" +
> 				"					public void foo(R r) {}\n" +
> 				"				}\n" +
>@@ -3858,8 +3867,8 @@
> 			},
> 			"----------\n" +
> 			"1. ERROR in p2\\X.java (at line 10)\r\n" +
>-			"	* @see A.A1.A2.A3.A4#foo(R)\r\n" +
>-			"	                     ^^^\n" +
>+			"	* @see p1.A.A1.A2.A3.A4#foo(R)\r\n" +
>+			"	                        ^^^\n" +
> 			"Javadoc: The method foo(Object) in the type A.A1.A2.A3.A4 is not applicable for the arguments (R)\n" +
> 			"----------\n",
> 			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError

Flags:

satyam.kandula: review?

Actions: View | Diff

Attachments on bug 222188: 100910 | 101236 | 189260