porting 6.0+ (iFix2 and 6.0.0.1) fixes to WTP.

1 files changed, 501 insertions, 458 deletions

diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPSearchSupport.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPSearchSupport.java
index 46369185e2..1940de697e 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPSearchSupport.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/search/JSPSearchSupport.java
@@ -45,469 +45,512 @@ import org.eclipse.jst.jsp.core.internal.java.JSP2ServletNameUtil;
 import org.eclipse.wst.common.encoding.content.IContentTypeIdentifier;
 
 /**
- * Central access to java indexing and search.	
- * All contact between JDT indexing and Searching should be done through here.
+ * Central access to java indexing and search. All contact between JDT indexing
+ * and Searching should be done through here.
  * 
- * Clients should access the methods of this class via the single instance via <code>getInstance()</code>.
+ * Clients should access the methods of this class via the single instance via
+ * <code>getInstance()</code>.
  * 
  * @author pavery
  */
 public class JSPSearchSupport {
 
-	// for debugging
-	static final boolean DEBUG;
-	static {
-		String value= Platform.getDebugOption("org.eclipse.jst.jsp.core/debug/jspsearch"); //$NON-NLS-1$
-		DEBUG= value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	private static JSPSearchSupport fSingleton = null;
-	private JSPSearchParticipant fParticipant = null;
-	
-	private IPath fJSPPluginLocation = null;
-	// future_TODO may be slow (esp for indexing entire workspace)
-	private final CRC32 fChecksumCalculator = new CRC32();
-	
-	/** main cancel montior for all search support*/
-	private final IProgressMonitor fMonitor = new NullProgressMonitor();
-	
-	private JSPSearchSupport() {
-		// force use of single instance
-	}
-
-	/**
-	 * This operation ensures that the live resource's search markers show up in the open editor.
-	 * It also allows the ability to pass in a ProgressMonitor
-	 */
-	private class SearchJob extends Job implements IJavaSearchConstants {
-
-		String fSearchText = ""; //$NON-NLS-1$
-		IJavaSearchScope fScope = null;
-		int fSearchFor = FIELD;
-		int fLimitTo = ALL_OCCURRENCES;
-		int fMatchMode = SearchPattern.R_PATTERN_MATCH;
-		boolean fIsCaseSensitive = false;
-		SearchRequestor fRequestor = null;
-		IJavaElement fElement = null;
-		
-		// constructor w/ java element
-		public SearchJob(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-			super("JSP Search - " + element.getElementName());
-			this.fElement = element;
-			this.fScope = scope;
-			this.fRequestor = requestor;
-		}
-
-		// constructor w/ search text
-		public SearchJob(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-			super("JSP Search - " + searchText);
-			this.fSearchText = searchText;
-			this.fScope = scope;
-			this.fSearchFor = searchFor;
-			this.fLimitTo = limitTo;
-			this.fMatchMode = matchMode;
-			this.fIsCaseSensitive = isCaseSensitive;
-			this.fRequestor = requestor;
-		}
-
-		public IStatus run(IProgressMonitor jobMonitor) {
-			
-			if(jobMonitor != null && jobMonitor.isCanceled())
-				return Status.CANCEL_STATUS;
-			if(JSPSearchSupport.getInstance().isCanceled())
-				return Status.CANCEL_STATUS;
-			
-			SearchPattern javaSearchPattern = null;
-			// if an element is available, use that to create search pattern (eg. LocalVariable)
-			// otherwise use the text and other paramters
-			if (this.fElement != null)
-				javaSearchPattern = SearchPattern.createPattern(this.fElement, this.fLimitTo);
-			else
-				javaSearchPattern = SearchPattern.createPattern(this.fSearchText, this.fSearchFor, this.fLimitTo, this.fMatchMode);
-
-			if (javaSearchPattern != null) {
-				JSPSearchParticipant[] participants = {getSearchParticipant()};
-				SearchEngine engine = new SearchEngine();
-				try {
-					if(jobMonitor != null)
-						jobMonitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-					engine.search(javaSearchPattern, participants, this.fScope, this.fRequestor, jobMonitor);
-				}
-				catch (CoreException e) {
-					if(DEBUG)
-						Logger.logException(e);
-				}
-				// non-CoreExceptions will permanently stall the Worker thread
-				catch (Exception e) {
-					if(DEBUG)
-						Logger.logException(e);
-				}
-				finally {
-					if(jobMonitor != null)
-						jobMonitor.done();
-				}
-			}
-			return Status.OK_STATUS;
-		}
-	}
-	// end SearchJob
-	/**
-	 * Runnable forces caller to wait until finished (as opposed to using a Job)
-	 */
-	private class SearchRunnable implements IWorkspaceRunnable, IJavaSearchConstants {
-
-		String fSearchText = ""; //$NON-NLS-1$
-		IJavaSearchScope fScope = null;
-		int fSearchFor = FIELD;
-		int fLimitTo = ALL_OCCURRENCES;
-		int fMatchMode = SearchPattern.R_PATTERN_MATCH;
-		boolean fIsCaseSensitive = false;
-		SearchRequestor fRequestor = null;
-		IJavaElement fElement = null;
-
-		// constructor w/ java element
-		public SearchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-			this.fElement = element;
-			this.fScope = scope;
-			this.fRequestor = requestor;
-		}
-
-		// constructor w/ search text
-		public SearchRunnable(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-			this.fSearchText = searchText;
-			this.fScope = scope;
-			this.fSearchFor = searchFor;
-			this.fLimitTo = limitTo;
-			this.fMatchMode = matchMode;
-			this.fIsCaseSensitive = isCaseSensitive;
-			this.fRequestor = requestor;
-		}
-		
-		public void run(IProgressMonitor monitor) throws CoreException {
-			
-			if(monitor != null && monitor.isCanceled())
-				return;
-			if(JSPSearchSupport.getInstance().isCanceled())
-				return;
-			
-			SearchPattern javaSearchPattern = null;
-			// if an element is available, use that to create search pattern (eg. LocalVariable)
-			// otherwise use the text and other paramters
-			if (this.fElement != null)
-				javaSearchPattern = SearchPattern.createPattern(this.fElement, fLimitTo);
-			else
-				javaSearchPattern = SearchPattern.createPattern(fSearchText, fSearchFor, fLimitTo, fMatchMode);
-
-			if (javaSearchPattern != null) {
-				JSPSearchParticipant[] participants = {getSearchParticipant()};
-				SearchEngine engine = new SearchEngine();
-				try {
-					if(monitor != null)
-						monitor.beginTask("", 0); //$NON-NLS-1$
-					engine.search(javaSearchPattern, participants, fScope, fRequestor, monitor);
-				}
-				catch (CoreException e) {
-					Logger.logException(e);
-					//throw e;
-				}
-				// non-CoreExceptions will permanently stall the Worker thread
-				catch (Exception e) {
-					Logger.logException(e);
-				}
-				finally {
-					if(monitor != null)
-						monitor.done();
-				}
-			}
-		}
-	}
-	// end SearchRunnable
-	
-	/**
-	 * Clients should access the methods of this class via the single instance via getInstance()
-	 * @return
-	 */
-	public synchronized static JSPSearchSupport getInstance() {
-		if (fSingleton == null)
-			fSingleton = new JSPSearchSupport();
-		return fSingleton;
-	}
-	
-	/**
-	 * Utility method to check if a file is a jsp file (since this is done frequently)
-	 */
-	public static boolean isJsp(IFile file) {
-		
-		boolean isJsp = false;
-		InputStream is = null;
-		try {
-			if(file != null && file.exists()) {
-				
-				IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(IContentTypeIdentifier.ContentTypeID_JSP);
-				// check this before description, it's less expensive
-				if(contentTypeJSP.isAssociatedWith(file.getName())) {
-					
-					IContentDescription contentDescription = file.getContentDescription();
-					// it can be null
-					if(contentDescription == null) {
-						is = file.getContents();
-						contentDescription = Platform.getContentTypeManager().getDescriptionFor(is, file.getName(),  new QualifiedName[]{IContentDescription.CHARSET});
-					}
-					if (contentDescription != null) {
-						String fileCtId = contentDescription.getContentType().getId();		
-						isJsp = (fileCtId != null && IContentTypeIdentifier.ContentTypeID_JSP.equals(fileCtId));
-					}
-				}
-			}
-		} 
-		catch (IOException e) {
-			// ignore, assume it's invalid JSP
-		} 
-		catch (CoreException e){
-			// ignore, assume it's invalid JSP
-		}
-		finally {
-			// must close input stream in case others need it
-			if(is != null)
-				try {
-					is.close();
-				}
-				catch(Exception e) {
-					// not sure how to recover at this point
-				}
-		}
-		return isJsp;
-	}
-	
-	/**
-	 * schedules a search document representing this JSP file for indexing (by the java indexer)
-	 * @param file the JSP file
-	 * @return true if indexing was successful, false otherwise
-	 * @throws CoreException
-	 */
-	public SearchDocument addJspFile(IFile file) throws CoreException {
-		
-		if(JSPSearchSupport.getInstance().isCanceled()) {
-			return null;
-		}
-		
-		if (DEBUG)
-			System.out.println("adding JSP file:" + file.getFullPath()); //$NON-NLS-1$
-
-		// create
-		SearchDocument delegate = createSearchDocument(file);
-		// null if not a jsp file
-		if(delegate != null) {
-			try {
-				getSearchParticipant().scheduleDocumentIndexing(delegate, computeIndexLocation(file.getParent().getFullPath()));
-			}
-			catch(Exception e) {
-				// ensure that failure here doesn't keep other documents from being indexed
-				// if peformed in a batch call (like JSPIndexManager)
-				if (DEBUG)
-					e.printStackTrace();
-			}
-		}
-
-		if (DEBUG)
-			System.out.println("scheduled" + delegate + "for indexing"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		return delegate;
-	}
-	
-	/**
-	 * Perform a java search w/ the given parameters.
-	 * Runs in a background Job (results may still come in after this method call)
-	 * 
-	 * @param searchText the string of text to search on
-	 * @param searchFor IJavaSearchConstants.TYPE, METHOD, FIELD, PACKAGE, etc...
-	 * @param limitTo IJavaSearchConstants.DECLARATIONS, IJavaSearchConstants.REFERENCES, IJavaSearchConstants.IMPLEMENTORS, or IJavaSearchConstants.ALL_OCCURRENCES
-	 * @param matchMode allow * wildcards or not
-	 * @param isCaseSensitive
-	 * @param requestor passed in to accept search matches (and do "something" with them)
-	 */
-	public void search(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-
-		JSPIndexManager.getInstance().rebuildIndexIfNeeded();
-		
-		SearchJob job = new SearchJob(searchText, scope, searchFor, limitTo, matchMode, isCaseSensitive, requestor);
-		setCanceled(false);
-		job.setUser(true);
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
-		// pops up user operation blocked dialog  if you perform a long search,
+    // for debugging
+    static final boolean DEBUG;
+    static {
+        String value = Platform.getDebugOption("com.ibm.sse.model.jsp/debug/jspsearch"); //$NON-NLS-1$
+        DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
+    }
+
+    private static JSPSearchSupport singleton = null;
+
+    private JSPSearchParticipant fParticipant = null;
+
+    private IPath fJspPluginLocation = null;
+
+    // pa_TODO may be slow (esp for indexing entire workspace)
+    private final CRC32 fChecksumCalculator = new CRC32();
+
+    /** main cancel montior for all search support */
+    private final IProgressMonitor fMonitor = new NullProgressMonitor();
+
+    private JSPSearchSupport() {
+        // force use of single instance
+    }
+
+    /**
+     * This operation ensures that the live resource's search markers show up in
+     * the open editor. It also allows the ability to pass in a ProgressMonitor
+     */
+    private class SearchJob extends Job implements IJavaSearchConstants {
+
+        String fSearchText = ""; //$NON-NLS-1$
+
+        IJavaSearchScope fScope = null;
+
+        int fSearchFor = FIELD;
+
+        int fLimitTo = ALL_OCCURRENCES;
+
+        int fMatchMode = SearchPattern.R_PATTERN_MATCH;
+
+        boolean fIsCaseSensitive = false;
+
+        SearchRequestor fRequestor = null;
+
+        IJavaElement fElement = null;
+
+        // constructor w/ java element
+        public SearchJob(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
+
+            super("JSP Search - " + element.getElementName());
+            this.fElement = element;
+            this.fScope = scope;
+            this.fRequestor = requestor;
+        }
+
+        // constructor w/ search text
+        public SearchJob(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
+
+            super("JSP Search - " + searchText);
+            this.fSearchText = searchText;
+            this.fScope = scope;
+            this.fSearchFor = searchFor;
+            this.fLimitTo = limitTo;
+            this.fMatchMode = matchMode;
+            this.fIsCaseSensitive = isCaseSensitive;
+            this.fRequestor = requestor;
+        }
+
+        public IStatus run(IProgressMonitor jobMonitor) {
+
+            if (jobMonitor != null && jobMonitor.isCanceled())
+                return Status.CANCEL_STATUS;
+            if (JSPSearchSupport.getInstance().isCanceled())
+                return Status.CANCEL_STATUS;
+
+            SearchPattern javaSearchPattern = null;
+            // if an element is available, use that to create search pattern
+            // (eg. LocalVariable)
+            // otherwise use the text and other paramters
+            if (this.fElement != null)
+                javaSearchPattern = SearchPattern.createPattern(this.fElement, this.fLimitTo);
+            else
+                javaSearchPattern = SearchPattern.createPattern(this.fSearchText, this.fSearchFor, this.fLimitTo, this.fMatchMode);
+
+            if (javaSearchPattern != null) {
+                JSPSearchParticipant[] participants = { getSearchParticipant() };
+                SearchEngine engine = new SearchEngine();
+                try {
+                    if (jobMonitor != null)
+                        jobMonitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
+                    engine.search(javaSearchPattern, participants, this.fScope, this.fRequestor, jobMonitor);
+                } catch (CoreException e) {
+                    if (DEBUG)
+                        Logger.logException(e);
+                }
+                // non-CoreExceptions will permanently stall the Worker thread
+                catch (Exception e) {
+                    if (DEBUG)
+                        Logger.logException(e);
+                } finally {
+                    if (jobMonitor != null)
+                        jobMonitor.done();
+                }
+            }
+            return Status.OK_STATUS;
+        }
+    }
+
+    // end SearchJob
+    /**
+     * Runnable forces caller to wait until finished (as opposed to using a Job)
+     */
+    private class SearchRunnable implements IWorkspaceRunnable, IJavaSearchConstants {
+
+        String fSearchText = ""; //$NON-NLS-1$
+
+        IJavaSearchScope fScope = null;
+
+        int fSearchFor = FIELD;
+
+        int fLimitTo = ALL_OCCURRENCES;
+
+        int fMatchMode = SearchPattern.R_PATTERN_MATCH;
+
+        boolean fIsCaseSensitive = false;
+
+        SearchRequestor fRequestor = null;
+
+        IJavaElement fElement = null;
+
+        // constructor w/ java element
+        public SearchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
+
+            this.fElement = element;
+            this.fScope = scope;
+            this.fRequestor = requestor;
+        }
+
+        // constructor w/ search text
+        public SearchRunnable(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
+
+            this.fSearchText = searchText;
+            this.fScope = scope;
+            this.fSearchFor = searchFor;
+            this.fLimitTo = limitTo;
+            this.fMatchMode = matchMode;
+            this.fIsCaseSensitive = isCaseSensitive;
+            this.fRequestor = requestor;
+        }
+
+        public void run(IProgressMonitor monitor) throws CoreException {
+
+            if (monitor != null && monitor.isCanceled())
+                return;
+            if (JSPSearchSupport.getInstance().isCanceled())
+                return;
+
+            SearchPattern javaSearchPattern = null;
+            // if an element is available, use that to create search pattern
+            // (eg. LocalVariable)
+            // otherwise use the text and other paramters
+            if (this.fElement != null)
+                javaSearchPattern = SearchPattern.createPattern(this.fElement, fLimitTo);
+            else
+                javaSearchPattern = SearchPattern.createPattern(fSearchText, fSearchFor, fLimitTo, fMatchMode);
+
+            if (javaSearchPattern != null) {
+                JSPSearchParticipant[] participants = { getSearchParticipant() };
+                SearchEngine engine = new SearchEngine();
+                try {
+                    if (monitor != null)
+                        monitor.beginTask("", 0); //$NON-NLS-1$
+                    engine.search(javaSearchPattern, participants, fScope, fRequestor, monitor);
+                } catch (CoreException e) {
+                    Logger.logException(e);
+                    //throw e;
+                }
+                // non-CoreExceptions will permanently stall the Worker thread
+                catch (Exception e) {
+                    Logger.logException(e);
+                } finally {
+                    if (monitor != null)
+                        monitor.done();
+                }
+            }
+        }
+    }
+
+    // end SearchRunnable
+
+    /**
+     * Clients should access the methods of this class via the single instance
+     * via getInstance()
+     * 
+     * @return
+     */
+    public synchronized static JSPSearchSupport getInstance() {
+
+        if (singleton == null)
+            singleton = new JSPSearchSupport();
+        return singleton;
+    }
+
+    /**
+     * Utility method to check if a file is a jsp file (since this is done
+     * frequently)
+     */
+    public static boolean isJsp(IFile file) {
+
+        boolean isJsp = false;
+        InputStream is = null;
+        try {
+            if (file != null && file.exists()) {
+
+                IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(IContentTypeIdentifier.ContentTypeID_JSP);
+                // check this before description, it's less expensive
+                if (contentTypeJSP.isAssociatedWith(file.getName())) {
+
+                    IContentDescription contentDescription = file.getContentDescription();
+                    // it can be null
+                    if (contentDescription == null) {
+                        is = file.getContents();
+                        contentDescription = Platform.getContentTypeManager().getDescriptionFor(is, file.getName(), new QualifiedName[] { IContentDescription.CHARSET });
+                    }
+                    if (contentDescription != null) {
+                        String fileCtId = contentDescription.getContentType().getId();
+                        isJsp = (fileCtId != null && IContentTypeIdentifier.ContentTypeID_JSP.equals(fileCtId));
+                    }
+                }
+            }
+        } catch (IOException e) {
+            // ignore, assume it's invalid JSP
+        } catch (CoreException e) {
+            // ignore, assume it's invalid JSP
+        } finally {
+            // must close input stream in case others need it
+            if (is != null)
+                try {
+                    is.close();
+                } catch (Exception e) {
+                    // not sure how to recover at this point
+                }
+        }
+        return isJsp;
+    }
+
+    /**
+     * schedules a search document representing this JSP file for indexing (by
+     * the java indexer)
+     * 
+     * @param file
+     *            the JSP file
+     * @return true if indexing was successful, false otherwise
+     * @throws CoreException
+     */
+    public SearchDocument addJspFile(IFile file) {
+        if (JSPSearchSupport.getInstance().isCanceled()) {
+            return null;
+        }
+
+        if (DEBUG)
+            System.out.println("adding JSP file:" + file.getFullPath()); //$NON-NLS-1$
+
+        // create
+        SearchDocument delegate = createSearchDocument(file);
+        // null if not a jsp file
+        if (delegate != null) {
+            try {
+                getSearchParticipant().scheduleDocumentIndexing(delegate, computeIndexLocation(file.getParent().getFullPath()));
+            } catch (Exception e) {
+                // ensure that failure here doesn't keep other documents from
+                // being indexed
+                // if peformed in a batch call (like JSPIndexManager)
+                if (DEBUG)
+                    e.printStackTrace();
+            }
+        }
+
+        if (DEBUG)
+            System.out.println("scheduled" + delegate + "for indexing"); //$NON-NLS-1$ //$NON-NLS-2$
+
+        return delegate;
+    }
+    
+    /**
+     * Perform a java search w/ the given parameters. Runs in a background Job
+     * (results may still come in after this method call)
+     * 
+     * @param searchText
+     *            the string of text to search on
+     * @param searchFor
+     *            IJavaSearchConstants.TYPE, METHOD, FIELD, PACKAGE, etc...
+     * @param limitTo
+     *            IJavaSearchConstants.DECLARATIONS,
+     *            IJavaSearchConstants.REFERENCES,
+     *            IJavaSearchConstants.IMPLEMENTORS, or
+     *            IJavaSearchConstants.ALL_OCCURRENCES
+     * @param matchMode
+     *            allow * wildcards or not
+     * @param isCaseSensitive
+     * @param requestor
+     *            passed in to accept search matches (and do "something" with
+     *            them)
+     */
+    public void search(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
+
+        JSPIndexManager.getInstance().rebuildIndexIfNeeded();
+
+        SearchJob job = new SearchJob(searchText, scope, searchFor, limitTo, matchMode, isCaseSensitive, requestor);
+        setCanceled(false);
+        job.setUser(true);
+        // https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
+        // pops up user operation blocked dialog if you perform a long search,
         // then open a file because it locks the workspace
-		//job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-		job.schedule();
-	}
-
-	/**
-	 * Search for an IJavaElement, constrained by the given parameters.
-	 * Runs in a background Job (results may still come in after this method call)
-	 * 
-	 * @param element
-	 * @param scope
-	 * @param requestor
-	 */
-	public void search(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-		
-		JSPIndexManager.getInstance().rebuildIndexIfNeeded();
-		
-		SearchJob job = new SearchJob(element, scope, requestor);
-		setCanceled(false);
-		job.setUser(true);
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
-		//job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-		job.schedule();
-	}
-	
-	/**
-	 * Search for an IJavaElement, constrained by the given parameters.
-	 * Runs in an IWorkspace runnable (results will be reported by the end of this method)
-	 * 
-	 * @param element
-	 * @param scope
-	 * @param requestor
-	 */
-	public void searchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-		
-		JSPIndexManager.getInstance().rebuildIndexIfNeeded();
-		
-		SearchRunnable searchRunnable = new SearchRunnable(element, scope, requestor);
-		try {
-			setCanceled(false);
-			ResourcesPlugin.getWorkspace().run(searchRunnable, JSPSearchSupport.getInstance().getProgressMonitor());
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * @param jspFile
-	 * @return SearchDocument if the file is not null, exists, and is a JSP file, otherwise null.
-	 */
-	private SearchDocument createSearchDocument(IFile jspFile) {
-		
-		JavaSearchDocumentDelegate delegate = null;
-		if (jspFile != null && jspFile.exists() && isJsp(jspFile)) {
-			try {
-				delegate = new JavaSearchDocumentDelegate(new JSPSearchDocument(jspFile, getSearchParticipant()));
-			} catch (CoreException e) {
-				if(DEBUG)
-					Logger.logException(e);
-			}
-		}
-		return delegate;
-		
-	}
-	/**
-	 * Centralized place to access JSPSearchDocuments (used by
-	 * JSPSearchParticipant and JSPSearchRequestor)
-	 * 
-	 * @param searchDocPath
-	 * @param doc
-	 * @return the JSPSearchDocument or null if one is not found
-	 */
-	public SearchDocument getSearchDocument(String searchDocPath) {
-		
-		SearchDocument delegate = null;
-		IFile f = fileForCUPath(searchDocPath);
-		if(f != null) {
-			delegate = createSearchDocument(f);
-		}
-		else {
-			// handle failure case... (file deleted maybe?)
-		}
-		return delegate;
-	}
-
-	/**
-	 * Unmangles the searchDocPath and returns the corresponding JSP file.
-	 * @param searchDocPath
-	 */
-	private IFile fileForCUPath(String searchDocPath) {
-		
-		String[] split = searchDocPath.split("/"); //$NON-NLS-1$
-		String classname = split[split.length-1];
-	
-		String filePath = JSP2ServletNameUtil.unmangle(classname); 
-		IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-		// (pa) another place where relative base location is now used
-		// probably a side effect of using FileBuffers now
-		//IFile f = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(filePath));	
-		return f;
-	}
-
-	JSPSearchParticipant getSearchParticipant() {
-		if (this.fParticipant == null)
-			this.fParticipant = new JSPSearchParticipant();
-		return this.fParticipant;
-	}
-	
-	// This is called from JSPPathIndexer
-	// pa_TODO
-	//how can we make sure participant indexLocations are updated at startup?
-	public final IPath computeIndexLocation(IPath containerPath) {
-		
-		// pa_TODO there should be a non internal way to do this.
-		IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
-		SimpleLookupTable indexLocations = indexManager.indexLocations;
-		
-		String indexLocation = null;
-		Object obj = indexLocations.get(containerPath);
-		if (obj != null) {
-			indexLocation = (String)obj;
-		}
-		else {
-			// create index entry
-			String pathString = containerPath.toOSString();
-			this.fChecksumCalculator.reset();
-			this.fChecksumCalculator.update(pathString.getBytes());
-			String fileName = Long.toString(this.fChecksumCalculator.getValue()) + ".index"; //$NON-NLS-1$
-			// this is the only difference from IndexManager#computeIndexLocation(...)
-			indexLocation = getModelJspPluginWorkingLocation().append(fileName).toOSString();
-			
-			// pa_TODO need to add to java path too, so JDT search support knows
-			// there should be a non internal way to do this.
-			indexLocations.put(containerPath, indexLocation);
-		}
-		return new Path(indexLocation);
-	}
-	
-	// copied from JDT IndexManager
-	public IPath getModelJspPluginWorkingLocation() {
-		if (this.fJSPPluginLocation != null) return this.fJSPPluginLocation;
-
-		IPath stateLocation = JSPCorePlugin.getDefault().getStateLocation();
-		
-		// pa_TODO workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=62267
-		// copied from IndexManager
-		String device = stateLocation.getDevice();
-		if (device != null && device.charAt(0) == '/') stateLocation = stateLocation.setDevice(device.substring(1));
-		
-		return this.fJSPPluginLocation = stateLocation;
-	}
-	
-	/**
-	 * JSP Indexing and Search jobs check this
-	 * @return
-	 */
-	public synchronized final void setCanceled(boolean cancel) {
-		fMonitor.setCanceled(cancel);
-	}
-	
-	/**
-	 * JSP Indexing and Search jobs check this
-	 * @return
-	 */
-	public synchronized final boolean isCanceled() {
-		return fMonitor.isCanceled();
-	}
-	
-	/**
-	 * JSP Indexing and Search jobs check this
-	 * @return
-	 */
-	public final IProgressMonitor getProgressMonitor() {
-		return this.fMonitor;
-	}
+        //job.setRule(ResourcesPlugin.getWorkspace().getRoot());
+        job.schedule();
+    }
+
+    /**
+     * Search for an IJavaElement, constrained by the given parameters. Runs in
+     * a background Job (results may still come in after this method call)
+     * 
+     * @param element
+     * @param scope
+     * @param requestor
+     */
+    public void search(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
+
+        JSPIndexManager.getInstance().rebuildIndexIfNeeded();
+
+        SearchJob job = new SearchJob(element, scope, requestor);
+        setCanceled(false);
+        job.setUser(true);
+        // https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
+        //job.setRule(ResourcesPlugin.getWorkspace().getRoot());
+        job.schedule();
+    }
+
+    /**
+     * Search for an IJavaElement, constrained by the given parameters. Runs in
+     * an IWorkspace runnable (results will be reported by the end of this
+     * method)
+     * 
+     * @param element
+     * @param scope
+     * @param requestor
+     */
+    public void searchRunnable(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
+
+        JSPIndexManager.getInstance().rebuildIndexIfNeeded();
+
+        SearchRunnable searchRunnable = new SearchRunnable(element, scope, requestor);
+        try {
+            setCanceled(false);
+            ResourcesPlugin.getWorkspace().run(searchRunnable, JSPSearchSupport.getInstance().getProgressMonitor());
+        } catch (CoreException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * @param jspFile
+     * @return SearchDocument if the file is not null, exists, and is a JSP
+     *         file, otherwise null.
+     */
+    private SearchDocument createSearchDocument(IFile jspFile) {
+
+        JavaSearchDocumentDelegate delegate = null;
+        if (jspFile != null && jspFile.exists() && isJsp(jspFile)) {
+
+            delegate = new JavaSearchDocumentDelegate(new JSPSearchDocument(jspFile.getFullPath().toString(), getSearchParticipant()));
+        }
+        return delegate;
+
+    }
+
+    /**
+     * Centralized place to access JSPSearchDocuments (used by
+     * JSPSearchParticipant and JSPSearchRequestor)
+     * 
+     * @param searchDocPath
+     * @param doc
+     * @return the JSPSearchDocument or null if one is not found
+     */
+    public SearchDocument getSearchDocument(String searchDocPath) {
+
+        SearchDocument delegate = null;
+        IFile f = fileForCUPath(searchDocPath);
+        if (f != null) {
+            delegate = createSearchDocument(f);
+        } else {
+            // handle failure case... (file deleted maybe?)
+        }
+        return delegate;
+    }
+
+    /**
+     * Unmangles the searchDocPath and returns the corresponding JSP file.
+     * 
+     * @param searchDocPath
+     */
+    private IFile fileForCUPath(String searchDocPath) {
+
+        String[] split = searchDocPath.split("/"); //$NON-NLS-1$
+        String classname = split[split.length - 1];
+
+        String filePath = JSP2ServletNameUtil.unmangle(classname);
+
+        IFile f = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(filePath));
+        // workspace relative then
+        if(f == null)
+        	f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
+        return f;
+    }
+
+    JSPSearchParticipant getSearchParticipant() {
+
+        if (this.fParticipant == null)
+            this.fParticipant = new JSPSearchParticipant();
+        return this.fParticipant;
+    }
+
+    // This is called from JSPPathIndexer
+    // pa_TODO
+    //how can we make sure participant indexLocations are updated at startup?
+    public final IPath computeIndexLocation(IPath containerPath) {
+
+        // pa_TODO there should be a non internal way to do this.
+        IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
+        SimpleLookupTable indexLocations = indexManager.indexLocations;
+
+        String indexLocation = null;
+        Object obj = indexLocations.get(containerPath);
+        if (obj != null) {
+            indexLocation = (String) obj;
+        } else {
+            // create index entry
+            String pathString = containerPath.toOSString();
+            this.fChecksumCalculator.reset();
+            this.fChecksumCalculator.update(pathString.getBytes());
+            String fileName = Long.toString(this.fChecksumCalculator.getValue()) + ".index"; //$NON-NLS-1$
+            // this is the only difference from
+            // IndexManager#computeIndexLocation(...)
+            indexLocation = getModelJspPluginWorkingLocation().append(fileName).toOSString();
+
+            // pa_TODO need to add to java path too, so JDT search support knows
+            // there should be a non internal way to do this.
+            indexLocations.put(containerPath, indexLocation);
+        }
+        return new Path(indexLocation);
+    }
+
+    // copied from JDT IndexManager
+    public IPath getModelJspPluginWorkingLocation() {
+
+        if (this.fJspPluginLocation != null)
+            return this.fJspPluginLocation;
+
+        IPath stateLocation = JSPCorePlugin.getDefault().getStateLocation();
+
+        // pa_TODO workaround for
+        // https://bugs.eclipse.org/bugs/show_bug.cgi?id=62267
+        // copied from IndexManager
+        String device = stateLocation.getDevice();
+        if (device != null && device.charAt(0) == '/')
+            stateLocation = stateLocation.setDevice(device.substring(1));
+
+        return this.fJspPluginLocation = stateLocation;
+    }
+
+    /**
+     * JSP Indexing and Search jobs check this
+     * 
+     * @return
+     */
+    public synchronized final void setCanceled(boolean cancel) {
+
+        fMonitor.setCanceled(cancel);
+    }
+
+    /**
+     * JSP Indexing and Search jobs check this
+     * 
+     * @return
+     */
+    public synchronized final boolean isCanceled() {
+
+        return fMonitor.isCanceled();
+    }
+
+    /**
+     * JSP Indexing and Search jobs check this
+     * 
+     * @return
+     */
+    public final IProgressMonitor getProgressMonitor() {
+
+        return this.fMonitor;
+    }
 }
\ No newline at end of file