Index: search/org/eclipse/jdt/internal/core/search/IndexSelector.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IndexSelector.java,v retrieving revision 1.49 diff -u -r1.49 IndexSelector.java --- search/org/eclipse/jdt/internal/core/search/IndexSelector.java 28 Jun 2010 06:43:29 -0000 1.49 +++ search/org/eclipse/jdt/internal/core/search/IndexSelector.java 7 Jun 2011 07:31:22 -0000 @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.jdt.internal.core.search; +import java.util.LinkedHashSet; + import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; @@ -180,7 +182,7 @@ private void initializeIndexLocations() { IPath[] projectsAndJars = this.searchScope.enclosingProjectsAndJars(); IndexManager manager = JavaModelManager.getIndexManager(); - SimpleSet locations = new SimpleSet(); + LinkedHashSet locations = new LinkedHashSet(); IJavaElement focus = MatchLocator.projectOrJarFocus(this.pattern); if (focus == null) { for (int i = 0; i < projectsAndJars.length; i++) { @@ -263,10 +265,10 @@ } } - this.indexLocations = new IPath[locations.elementSize]; - Object[] values = locations.values; + this.indexLocations = new IPath[locations.size()]; + Object[] values = locations.toArray(); int count = 0; - for (int i = values.length; --i >= 0;) + for (int i = 0; i < values.length; ++i) if (values[i] != null) this.indexLocations[count++] = (IPath) values[i]; } Index: search/org/eclipse/jdt/internal/core/search/JavaWorkspaceScope.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/JavaWorkspaceScope.java,v retrieving revision 1.36 diff -u -r1.36 JavaWorkspaceScope.java --- search/org/eclipse/jdt/internal/core/search/JavaWorkspaceScope.java 27 Jun 2008 16:04:09 -0000 1.36 +++ search/org/eclipse/jdt/internal/core/search/JavaWorkspaceScope.java 7 Jun 2011 07:31:22 -0000 @@ -11,7 +11,7 @@ package org.eclipse.jdt.internal.core.search; import java.util.HashMap; -import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import org.eclipse.core.resources.IFolder; @@ -72,7 +72,7 @@ long start = BasicSearchEngine.VERBOSE ? System.currentTimeMillis() : -1; try { IJavaProject[] projects = JavaModelManager.getJavaModelManager().getJavaModel().getJavaProjects(); - Set paths = new HashSet(projects.length * 2); + Set paths = new LinkedHashSet(projects.length * 2); for (int i = 0, length = projects.length; i < length; i++) { JavaProject javaProject = (JavaProject) projects[i];