Index: src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java
===================================================================
RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java,v
retrieving revision 1.12
diff -u -r1.12 JavaSearchJavadocTests.java
--- src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java	25 May 2004 10:38:33 -0000	1.12
+++ src/org/eclipse/jdt/core/tests/model/JavaSearchJavadocTests.java	26 May 2004 16:45:29 -0000
@@ -151,8 +151,8 @@
 		suite.addTest(new JavaSearchJavadocTests("testBug49994field", support));
 		suite.addTest(new JavaSearchJavadocTests("testBug49994method", support));
 		suite.addTest(new JavaSearchJavadocTests("testBug49994constructor", support));
-		suite.addTest(new JavaSearchJavadocTests("testBug54962"));
-		suite.addTest(new JavaSearchJavadocTests("testBug54962qualified"));
+		suite.addTest(new JavaSearchJavadocTests("testBug54962", support));
+		suite.addTest(new JavaSearchJavadocTests("testBug54962qualified", support));
 	}
 
 	/* (non-Javadoc)
@@ -166,7 +166,7 @@
 			StringBuffer buffer = new StringBuffer(expected.length());
 			while (tokenizer.hasMoreTokens()) {
 				String token = tokenizer.nextToken();
-				if (token.startsWith("src/j1/JavadocSearched.java") || token.startsWith("test47909.jar")) {
+				if (token.startsWith("src/j1/JavadocSearched.java") || token.startsWith("test47909.jar") || token.indexOf("OUTSIDE_JAVADOC") > 0) {
 					if (buffer.length() > 0) buffer.append('\n');
 					buffer.append(token);
 				}
@@ -1047,24 +1047,27 @@
 		setJavadocOptions();
 		JavaSearchResultCollector result = new JavaSearchResultCollector();
 		result.showAccuracy = true;
+		result.showInsideDoc = true;
 		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j6", "Bug54962.java").getPackageDeclaration("j6");
 		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
 		assertSearchResults(
-			"src/j6/Bug54962.java [j6] EXACT_MATCH\n" + 
-				"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH\n" + 
-				"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH",
+			"src/j6/Bug54962.java [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
+				"src/j6/Bug54962.java j6.Bug54962 [j6] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
+				"src/j6/Bug54962.java j6.Bug54962 [j6] EXACT_MATCH INSIDE_JAVADOC\n" + 
+				"src/j7/qua/li/fied/Bug54962a.java [j6] EXACT_MATCH OUTSIDE_JAVADOC",
 			result);
 	}
 	public void testBug54962qualified() throws CoreException {
 		setJavadocOptions();
 		JavaSearchResultCollector result = new JavaSearchResultCollector();
 		result.showAccuracy = true;
-		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962.java").getPackageDeclaration("j7.qua.li.fied");
+		result.showInsideDoc = true;
+		IPackageDeclaration packDecl = getCompilationUnit("JavaSearch", "src", "j7.qua.li.fied", "Bug54962a.java").getPackageDeclaration("j7.qua.li.fied");
 		search(packDecl, REFERENCES, getJavaSearchScope(),  result);
 		assertSearchResults(
-			"src/j7/qua/li/fied/Bug54962.java [j7.qua.li.fied] EXACT_MATCH\n" + 
-				"src/j7/qua/li/fied/Bug54962.java j7.qua.li.fied.Bug54962 [j7.qua.li.fied] POTENTIAL_MATCH\n" + 
-				"src/j7/qua/li/fied/Bug54962.java j7.qua.li.fied.Bug54962 [j7.qua.li.fied] EXACT_MATCH",
+			"src/j7/qua/li/fied/Bug54962a.java [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC\n" + 
+				"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] POTENTIAL_MATCH INSIDE_JAVADOC\n" + 
+				"src/j7/qua/li/fied/Bug54962a.java j7.qua.li.fied.Bug54962a [j7.qua.li.fied] EXACT_MATCH INSIDE_JAVADOC",
 			result);
 	}
 }
Index: workspace/JavaSearch/src/j7/qua/li/fied/Bug54962.java
===================================================================
RCS file: workspace/JavaSearch/src/j7/qua/li/fied/Bug54962.java
diff -N workspace/JavaSearch/src/j7/qua/li/fied/Bug54962.java
--- workspace/JavaSearch/src/j7/qua/li/fied/Bug54962.java	16 May 2004 20:49:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-package j7.qua.li.fied;
-/**
- * @see j7.qua.li.fied
- * @see j7.qua.li.fied.BUG54962
- * @see j7.qua.li.fied.Bug54962
- */
-public class Bug54962 {
-}
Index: workspace/JavaSearch/src/j7/qua/li/fied/Bug54962a.java
===================================================================
RCS file: workspace/JavaSearch/src/j7/qua/li/fied/Bug54962a.java
diff -N workspace/JavaSearch/src/j7/qua/li/fied/Bug54962a.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/JavaSearch/src/j7/qua/li/fied/Bug54962a.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,10 @@
+package j7.qua.li.fied;
+import j6.Bug54962;
+/**
+ * @see j7.qua.li.fied
+ * @see j7.qua.li.fied.BUG54962a
+ * @see j7.qua.li.fied.Bug54962a
+ */
+public class Bug54962a {
+	Bug54962 j6 = new Bug54962();
+}