Attachment 38084 Details for Bug 86293 – Patch to fix this issue

[patch] Patch to fix this issue

v00.txt (text/plain), 7.33 KB, created by Frederic Fusier

on 2006-04-09 11:10:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2006-04-09 11:10:37 EDT

Size: 7.33 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.274
>diff -u -r1.274 MatchLocator.java
>--- search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	6 Apr 2006 16:01:13 -0000	1.274
>+++ search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	9 Apr 2006 15:01:12 -0000
>@@ -2314,10 +2314,11 @@
> 		enclosingElement = ((IType) parent).getType(new String(type.name));
> 	} else if (enclosingElement instanceof IMember) {
> 	    IMember member = (IMember) parent;
>-	    if (member.isBinary()) 
>-	        enclosingElement = parent;
>-	    else
>+		if (member.isBinary())  {
>+			enclosingElement = this.currentPossibleMatch.openable.getClassFile().getType();
>+		} else {
> 			enclosingElement = member.getType(new String(type.name), occurrenceCount);
>+		}
> 	}
> 	if (enclosingElement == null) return;
> 	boolean enclosesElement = encloses(enclosingElement);
>Index: buildnotes_jdt-core.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/buildnotes_jdt-core.html,v
>retrieving revision 1.5162
>diff -u -r1.5162 buildnotes_jdt-core.html
>--- buildnotes_jdt-core.html	8 Apr 2006 08:08:42 -0000	1.5162
>+++ buildnotes_jdt-core.html	9 Apr 2006 15:01:07 -0000
>@@ -52,7 +52,9 @@
> What's new in this drop</h2>
> 
> <h3>Problem Reports Fixed</h3>
>-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135292">135292</a>
>+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=86293">86293</a>
>+[search] Search for method declaration with pattern "run()" reports match in binary field instead of anonymous class
>+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135292">135292</a>
> [compiler] NPE in ProblemReporter.invalidField plus .log swamping
> <br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=135217">135217</a>
> Compiler class constructor change in 3.2
>#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.68
>diff -u -r1.68 JavaSearchBugsTests.java
>--- src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java	6 Apr 2006 16:01:34 -0000	1.68
>+++ src/org/eclipse/jdt/core/tests/model/JavaSearchBugsTests.java	9 Apr 2006 15:01:32 -0000
>@@ -2444,6 +2444,19 @@
> 		"src/b86642/B.java void b86642.B.f(A) [A] EXACT_MATCH"
> 	);
> }
>+/**
>+ * Bug 86293: [search] Search for method declaration with pattern "run()" reports match in binary field instead of anonymous class
>+ * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=86293"
>+ */
>+public void testBug86293() throws CoreException {
>+    IType type = getClassFile("JavaSearchBugs", "lib/b86293.jar", "", "I86293.class").getType();
>+	IMethod method = type.getMethod("m86293", new String[0]);
>+	search(method, DECLARATIONS);
>+	assertSearchResults(
>+		"lib/b86293.jar void <anonymous>.m86293() EXACT_MATCH\n" + 
>+		"lib/b86293.jar void I86293.m86293() EXACT_MATCH"
>+	);
>+}
> 
> /**
>  * Bug 86380: [1.5][search][annot] Add support to find references inside annotations on a package declaration
>Index: src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java,v
>retrieving revision 1.149
>diff -u -r1.149 JavaSearchTests.java
>--- src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java	6 Apr 2006 16:01:34 -0000	1.149
>+++ src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java	9 Apr 2006 15:01:38 -0000
>@@ -1097,7 +1097,7 @@
> 		getJavaSearchScope(), 
> 		this.resultCollector);
> 	assertSearchResults(
>-		"test48725.jar void p.X.foo()",
>+		"test48725.jar int p.<anonymous>.bar()",
> 		this.resultCollector);
> }
> /**
>@@ -2152,7 +2152,7 @@
> 		scope, 
> 		this.resultCollector);
> 	assertSearchResults(
>-		"test20631.jar void X.foo()",
>+		"test20631.jar Y",
> 		this.resultCollector);
> }
> /**
>Index: workspace/JavaSearchBugs/.classpath
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/workspace/JavaSearchBugs/.classpath,v
>retrieving revision 1.11
>diff -u -r1.11 .classpath
>--- workspace/JavaSearchBugs/.classpath	27 Feb 2006 12:47:16 -0000	1.11
>+++ workspace/JavaSearchBugs/.classpath	9 Apr 2006 15:01:38 -0000
>@@ -4,6 +4,7 @@
>     <classpathentry kind="var" path="JCL_LIB" sourcepath="JCL_SRC" rootpath="JCL_SRCROOT"/>
> 	<classpathentry kind="lib" path="lib/test81556.jar" sourcepath="/JavaSearchBugs/lib/test81556.jar" rootpath=""/>
> 	<classpathentry kind="lib" path="lib/test75816.jar" sourcepath="/JavaSearchBugs/lib/test75816.jar" rootpath=""/>
>+	<classpathentry kind="lib" path="lib/b86293.jar"/>
> 	<classpathentry kind="lib" path="lib/b87627.jar" sourcepath="/JavaSearchBugs/lib/b87627.jar" rootpath=""/>
> 	<classpathentry kind="lib" path="lib/b110422.jar" sourcepath="" rootpath=""/>
> 	<classpathentry kind="lib" path="lib/b124469.jar" sourcepath="/JavaSearchBugs/lib/b124469.jar" rootpath=""/>
>Index: workspace/JavaSearchBugs/lib/b86293.jar
>===================================================================
>RCS file: workspace/JavaSearchBugs/lib/b86293.jar
>diff -N workspace/JavaSearchBugs/lib/b86293.jar
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ workspace/JavaSearchBugs/lib/b86293.jar	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,9 @@
>+PKós4META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
>+K-*ÎÌÏ³R0Ô3àåâåPK²îPK.s4I86293.class;õo×>CNv&F6O3#KcvF?¬Ä²DýÄ¼t}ÿ¤¬Ôä t.X?YC3?+8¿´(9Õ-3'?¢U¤?¨?&±2°?Xì@?PKbÓdtPKûr4I86293.java+(MÊÉLVÈÌ+I-JKLNUð´03²4V¨æåâ,Èåg¦(ä54y¹jy¹PK°
>+m06PK.s4C86293$1.classM?MOÂ@ß¥B©RñûãÈ??D@Ñx!?T=h¸/eKÊ6iÿË1ñàðGg=ÌfæÙ÷?ÝïÏ/=:(0ýËó«zÏ?ÍàÏù+ïD\M;Oã¹3EâÐh(Éf2wÉ¬l×Än¤Ù-C¥±Í='¢MJ.,T=á3X
>+-¨RÇåb,>C-C?x"u?C[?dpõzä"ßÇ}I(î¥VVV3ýo¨HOSAþê?
>+£8jú ²Y<qpB}VtiMbÌ÷õ¶ô?2\¢ÊúTkâ¶ÚïðZØz3mÍÌ?vP£Ì£\Óì¾?ïÒ65Å¹hõÏÈr£}£:À¡iÇÌ-HyD§?càPK4|ª6ËPK.s4C86293.class5OËJÃ@=Ó¤MmZßîmZ(JÅM@(](tÔ)1?$õ¿\ àøQâ?$ÎÀ½÷s?¿ß¦8²Ð`hyçó³Á]W1Eò4¹
>+×2*?JÆ+¶¿,óTq©U\1ÃQÀ`zéJÚ0àpXh[Ø¢ìªéÉÔGOó.3ô+z1
>+:`p4Ñbèù*7Pf÷"%)~8Ò¸&ÍâYåzïû.Ýd¼VZv*úTÀÀI"3/y.sÓ4nfôidÑ²d;<ýñìñøÝwôßl`l·n`vÉïâUv±WæíöämÒ8ôüPKBÎ·qPK)s4C86293.java+(MÊÉLVHÎI,.Vp¶03²4V¨æåâ,{BDÒ2SsRlòRË¡B`e0ueù)
>+¹pZ T5/?PKä9b×CaPKós4²îMETA-INF/MANIFEST.MFþÊPK.s4bÓdtaI86293.classPKûr4°
>+m06ÿI86293.javaPK.s44|ª6ËhC86293$1.classPK.s4BÎ·qÚC86293.classPK)s4ä9b×Ca&C86293.javaPKh¢

Actions: View | Diff

Attachments on bug 86293: 38084