Attachment #198304 for bug #348507

Lines 7-15 Link Here

(-)search/org/eclipse/jdt/internal/core/search/IndexSelector.java (-7 / +7 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Nikolay Botev - Bug 348507
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.core.search;	12	package org.eclipse.jdt.internal.core.search;
12		13
		14	import java.util.LinkedHashSet;
		15
13	import org.eclipse.core.resources.IFolder;	16	import org.eclipse.core.resources.IFolder;
14	import org.eclipse.core.resources.ResourcesPlugin;	17	import org.eclipse.core.resources.ResourcesPlugin;
15	import org.eclipse.core.runtime.IPath;	18	import org.eclipse.core.runtime.IPath;
Lines 180-186 Link Here
180	private void initializeIndexLocations() {	183	private void initializeIndexLocations() {
181	IPath[] projectsAndJars = this.searchScope.enclosingProjectsAndJars();	184	IPath[] projectsAndJars = this.searchScope.enclosingProjectsAndJars();
182	IndexManager manager = JavaModelManager.getIndexManager();	185	IndexManager manager = JavaModelManager.getIndexManager();
183	SimpleSet locations = new SimpleSet();	186	// use a linked set to preserve the order during search: see bug 348507
		187	LinkedHashSet locations = new LinkedHashSet();
184	IJavaElement focus = MatchLocator.projectOrJarFocus(this.pattern);	188	IJavaElement focus = MatchLocator.projectOrJarFocus(this.pattern);
185	if (focus == null) {	189	if (focus == null) {
186	for (int i = 0; i < projectsAndJars.length; i++) {	190	for (int i = 0; i < projectsAndJars.length; i++) {
Lines 263-274 Link Here
263	}	267	}
264	}	268	}
265		269
266	this.indexLocations = new IPath[locations.elementSize];	270	locations.remove(null); // Ensure no nulls
267	Object[] values = locations.values;	271	this.indexLocations = (IPath[]) locations.toArray(new IPath[locations.size()]);
268	int count = 0;
269	for (int i = values.length; --i >= 0;)
270	if (values[i] != null)
271	this.indexLocations[count++] = (IPath) values[i];
272	}	272	}
273		273
274	public IPath[] getIndexLocations() {	274	public IPath[] getIndexLocations() {




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Nikolay Botev - Bug 348507
 *******************************************************************************/
package org.eclipse.jdt.internal.core.search;

import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Set;

import org.eclipse.core.resources.IFolder;

	long start = BasicSearchEngine.VERBOSE ? System.currentTimeMillis() : -1;
	try {
		IJavaProject[] projects = JavaModelManager.getJavaModelManager().getJavaModel().getJavaProjects();
		// use a linked set to preserve the order during search: see bug 348507
		Set paths = new LinkedHashSet(projects.length * 2);
		for (int i = 0, length = projects.length; i < length; i++) {
			JavaProject javaProject = (JavaProject) projects[i];

			// Add project full path
			IPath projectPath = javaProject.getProject().getFullPath();
			paths.add(projectPath);
		}

		// add the project source paths first in a separate loop above
		// to ensure source files always get higher precedence during search.
		// see bug 348507

		for (int i = 0, length = projects.length; i < length; i++) {
			JavaProject javaProject = (JavaProject) projects[i];

			// Add project libraries paths
			IClasspathEntry[] entries = javaProject.getResolvedClasspath();

Return to bug 348507