### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests.model
Index: src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java,v
retrieving revision 1.170
diff -u -r1.170 JavaSearchBugsTests.java
--- src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java	4 Mar 2009 17:25:46 -0000	1.170
+++ src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java	6 Mar 2009 10:57:05 -0000
@@ -67,16 +67,24 @@
 	}
 }
 class ReferenceCollector extends JavaSearchResultCollector {
-	protected IJavaElement getElement(SearchMatch searchMatch) {
-		IJavaElement element = super.getElement(searchMatch);
-		IJavaElement localElement = null;
+	protected void writeLine() throws CoreException {
+		super.writeLine();
 		ReferenceMatch refMatch = (ReferenceMatch) this.match;
-		localElement = refMatch.getLocalElement();
+		IJavaElement localElement = refMatch.getLocalElement();
 		if (localElement != null) {
-			return localElement;
+			this.line.append("+[");
+			if (localElement.getElementType() == IJavaElement.ANNOTATION) {
+				this.line.append('@');
+				this.line.append(localElement.getElementName());
+				this.line.append(" on ");
+				this.line.append(localElement.getParent().getElementName());
+			} else {
+				this.line.append(localElement.getElementName());
+			}
+			this.line.append(']');
 		}
-		return element;
 	}
+
 }
 class TypeReferenceCollector extends ReferenceCollector {
 	protected void writeLine() throws CoreException {
@@ -89,7 +97,14 @@
 			for (int i=0; i<length; i++) {
 				IJavaElement other = others[i];
 				if (i>0) this.line.append(',');
-				this.line.append(other.getElementName());
+				if (other.getElementType() == IJavaElement.ANNOTATION) {
+					this.line.append('@');
+					this.line.append(other.getElementName());
+					this.line.append(" on ");
+					this.line.append(other.getParent().getElementName());
+				} else {
+					this.line.append(other.getElementName());
+				}
 			}
 			this.line.append(']');
 		}
@@ -5908,12 +5923,12 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/b110336/Test.java void b110336.Test.method(Class<Test>).TP [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method(Class<Test>).clazz [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method(Class<Test>).localVar1 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method(Class<Test>).localVar1 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method(Class<Test>).localVar2 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method(Class<Test>).localVar2 [Test]",
+		"src/b110336/Test.java void b110336.Test.method(Class<Test>) [Test]+[TP]\n" + 
+		"src/b110336/Test.java void b110336.Test.method(Class<Test>) [Test]+[clazz]\n" + 
+		"src/b110336/Test.java void b110336.Test.method(Class<Test>) [Test]+[localVar1]\n" + 
+		"src/b110336/Test.java void b110336.Test.method(Class<Test>) [Test]+[localVar1]\n" + 
+		"src/b110336/Test.java void b110336.Test.method(Class<Test>) [Test]+[localVar2]\n" + 
+		"src/b110336/Test.java void b110336.Test.method(Class<Test>) [Test]+[localVar2]",
 		collector
 	);
 }
@@ -5936,13 +5951,13 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/b110336/Test.java void b110336.Test.method1(Test):<anonymous>#1 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method1(Test):<anonymous>#1.c [Test]\n" +
-		"src/b110336/Test.java void void b110336.Test.method1(Test):<anonymous>#1.foo().TP [Test]\n" +
-		"src/b110336/Test.java void void b110336.Test.method1(Test):<anonymous>#1.foo().o [Test]\n" +
-		"src/b110336/Test.java void void b110336.Test.method1(Test):<anonymous>#1.foo().o [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method1(Test).methodParam [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.method1(Test).localVar1 [Test]",
+		"src/b110336/Test.java void b110336.Test.method1(Test):<anonymous>#1 [Test]\n" + 
+		"src/b110336/Test.java void b110336.Test.method1(Test):<anonymous>#1.c [Test]\n" + 
+		"src/b110336/Test.java void void b110336.Test.method1(Test):<anonymous>#1.foo() [Test]+[TP]\n" + 
+		"src/b110336/Test.java void void b110336.Test.method1(Test):<anonymous>#1.foo() [Test]+[o]\n" + 
+		"src/b110336/Test.java void void b110336.Test.method1(Test):<anonymous>#1.foo() [Test]+[o]\n" + 
+		"src/b110336/Test.java void b110336.Test.method1(Test) [Test]+[methodParam]\n" + 
+		"src/b110336/Test.java void b110336.Test.method1(Test) [Test]+[localVar1]",
 		collector
 	);
 }
