Fix up search-closing logic of actions

It is easier to read if the "closesSearch" flag is passed before the
lambda. That way, the lambda is the final thing in the declaration,
and the flag is less easily missed when studying the code.

Author: ctrueden

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

@@ -37,15 +37,15 @@
 public class DefaultSearchAction implements SearchAction {
 
 	private final String label;
+	private final boolean closesSearch;
 	private final Runnable r;
-	private final boolean closeSearch;
 
-	public DefaultSearchAction(final String label, final Runnable r,
-		final boolean closeSearch)
+	public DefaultSearchAction(final String label, final boolean closesSearch,
+		final Runnable r)
 	{
 		this.label = label;
 		this.r = r;
-		this.closeSearch = closeSearch;
+		this.closesSearch = closesSearch;
 	}
 
 	@Override
@@ -59,7 +59,7 @@ public void run() {
 	}
 
 	@Override
-	public boolean willCloseSearch() {
-		return closeSearch;
+	public boolean closesSearch() {
+		return closesSearch;
 	}
 }

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

@@ -40,9 +40,8 @@
  * @see SearchService#actions(SearchResult)
  */
 public interface SearchAction extends Runnable {
-	// NB: No implementation needed.
 
-	default boolean willCloseSearch() {
+	default boolean closesSearch() {
 		return true;
 	}
 }

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

@@ -55,9 +55,9 @@ public boolean supports(final SearchResult result) {
 
 	@Override
 	public SearchAction create(final SearchResult result) {
-		return new DefaultSearchAction("Help", () -> {
+		return new DefaultSearchAction("Help", false, () -> {
 			uiService.showDialog("TODO: help with module: " +
 				((ModuleSearchResult) result).info().getTitle());
-		}, false);
+		});
 	}
 }

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

@@ -56,8 +56,7 @@ public boolean supports(final SearchResult result) {
 
 	@Override
 	public SearchAction create(final SearchResult result) {
-		return new DefaultSearchAction("Run", () -> {
-			moduleService.run(((ModuleSearchResult) result).info(), true);
-		}, true);
+		return new DefaultSearchAction("Run", true, //
+			() -> moduleService.run(((ModuleSearchResult) result).info(), true));
 	}
 }

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

@@ -55,9 +55,9 @@ public boolean supports(final SearchResult result) {
 
 	@Override
 	public SearchAction create(final SearchResult result) {
-		return new DefaultSearchAction("Source", () -> {
+		return new DefaultSearchAction("Source", true, () -> {
 			uiService.showDialog("TODO: source for module: " +
 				((ModuleSearchResult) result).info().getTitle());
-		}, true);
+		});
 	}
 }

src/main/java/org/scijava/search/snippet/RunSnippetActionFactory.java

@@ -66,9 +66,9 @@ public SearchAction create(final SearchResult result) {
 			repl.initialize(); // TODO: initialize(false) once it exists.
 		}
 
-		return new DefaultSearchAction("Evaluate", () -> {
+		return new DefaultSearchAction("Evaluate", true, () -> {
 			repl.lang(snippetResult.language().getLanguageName());
 			repl.evaluate(snippetResult.snippet());
-		}, true);
+		});
 	}
 }

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

@@ -62,8 +62,8 @@ public boolean supports(final SearchResult result) {
 
 	@Override
 	public SearchAction create(final SearchResult result) {
-		return new DefaultSearchAction("Open in Browser", //
-			() -> openURL(result), true);
+		return new DefaultSearchAction("Open in Browser", true, //
+			() -> openURL(result));
 	}
 
 	private void openURL(final SearchResult result) {

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

@@ -516,7 +516,7 @@ public void mouseMoved(final MouseEvent e) {
 						final JButton button = new JButton(action.toString());
 						button.addActionListener(ae -> {
 							action.run();
-							if (action.willCloseSearch()) {
+							if (action.closesSearch()) {
 								reset();
 							}
 						});