Clean up / revert some unnecessary changes in jdt.core

Signed-off-by: Rob Stryker <[email protected]>

Author: Rob Stryker

org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java

@@ -1337,7 +1337,6 @@ protected void locateMatchesDefaultImpl(JavaProject javaProject, PossibleMatch[]
 					possibleMatch.cleanUp();
 			}
 		}
-
 		if (mustResolve)
 			this.lookupEnvironment.completeTypeBindings();
 
@@ -1531,7 +1530,7 @@ public int compare(Object a, Object b) {
 				}
 				previousJavaProject = javaProject;
 			}
-			PossibleMatch possibleMatch = createPossibleMatch(this, resource, openable, searchDocument,this.pattern.mustResolve);
+			PossibleMatch possibleMatch = new PossibleMatch(this, resource, openable, searchDocument,this.pattern.mustResolve);
 			matchSet.add(possibleMatch);
 			if (pathString.endsWith(TypeConstants.AUTOMATIC_MODULE_NAME)) {
 				IPath path = resource.getFullPath();
@@ -1566,12 +1565,6 @@ public int compare(Object a, Object b) {
 		this.bindingsByName = null;
 	}
 }
-
-protected PossibleMatch createPossibleMatch(MatchLocator locator, IResource resource, Openable openable, SearchDocument document, boolean mustResolve) {
-	return new PossibleMatch(locator, resource, openable, document, mustResolve);
-}
-
-
 private IJavaSearchScope getSubScope(String optionString, long value, boolean ref) {
 	if (this.subScope != null)
 		return this.subScope;
@@ -3326,8 +3319,7 @@ protected void reportMatching(TypeParameter[] typeParameters, IJavaElement enclo
 			if (level != null) {
 				if (level.intValue() > -1 && encloses(enclosingElement)) {
 					int offset = typeParameter.sourceStart;
-					int len = typeParameter.sourceEnd-offset+1;
-					SearchMatch match = this.patternLocator.newDeclarationMatch(typeParameter, enclosingElement, binding, level.intValue(), len, this, false);
+					SearchMatch match = this.patternLocator.newDeclarationMatch(typeParameter, enclosingElement, binding, level.intValue(), typeParameter.sourceEnd-offset+1, this);
 					report(match);
 				}
 			}

org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java

@@ -468,10 +468,7 @@ protected void matchReportReference(ASTNode reference, IJavaElement element, IJa
 	matchReportReference(reference, element, elementBinding, accuracy, locator);
 }
 public SearchMatch newDeclarationMatch(ASTNode reference, IJavaElement element, Binding elementBinding, int accuracy, int length, MatchLocator locator) {
-    return locator.newDeclarationMatch(element, elementBinding, accuracy, reference.sourceStart, length, true);
-}
-public SearchMatch newDeclarationMatch(ASTNode reference, IJavaElement element, Binding elementBinding, int accuracy, int length, MatchLocator locator, boolean overrideFromElement) {
-    return locator.newDeclarationMatch(element, elementBinding, accuracy, reference.sourceStart, length, overrideFromElement);
+    return locator.newDeclarationMatch(element, elementBinding, accuracy, reference.sourceStart, length);
 }
 protected int referenceType() {
 	return 0; // defaults to unknown (a generic JavaSearchMatch will be created)