Bug 550288 - [Quicksearch] Dialog shows "Searching..." even when there

are no search parameter

Drop work queue when stopping due to empty filter string.

Change-Id: I9e39eb948203352b63e09cad6193a2d0ceaf87e7
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>

4 files changed, 14 insertions, 3 deletions

diff --git a/org.eclipse.text.quicksearch/META-INF/MANIFEST.MF b/org.eclipse.text.quicksearch/META-INF/MANIFEST.MF
index dc662211d24..0ea61cc3796 100644
--- a/org.eclipse.text.quicksearch/META-INF/MANIFEST.MF
+++ b/org.eclipse.text.quicksearch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.text.quicksearch;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.text.quicksearch.internal.ui.QuickSearchActivator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.113.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
diff --git a/org.eclipse.text.quicksearch/pom.xml b/org.eclipse.text.quicksearch/pom.xml
index f4366726424..edde8f0eba5 100644
--- a/org.eclipse.text.quicksearch/pom.xml
+++ b/org.eclipse.text.quicksearch/pom.xml
@@ -20,6 +20,6 @@
 	</parent>
 	<groupId>org.eclipse.core</groupId>
 	<artifactId>org.eclipse.text.quicksearch</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextSearcher.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextSearcher.java
index cbed465c527..383bbbb425b 100644
--- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextSearcher.java
+++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextSearcher.java
@@ -243,6 +243,8 @@ public class QuickTextSearcher {
 				if (!query.isTrivial()) {
 					walker.init(); //Reinitialize the walker work queue to its starting state
 					walker.resume(); //Allow walker to resume when we release the scheduling rule.
+				} else {
+					walker.stop();
 				}
 			}
 		}
diff --git a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java
index 5d592e9b8b5..279c41551e7 100644
--- a/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java
+++ b/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/ResourceWalker.java
@@ -90,12 +90,21 @@ public abstract class ResourceWalker extends Job {
 	}
 
 	/**
+	 * Request that the walker stops walking at the next reasonable opportunity and drop
+	 * all pending workitems. The walker cannot be resumed and must be reinitialized.
+	 */
+	public void stop() {
+		this.queue = null;
+		this.suspend = false;
+	}
+
+	/**
 	 * Request the walker to be restarted... i.e. begin walking the resource tree from
 	 * the initial state.
 	 */
 
 	/**
-	 * Request that the walker be resumed. This clears the 'supsend' state if it is set
+	 * Request that the walker be resumed. This clears the 'suspend' state if it is set
 	 * and ensures that the Job is scheduled.
 	 */
 	public void resume() {