ScriptFinder: let the ctor take a Context instead

This is more flexible: if we need to require additional services later,
we will not have to modify the constructor signature again.

Author: ctrueden

src/main/java/org/scijava/script/DefaultScriptService.java

@@ -391,7 +391,7 @@ private synchronized void initScripts() {
 		final HashMap<String, ScriptInfo> map = new HashMap<>();
 
 		final ArrayList<ScriptInfo> scriptList = new ArrayList<>();
-		new ScriptFinder(this).findScripts(scriptList);
+		new ScriptFinder(context()).findScripts(scriptList);
 
 		for (final ScriptInfo info : scriptList) {
 			map.put(info.getPath(), info);

src/main/java/org/scijava/script/ScriptFinder.java

@@ -38,6 +38,7 @@
 import java.util.Set;
 
 import org.scijava.AbstractContextual;
+import org.scijava.Context;
 import org.scijava.MenuEntry;
 import org.scijava.MenuPath;
 import org.scijava.log.LogService;
@@ -59,14 +60,14 @@ public class ScriptFinder extends AbstractContextual {
 
 	private static final String SCRIPT_ICON = "/icons/script_code.png";
 
-	private final ScriptService scriptService;
+	@Parameter
+	private ScriptService scriptService;
 
 	@Parameter
 	private LogService log;
 
-	public ScriptFinder(final ScriptService scriptService) {
-		this.scriptService = scriptService;
-		setContext(scriptService.getContext());
+	public ScriptFinder(final Context context) {
+		setContext(context);
 	}
 
 	// -- ScriptFinder methods --
@@ -161,4 +162,12 @@ else if (scriptService.canHandleFile(file)) {
 		return info;
 	}
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link #ScriptFinder(Context)} instead. */
+	@Deprecated
+	public ScriptFinder(final ScriptService scriptService) {
+		this(scriptService.context());
+	}
+
 }

src/test/java/org/scijava/script/ScriptFinderTest.java

@@ -192,7 +192,7 @@ private ScriptService createScriptService() {
 	}
 
 	private ArrayList<ScriptInfo> findScripts(final ScriptService scriptService) {
-		final ScriptFinder scriptFinder = new ScriptFinder(scriptService);
+		final ScriptFinder scriptFinder = new ScriptFinder(scriptService.context());
 		final ArrayList<ScriptInfo> scripts = new ArrayList<>();
 		scriptFinder.findScripts(scripts);
 		Collections.sort(scripts);