searchbar: enable/disable searchers

Author: frauzufall

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

@@ -31,6 +31,7 @@
 
 package org.scijava.search.module;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +43,7 @@
 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;
 
 /**
@@ -60,6 +62,9 @@ public class ModuleSearcher implements Searcher {
 
 	@Parameter
 	private AppService appService;
+	
+	@Parameter
+	private SearchService searchService;
 
 	@Override
 	public String title() {
@@ -69,6 +74,7 @@ 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/snippet/SnippetSearcher.java

@@ -42,6 +42,7 @@
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
 import org.scijava.search.SearchResult;
+import org.scijava.search.SearchService;
 import org.scijava.search.Searcher;
 
 /**
@@ -54,6 +55,9 @@ public class SnippetSearcher implements Searcher {
 
 	@Parameter
 	private ScriptService scriptService;
+	
+	@Parameter
+	private SearchService searchService;
 
 	@Override
 	public String title() {
@@ -68,6 +72,7 @@ public boolean exclusive(final String text) {
 
 	@Override
 	public List<SearchResult> search(final String text, final boolean fuzzy) {
+		if(!searchService.enabled(this)) return new ArrayList<>();
 		if (text.startsWith("#!")) {
 			final String[] tokens = text.split("\\s", 2);
 			if (tokens.length < 2) return Collections.emptyList();

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

@@ -4,13 +4,16 @@
 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;
@@ -24,13 +27,19 @@
  */
 //@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,12 +4,15 @@
 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;
 
 /**
@@ -19,13 +22,17 @@
  */
 @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,14 +4,17 @@
 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;
@@ -26,13 +29,17 @@
  */
 @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=" +

src/main/java/org/scijava/ui/swing/search/SwingSearchBar.java

@@ -273,7 +273,7 @@ public SwingSearchPanel() {
 				if (isHeader(value)) {
 					final Searcher searcher = ((SearchResultHeader) value).searcher();
 					final JCheckBox headerBox = //
-						new JCheckBox(searcher.title(), searcher.enabled());
+						new JCheckBox(searcher.title(), searchService.enabled(searcher));
 					headerBox.setFont(smaller(headerBox.getFont(), 2));
 					headerBox.setBackground(HEADER_COLOR);
 					headerCheckboxes.put(searcher.getClass(), headerBox);
@@ -322,13 +322,9 @@ public SwingSearchPanel() {
 				final SearchResult result = resultsList.getSelectedValue();
 				if (result == null || isHeader(result)) {
 					if (result != null) {
-						final JCheckBox checkBox = headerCheckboxes.get(
-							((SearchResultHeader) result).searcher().getClass());
-						System.out.println("GOT A CHECKBOX: " + checkBox);
-						checkBox.setSelected(!checkBox.isSelected());
-						checkBox.repaint();
-						resultsList.repaint();
-						System.out.println("TOGGLED IT: state -> " + checkBox.isSelected());
+						final Searcher searcher = ((SearchResultHeader) result).searcher();
+						searchService.setEnabled(searcher, !searchService.enabled(searcher));
+						SwingSearchBar.this.search();
 					}
 
 					// clear details pane
@@ -472,15 +468,16 @@ private void rebuild() {
 				// Look up the results list.
 				final List<SearchResult> completeResults = //
 					allResults.get(searcher.getClass()).results();
+				
+				// Add section header.
+				listModel.addElement(new SearchResultHeader(searcher));
+				
 				if (completeResults.isEmpty()) continue;
 
 				// Limit to the top MAX_RESULTS matches only.
 				final List<SearchResult> results = completeResults.stream() //
 					.limit(MAX_RESULTS).collect(Collectors.toList());
 
-				// Add section header.
-				listModel.addElement(new SearchResultHeader(searcher));
-
 				// Add results as entries.
 				for (final SearchResult result : results) {
 					listModel.addElement(result);