generics
diff --git a/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/core/search/BasicSearchEngine.java b/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/core/search/BasicSearchEngine.java
index 06afb48..2a2f201 100644
--- a/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/core/search/BasicSearchEngine.java
+++ b/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/core/search/BasicSearchEngine.java
@@ -16,6 +16,7 @@
import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -200,7 +201,7 @@
// For EMPTY CASE
if (toolkit != null) {
- HashSet visitedProjects = new HashSet(2);
+ HashSet<IProject> visitedProjects = new HashSet<IProject>(2);
for (int i = 0; i < elements.length; i++) {
IModelElement element = elements[i];
if (element != null) {
diff --git a/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/internal/core/search/DLTKSearchScope.java b/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/internal/core/search/DLTKSearchScope.java
index be2b171..e29f469 100644
--- a/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/internal/core/search/DLTKSearchScope.java
+++ b/core/plugins/org.eclipse.dltk.core/search/org/eclipse/dltk/internal/core/search/DLTKSearchScope.java
@@ -99,8 +99,7 @@
}
}
}
- return (String[]) relativePaths
- .toArray(new String[relativePaths.size()]);
+ return relativePaths.toArray(new String[relativePaths.size()]);
}
private void addEnclosingProjectOrArchive(IPath path) {
@@ -121,7 +120,7 @@
* @see #add(ScriptProject, IPath, int, HashSet, IClasspathEntry)
*/
public void add(ScriptProject project, int includeMask,
- HashSet visitedProject) throws ModelException {
+ HashSet<IProject> visitedProject) throws ModelException {
add(project, null, includeMask, visitedProject, null);
}
@@ -146,7 +145,7 @@
* May happen while getting script model info
*/
void add(ScriptProject scriptProject, IPath pathToAdd, int includeMask,
- HashSet visitedProjects, IBuildpathEntry referringEntry)
+ HashSet<IProject> visitedProjects, IBuildpathEntry referringEntry)
throws ModelException {
if (!natureFilter(scriptProject)) {
return;
@@ -278,8 +277,8 @@
// a workspace scope should be used
break;
case IModelElement.SCRIPT_PROJECT:
- add((ScriptProject) element, null, includeMask, new HashSet(2),
- null);
+ add((ScriptProject) element, null, includeMask,
+ new HashSet<IProject>(2), null);
break;
case IModelElement.PROJECT_FRAGMENT:
IProjectFragment root = (IProjectFragment) element;