Attachment 104897 Details for Bug 237123 – proposed patch (simpler variant, perhaps incomplete)

[patch] proposed patch (simpler variant, perhaps incomplete)

locators.diff (text/plain), 2.70 KB, created by Stephan Herrmann

on 2008-06-13 13:38:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Herrmann

Created: 2008-06-13 13:38:42 EDT

Size: 2.70 KB

patch

obsolete

>Index: search/org/eclipse/jdt/internal/core/search/matching/AndLocator.java
>===================================================================
>--- search/org/eclipse/jdt/internal/core/search/matching/AndLocator.java	(revision 18631)
>+++ search/org/eclipse/jdt/internal/core/search/matching/AndLocator.java	(working copy)
>@@ -214,7 +214,7 @@
> 	}
> 	weakestPattern.matchReportImportRef(importRef, binding, element, accuracy, locator);
> }
>-protected void matchReportReference(ASTNode reference, IJavaElement element, IJavaElement localElement, IJavaElement[] otherElements, Binding elementBinding, int accuracy, MatchLocator locator) throws CoreException {
>+protected void matchReportReference(ASTNode reference, IJavaElement element, Binding elementBinding, int accuracy, MatchLocator locator) throws CoreException {
> 	PatternLocator weakestPattern = null;
> 	int level = IMPOSSIBLE_MATCH;
> 	for (int i = 0, length = this.patternLocators.length; i < length; i++) {
>@@ -226,7 +226,7 @@
> 			level = newLevel;
> 		}
> 	}
>-	weakestPattern.matchReportReference(reference, element, localElement, otherElements, elementBinding, accuracy, locator);
>+	weakestPattern.matchReportReference(reference, element, elementBinding, accuracy, locator);
> }
> public int resolveLevel(ASTNode node) {
> 	int level = ACCURATE_MATCH;
>Index: search/org/eclipse/jdt/internal/core/search/matching/OrLocator.java
>===================================================================
>--- search/org/eclipse/jdt/internal/core/search/matching/OrLocator.java	(revision 18631)
>+++ search/org/eclipse/jdt/internal/core/search/matching/OrLocator.java	(working copy)
>@@ -345,7 +345,7 @@
> 	if (closestPattern != null)
> 		closestPattern.matchReportImportRef(importRef, binding, element, accuracy, locator);
> }
>-protected void matchReportReference(ASTNode reference, IJavaElement element, IJavaElement localElement, IJavaElement[] otherElements, Binding elementBinding, int accuracy, MatchLocator locator) throws CoreException {
>+protected void matchReportReference(ASTNode reference, IJavaElement element, Binding elementBinding, int accuracy, MatchLocator locator) throws CoreException {
> 	PatternLocator closestPattern = null;
> 	int level = IMPOSSIBLE_MATCH;
> 	for (int i = 0, length = this.patternLocators.length; i < length; i++) {
>@@ -358,7 +358,7 @@
> 		}
> 	}
> 	if (closestPattern != null)
>-		closestPattern.matchReportReference(reference, element, localElement, otherElements, elementBinding, accuracy, locator);
>+		closestPattern.matchReportReference(reference, element, elementBinding, accuracy, locator);
> }
> public SearchMatch newDeclarationMatch(ASTNode reference, IJavaElement element, Binding elementBinding, int accuracy, int length, MatchLocator locator) {
> 	PatternLocator closestPattern = null;

Actions: View | Diff

Attachments on bug 237123: 104897 | 105136