@@ -5960,7 +5975,7 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/b110336/Test.java b110336.Test.TP [X]\n" +
+		"src/b110336/Test.java b110336.Test [X]+[TP]\n" + 
 		"src/b110336/Test.java b110336.Test.x [X]",
 		collector
 	);
@@ -6004,12 +6019,12 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/b110336/Test.java void b110336.Test.foo().lv1 [Test]+[lv2,lv3]\n" +
-		"src/b110336/Test.java void b110336.Test.foo().lv2 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.foo().lv4 [Test]+[lv5,lv6]\n" +
-		"src/b110336/Test.java void b110336.Test.foo().lv4 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.foo().lv7 [Test]+[lv8,lv9]\n" +
-		"src/b110336/Test.java void b110336.Test.foo().lv9 [Test]",
+		"src/b110336/Test.java void b110336.Test.foo() [Test]+[lv1]+[lv2,lv3]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo() [Test]+[lv2]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo() [Test]+[lv4]+[lv5,lv6]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo() [Test]+[lv4]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo() [Test]+[lv7]+[lv8,lv9]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo() [Test]+[lv9]",
 		collector
 	);
 }
@@ -6034,11 +6049,11 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/b110336/Test.java void b110336.Test.foo(Test).test1 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.foo(Test).test2 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.foo(Test) [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.foo(Test).test4 [Test]\n" +
-		"src/b110336/Test.java void b110336.Test.foo(Test).test3 [Test]",
+		"src/b110336/Test.java void b110336.Test.foo(Test) [Test]+[test1]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo(Test) [Test]+[test2]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo(Test) [Test]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo(Test) [Test]+[test4]\n" + 
+		"src/b110336/Test.java void b110336.Test.foo(Test) [Test]+[test3]",
 		collector
 	);
 }
@@ -6058,12 +6073,12 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/b110336/Test.java b110336.Test.{}.lv1 [Test]+[lv2,lv3]\n" +
-		"src/b110336/Test.java b110336.Test.{}.lv2 [Test]\n" +
-		"src/b110336/Test.java b110336.Test.{}.lv4 [Test]+[lv5,lv6]\n" +
-		"src/b110336/Test.java b110336.Test.{}.lv4 [Test]\n" +
-		"src/b110336/Test.java b110336.Test.{}.lv7 [Test]+[lv8,lv9]\n" +
-		"src/b110336/Test.java b110336.Test.{}.lv9 [Test]",
+		"src/b110336/Test.java b110336.Test.{} [Test]+[lv1]+[lv2,lv3]\n" + 
+		"src/b110336/Test.java b110336.Test.{} [Test]+[lv2]\n" + 
+		"src/b110336/Test.java b110336.Test.{} [Test]+[lv4]+[lv5,lv6]\n" + 
+		"src/b110336/Test.java b110336.Test.{} [Test]+[lv4]\n" + 
+		"src/b110336/Test.java b110336.Test.{} [Test]+[lv7]+[lv8,lv9]\n" + 
+		"src/b110336/Test.java b110336.Test.{} [Test]+[lv9]",
 		collector
 	);
 }
@@ -6083,12 +6098,12 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/b110336/Test.java b110336.Test.static {}.lv1 [Test]+[lv2,lv3]\n" +
-		"src/b110336/Test.java b110336.Test.static {}.lv2 [Test]\n" +
-		"src/b110336/Test.java b110336.Test.static {}.lv4 [Test]+[lv5,lv6]\n" +
-		"src/b110336/Test.java b110336.Test.static {}.lv4 [Test]\n" +
-		"src/b110336/Test.java b110336.Test.static {}.lv7 [Test]+[lv8,lv9]\n" +
-		"src/b110336/Test.java b110336.Test.static {}.lv9 [Test]",
+		"src/b110336/Test.java b110336.Test.static {} [Test]+[lv1]+[lv2,lv3]\n" + 
+		"src/b110336/Test.java b110336.Test.static {} [Test]+[lv2]\n" + 
+		"src/b110336/Test.java b110336.Test.static {} [Test]+[lv4]+[lv5,lv6]\n" + 
+		"src/b110336/Test.java b110336.Test.static {} [Test]+[lv4]\n" + 
+		"src/b110336/Test.java b110336.Test.static {} [Test]+[lv7]+[lv8,lv9]\n" + 
+		"src/b110336/Test.java b110336.Test.static {} [Test]+[lv9]",
 		collector
 	);
 }
@@ -9430,8 +9445,8 @@
 	TypeReferenceCollector collector = new TypeReferenceCollector();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/xy/Try.java @Constants(value=Try.class) [Try]\n" +
