Attachment 50367 Details for Bug 147647 – Patch + test case

[patch] Patch + test case

org.eclipse.jdt.core_01.txt (text/plain), 2.18 KB, created by Maxime Daniel

on 2006-09-18 09:19:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Daniel

Created: 2006-09-18 09:19:06 EDT

Size: 2.18 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java,v
>retrieving revision 1.283
>diff -u -r1.283 Scope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	6 Sep 2006 18:14:13 -0000	1.283
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	18 Sep 2006 13:19:55 -0000
>@@ -3211,7 +3211,9 @@
> 					MethodBinding methodToTest = next;
> 					if (next instanceof ParameterizedGenericMethodBinding) {
> 						ParameterizedGenericMethodBinding pNext = (ParameterizedGenericMethodBinding) next;
>-						if (pNext.isRaw) {
>+						if (pNext.isRaw && 
>+								(pNext.modifiers & ClassFileConstants.AccStatic)
>+									== 0) {
> 							// hold onto the raw substituted method
> 						} else {
> 							methodToTest = pNext.originalMethod;
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java,v
>retrieving revision 1.9
>diff -u -r1.9 AmbiguousMethodTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java	14 Sep 2006 08:27:19 -0000	1.9
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java	18 Sep 2006 13:19:59 -0000
>@@ -884,7 +884,7 @@
> 	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=147647
> 	// in fact, <W extends String> Y<W> make(Class<W> clazz) is the most
> 	// specific method according to JLS 15.12.2.5
>-	public void _test019() {
>+	public void test019() {
> 	this.runConformTest(
> 		new String[] {
> 			"X.java",
>@@ -933,7 +933,7 @@
> 	}
> 	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=147647
> 	// variant: having both methods in the same class should not change anything
>-	public void _test021() {
>+	public void test021() {
> 	this.runConformTest(
> 		new String[] {
> 			"X.java",

Actions: View | Diff

Attachments on bug 147647: 50367