update to v_B39
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
index cdb5eae..7f34794 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
@@ -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"
+		}
+	);
+}
+}
+
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
index 714bb1e..e91a4fd 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
@@ -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" +
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java
index 3a429a0..cdca4f6 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForConstructor.java
@@ -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" +
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java
index c875e16..9de0ae3 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForField.java
@@ -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"
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java
index 96e9f2e..466f442 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForInterface.java
@@ -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
@@ -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"
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java
index f49b4f6..fca0b05 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForMethod.java
@@ -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
@@ -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" +
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java
index 03b4358..cc198cf 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_3.java
@@ -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
@@ -2495,6 +2495,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"
 		);
 	}
@@ -2816,6 +2822,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"
 		);
 	}
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java
index 3778fdd..c932961 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_4.java
@@ -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
@@ -2714,7 +2714,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() {
@@ -3035,6 +3041,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"
 		);
 	}
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java
index b8e064c..62a977c 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java
@@ -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
@@ -2025,6 +2025,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
 		);
@@ -2333,6 +2339,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
 		);
@@ -3410,7 +3422,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" +
@@ -3456,8 +3468,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" +
@@ -3468,8 +3480,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
@@ -3765,9 +3777,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" +
@@ -3814,8 +3824,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" +
@@ -3857,8 +3866,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" +
@@ -3869,8 +3878,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
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
index ac08b5b..a7b700b 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullReferenceTest.java
@@ -8,7 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Stephan Herrmann <stephan@cs.tu-berlin.de> - Contributions for
- *     			bugs 325755, 133125, 292478, 319201, 320170 and 332637
+ *     						bug 325755 - [compiler] wrong initialization state after conditional expression
+ *     						bug 133125 - [compiler][null] need to report the null status of expressions and analyze them simultaneously
+ *     						bug 292478 - Report potentially null across variable assignment
+ *     						bug 319201 - [null] no warning when unboxing SingleNameReference causes NPE
+ *     						bug 320170 - [compiler] [null] Whitebox issues in null analysis
+ *     						bug 332637 - Dead Code detection removing code that isn't dead
+ *     						bug 338303 - Warning about Redundant assignment conflicts with definite assignment
  *******************************************************************************/
 package org.eclipse.jdt.core.tests.compiler.regression;
 
@@ -14025,4 +14031,33 @@
 		},
 		"");
 }
+// https://bugs.eclipse.org/338303 - Warning about Redundant assignment conflicts with definite assignment
+public void testBug338303() {
+	this.runConformTest(
+		new String[] {
+			"Bug338303.java",
+			"import java.io.File;\n" + 
+			"import java.io.IOException;\n" + 
+			"\n" + 
+			"public class Bug338303 {\n" + 
+			"   Object test(Object in, final File f) {\n" + 
+			"        Object local;\n" + 
+			"        try {\n" + 
+			"            local = in;\n" + 
+			"            if (local == null)\n" + 
+			"                local = loadEntry(f, false);\n" + 
+			"        } catch (final IOException e) {\n" + 
+			"            e.printStackTrace();\n" + 
+			"            local = null;\n" + 
+			"        }\n" + 
+			"        return local;\n" + 
+			"    }\n" + 
+			"\n" + 
+			"    private Object loadEntry(File f, boolean b)  throws IOException {\n" + 
+			"        throw new IOException();\n" + 
+			"    }\n" + 
+			"}\n"
+		},
+		"");
+}
 }
\ No newline at end of file