-		"src/xy/Try.java @Constants(value=Try.class) [Try]",
+		"src/xy/Try.java xy.Try.fTryA [Try]+[@Constants on fTryA]+[@Constants on fTryB]\n" + 
+		"src/xy/Try.java void xy.Try.tryB(int) [Try]+[@Constants on tryCopy]+[@Constants on tryCopy2]",
 		collector
 	);
 }
@@ -9459,7 +9474,7 @@
 	collector.showSelection();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/test/Test.java @Annot(clazz=Test.class) [        @Annot(clazz=§|Test|§.class) int x;]",
+		"src/test/Test.java void test.Test.method() [        @Annot(clazz=§|Test|§.class) int x;]+[@Annot on x]",
 		collector
 	);
 }
@@ -9475,7 +9490,7 @@
 	collector.showSelection();
 	search("Deprecated", TYPE, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/test/Test.java @Deprecated() [        @§|Deprecated|§ foo() {}]",
+		"src/test/Test.java void test.Test.foo() [        @§|Deprecated|§ foo() {}]+[@Deprecated on foo]",
 		collector
 	);
 }
@@ -9501,11 +9516,11 @@
 	collector.showSelection();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/comment5/Ref.java void comment5.Ref.doA(Ref).ref [    void doA(§|Ref|§ ref) {}]\n" +
-		"src/comment5/Ref.java void comment5.Ref.doB(List<Ref>).ref [    void doB(List<§|Ref|§> ref) {}]\n" +
-		"src/comment5/Ref.java @Tag(value=Ref.class) [    void doC(@Tag(§|Ref|§.class) Ref ref) {}]\n" +
-		"src/comment5/Ref.java void comment5.Ref.doC(Ref).ref [    void doC(@Tag(Ref.class) §|Ref|§ ref) {}]\n" +
-		"src/comment5/Ref.java @Tag(value=Ref.class) [    void dontD(@Tag(§|Ref|§.class) Object ref) {}]",
+		"src/comment5/Ref.java void comment5.Ref.doA(Ref) [    void doA(§|Ref|§ ref) {}]+[ref]\n" + 
+		"src/comment5/Ref.java void comment5.Ref.doB(List<Ref>) [    void doB(List<§|Ref|§> ref) {}]+[ref]\n" + 
+		"src/comment5/Ref.java void comment5.Ref.doC(Ref) [    void doC(@Tag(§|Ref|§.class) Ref ref) {}]+[@Tag on ref]\n" + 
+		"src/comment5/Ref.java void comment5.Ref.doC(Ref) [    void doC(@Tag(Ref.class) §|Ref|§ ref) {}]+[ref]\n" + 
+		"src/comment5/Ref.java void comment5.Ref.dontD(Object) [    void dontD(@Tag(§|Ref|§.class) Object ref) {}]+[@Tag on ref]",
 		collector
 	);
 }
@@ -9524,7 +9539,7 @@
 	collector.showSelection();
 	search(field, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/comment10/Ref.java @Num(number=Num.CONST) [@Num(number= Num.§|CONST|§)]",
+		"src/comment10/Ref.java comment10.Num [@Num(number= Num.§|CONST|§)]+[@Num on Num]",
 		collector
 	);
 }
@@ -9546,9 +9561,9 @@
 	collector.showSelection();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/comment22/Test.java @Tag() [    @§|Tag|§ Test test1, test2, test3;]\n" +
-		"src/comment22/Test.java @Tag() [        @§|Tag|§ Test local= null;]\n" +
-		"src/comment22/Test.java @Tag() [        @§|Tag|§ Test local1, local2, local3;]",
+		"src/comment22/Test.java comment22.Test.test1 [    @§|Tag|§ Test test1, test2, test3;]+[@Tag on test1]+[@Tag on test2,@Tag on test3]\n" + 
+		"src/comment22/Test.java void comment22.Test.method() [        @§|Tag|§ Test local= null;]+[@Tag on local]\n" + 
+		"src/comment22/Test.java void comment22.Test.method() [        @§|Tag|§ Test local1, local2, local3;]+[@Tag on local1]+[@Tag on local2,@Tag on local3]",
 		collector
 	);
 }
