Disable searchers in the SearchOperation

When a Searcher is disabled, don't even call its search method.
That way, rogue Searchers cannot return results when disabled,
and Searchers do not require access to their SearchService.

Author: ctrueden

src/main/java/org/scijava/search/DefaultSearchOperation.java

@@ -25,6 +25,9 @@ public class DefaultSearchOperation implements SearchOperation {
 	private final SearchListener[] listeners;
 	private final List<SearchAttempt> currentSearches = new ArrayList<>();
 
+	@Parameter
+	private SearchService searchService;
+
 	@Parameter
 	private PluginService pluginService;
 
@@ -127,7 +130,10 @@ public void invalidate() {
 		@Override
 		public void run() {
 			final boolean exclusive = searcher.exclusive(query);
-			final List<SearchResult> results = searcher.search(query, fuzzy);
+			final boolean enabled = searchService.enabled(searcher);
+			if (!valid) return;
+			final List<SearchResult> results = enabled ? //
+				searcher.search(query, fuzzy) : Collections.emptyList();
 			if (!valid) return;
 			for (final SearchListener l : listeners) {
 				l.searchCompleted(new SearchEvent(searcher, results, exclusive));

src/main/java/org/scijava/search/module/ModuleSearcher.java

@@ -31,7 +31,6 @@
 
 package org.scijava.search.module;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -43,7 +42,6 @@
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.search.SearchResult;
-import org.scijava.search.SearchService;
 import org.scijava.search.Searcher;
 
 /**
@@ -62,9 +60,6 @@ public class ModuleSearcher implements Searcher {
 
 	@Parameter
 	private AppService appService;
-	
-	@Parameter
-	private SearchService searchService;
 
 	@Override
 	public String title() {
@@ -74,7 +69,6 @@ public String title() {
 
 	@Override
 	public List<SearchResult> search(final String text, final boolean fuzzy) {
-		if(!searchService.enabled(this)) return new ArrayList<>();
 		final String baseDir = //
 			appService.getApp().getBaseDirectory().getAbsolutePath();
 		return moduleService.getModules().stream() //

src/main/java/org/scijava/search/web/BISESearcher.java

@@ -4,16 +4,13 @@
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.scijava.plugin.Parameter;
 import org.scijava.search.SearchResult;
-import org.scijava.search.SearchService;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -27,19 +24,13 @@
  */
 //@Plugin(type = Searcher.class, name = "BISE")
 public class BISESearcher extends AbstractWebSearcher {
-	
-	@Parameter
-	private SearchService searchService;
 
 	public BISESearcher() {
 		super("BISE");
 	}
 
 	@Override
 	public List<SearchResult> search(final String text, final boolean fuzzy) {
-		
-		if(!searchService.enabled(this)) return new ArrayList<>();
-		
 		try {
 			// URL url = new URL("file:///c:/structure/temp/biii.eu_search2.html");
 			final URL url = new URL("http://biii.eu/search?search_api_fulltext=" +

src/main/java/org/scijava/search/web/ImageJForumSearcher.java

@@ -4,15 +4,12 @@
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Scanner;
 
-import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.search.SearchResult;
-import org.scijava.search.SearchService;
 import org.scijava.search.Searcher;
 
 /**
@@ -22,17 +19,13 @@
  */
 @Plugin(type = Searcher.class, name = "ImageJ Forum")
 public class ImageJForumSearcher extends AbstractWebSearcher {
-	
-	@Parameter
-	private SearchService searchService;
 
 	public ImageJForumSearcher() {
 		super("ImageJ Forum");
 	}
 
 	@Override
 	public List<SearchResult> search(final String text, final boolean fuzzy) {
-		if(!searchService.enabled(this)) return new ArrayList<>();
 		try {
 			final URL url = new URL("http://forum.imagej.net/search?q=" + URLEncoder
 				.encode(text) + "&source=imagej");

src/main/java/org/scijava/search/web/WikiSearcher.java

@@ -4,17 +4,14 @@
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.search.SearchResult;
-import org.scijava.search.SearchService;
 import org.scijava.search.Searcher;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -29,17 +26,13 @@
  */
 @Plugin(type = Searcher.class, name = "ImageJ Wiki")
 public class WikiSearcher extends AbstractWebSearcher {
-	
-	@Parameter
-	private SearchService searchService;
 
 	public WikiSearcher() {
 		super("ImageJ Wiki");
 	}
 
 	@Override
 	public List<SearchResult> search(final String text, final boolean fuzzy) {
-		if(!searchService.enabled(this)) return new ArrayList<>();
 		try {
 			final URL url = new URL(
 				"http://imagej.net/index.php?title=Special%3ASearch&search=" +