@@ -9568,7 +9583,7 @@
 	collector.showSelection();
 	search(type, REFERENCES, EXACT_RULE, getJavaSearchScope(), collector);
 	assertSearchResults(
-		"src/test/Test.java @Annot(clazz=test.Test.class) [    @Annot(clazz = §|test.Test|§.class) int x, y;]",
+		"src/test/Test.java test.TestMethodReference.x [    @Annot(clazz = §|test.Test|§.class) int x, y;]+[@Annot on x]+[@Annot on y]",
 		collector
 	);
 }
#P org.eclipse.jdt.core
Index: search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java,v
retrieving revision 1.323
diff -u -r1.323 MatchLocator.java
--- search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	3 Mar 2009 12:24:38 -0000	1.323
+++ search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	6 Mar 2009 10:57:07 -0000
@@ -1706,21 +1706,23 @@
 		} catch (Exception e) {
 			// it's just for debug purposes... ignore all exceptions in this area
 		}
-		if (match instanceof TypeReferenceMatch) {
+		if (match instanceof ReferenceMatch) {
 			try {
-				TypeReferenceMatch typeRefMatch = (TypeReferenceMatch) match;
-				JavaElement local = (JavaElement) typeRefMatch.getLocalElement();
+				ReferenceMatch refMatch = (ReferenceMatch) match;
+				JavaElement local = (JavaElement) refMatch.getLocalElement();
 				if (local != null) {
 					System.out.println("\tLocal element: "+ local.toStringWithAncestors()); //$NON-NLS-1$
 				}
-				IJavaElement[] others = typeRefMatch.getOtherElements();
-				if (others != null) {
-					int length = others.length;
-					if (length > 0) {
-						System.out.println("\tOther elements:"); //$NON-NLS-1$
-						for (int i=0; i<length; i++) {
-							JavaElement other = (JavaElement) others[i];
-							System.out.println("\t\t- "+ other.toStringWithAncestors()); //$NON-NLS-1$
+				if (match instanceof TypeReferenceMatch) {
+					IJavaElement[] others = ((TypeReferenceMatch) refMatch).getOtherElements();
+					if (others != null) {
+						int length = others.length;
+						if (length > 0) {
+							System.out.println("\tOther elements:"); //$NON-NLS-1$
+							for (int i=0; i<length; i++) {
+								JavaElement other = (JavaElement) others[i];
+								System.out.println("\t\t- "+ other.toStringWithAncestors()); //$NON-NLS-1$
+							}
 						}
 					}
 				}
@@ -2187,14 +2189,24 @@
 protected void reportMatching(Annotation[] annotations, IJavaElement enclosingElement, IJavaElement[] otherElements, Binding elementBinding, MatchingNodeSet nodeSet, boolean matchedContainer, boolean enclosesElement) throws CoreException {
 	for (int i=0, al=annotations.length; i<al; i++) {
 		Annotation annotationType = annotations[i];
-		IJavaElement localElement = null;
+		IJavaElement localAnnotation = null;
+		IJavaElement[] otherAnnotations = null;
+		int length = otherElements == null ? 0 : otherElements.length;
+		boolean handlesCreated = false;
 
 		// Look for annotation type ref
 		TypeReference typeRef = annotationType.type;
 		Integer level = (Integer) nodeSet.matchingNodes.removeKey(typeRef);
 		if (level != null && enclosesElement && matchedContainer) {
-			localElement = createHandle(annotationType, (IAnnotatable) enclosingElement);
-			this.patternLocator.matchReportReference(typeRef, enclosingElement, localElement, otherElements, elementBinding, level.intValue(), this);
+			localAnnotation = createHandle(annotationType, (IAnnotatable) enclosingElement);
+			if (length > 0) {
+				otherAnnotations = new IJavaElement[length];
+				for (int o=0; o<length; o++) {
+					otherAnnotations[o] = createHandle(annotationType, (IAnnotatable) otherElements[o]);
+				}
+			}
+			handlesCreated = true;
+			this.patternLocator.matchReportReference(typeRef, enclosingElement, localAnnotation, otherAnnotations, elementBinding, level.intValue(), this);
 		}
 
 		// Look for attribute ref
@@ -2204,10 +2216,17 @@
 			level = (Integer) nodeSet.matchingNodes.removeKey(pair);
 			if (level != null && enclosesElement) {
 				ASTNode reference = (annotationType instanceof SingleMemberAnnotation) ? (ASTNode) annotationType: pair;
-				if (localElement == null) {
-					localElement = createHandle(annotationType, (IAnnotatable) enclosingElement);
+				if (!handlesCreated) {
+					localAnnotation = createHandle(annotationType, (IAnnotatable) enclosingElement);
+					if (length > 0) {
+						otherAnnotations = new IJavaElement[length];
+						for (int o=0; o<length; o++) {
+							otherAnnotations[o] = createHandle(annotationType, (IAnnotatable) otherElements[o]);
+						}
+					}
+					handlesCreated = true;
 				}
-				this.patternLocator.matchReportReference(reference, enclosingElement, localElement, otherElements, pair.binding, level.intValue(), this);
+				this.patternLocator.matchReportReference(reference, enclosingElement, localAnnotation, otherAnnotations, pair.binding, level.intValue(), this);
 			}
 		}
 
@@ -2223,10 +2242,17 @@
 					ASTNode node = nodes[j];
 					level = (Integer) nodeSet.matchingNodes.removeKey(node);
 					if (enclosesElement) {
-						if (localElement == null) {
-							localElement = createHandle(annotationType, (IAnnotatable) enclosingElement);
+						if (!handlesCreated) {
+							localAnnotation = createHandle(annotationType, (IAnnotatable) enclosingElement);
+							if (length > 0) {
+								otherAnnotations = new IJavaElement[length];
+								for (int o=0; o<length; o++) {
+									otherAnnotations[o] = createHandle(annotationType, (IAnnotatable) otherElements[o]);
+								}
+							}
+							handlesCreated = true;
 						}
-						this.patternLocator.matchReportReference(node, enclosingElement, localElement, otherElements, elementBinding, level.intValue(), this);
+						this.patternLocator.matchReportReference(node, enclosingElement, localAnnotation, otherAnnotations, elementBinding, level.intValue(), this);
 					}
 				}
 			}
Index: search/org/eclipse/jdt/internal/core/search/matching/MemberDeclarationVisitor.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MemberDeclarationVisitor.java,v
retrieving revision 1.3
diff -u -r1.3 MemberDeclarationVisitor.java
--- search/org/eclipse/jdt/internal/core/search/matching/MemberDeclarationVisitor.java	12 Sep 2008 12:23:44 -0000	1.3
+++ search/org/eclipse/jdt/internal/core/search/matching/MemberDeclarationVisitor.java	6 Mar 2009 10:57:07 -0000
@@ -155,7 +155,15 @@
 	            	System.arraycopy(this.otherElements, 0, this.otherElements = new IJavaElement[length+10], 0, length);
 	            }
             }
-	    	this.otherElements[this.ptr] = handle;
+    		if (this.annotation == null) {
+		    	this.otherElements[this.ptr] = handle;
+    		} else {
+		    	IJavaElement annotHandle = this.locator.createHandle(this.annotation, (IAnnotatable) handle);
+		    	if (annotHandle == null) {
+			    	annotHandle = this.locator.createHandle(this.annotation, (IAnnotatable) this.enclosingElement);
+		    	}
+		    	this.otherElements[this.ptr] = annotHandle == null ? handle : annotHandle;
+    		}
     	}
     } else {
     	if (this.localElements[idx] == null) {
@@ -179,7 +187,15 @@
 	            	System.arraycopy(this.allOtherElements[idx], 0, this.allOtherElements[idx] = new IJavaElement[length+10], 0, length);
         	    }
 	        }
- 		   	this.allOtherElements[idx][oPtr] = handle;
+	    	if (this.annotation == null) {
+	 		   	this.allOtherElements[idx][oPtr] = handle;
+    		} else {
+		    	IJavaElement annotHandle = this.locator.createHandle(this.annotation, (IAnnotatable) handle);
+		    	if (annotHandle == null) {
+			    	annotHandle = this.locator.createHandle(this.annotation, (IAnnotatable) this.enclosingElement);
+		    	}
+	 		   	this.allOtherElements[idx][oPtr] = annotHandle == null ? handle : annotHandle;
+    		}
     	}
     }
 }
Index: search/org/eclipse/jdt/core/search/TypeReferenceMatch.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/TypeReferenceMatch.java,v
retrieving revision 1.24
diff -u -r1.24 TypeReferenceMatch.java
--- search/org/eclipse/jdt/core/search/TypeReferenceMatch.java	23 Feb 2009 17:04:34 -0000	1.24
+++ search/org/eclipse/jdt/core/search/TypeReferenceMatch.java	6 Mar 2009 10:57:07 -0000
@@ -76,10 +76,7 @@
  * @since 3.2
  */
 public final IJavaElement[] getOtherElements() {
-	if (this.localElement == null || this.localElement.getElementType() != IJavaElement.ANNOTATION) {
-		return this.otherElements;
-	}
-	return null;
+	return this.otherElements;
 }
 
 /**