Fix some instances of bogus parameter filling

* If an input has been resolved already, do not overwrite.
* If the input type is super general -- e.g. an Object when the
  preprocessor fills in Context or UserInterface -- do not fill.

Author: ctrueden

src/main/java/org/scijava/module/DefaultModuleService.java

@@ -497,9 +497,8 @@ private ModuleItem<?> getSingleItem(final Module module,
 
 		for (final ModuleItem<?> item : items) {
 			final String name = item.getName();
-			final boolean resolved = module.isInputResolved(name);
-			if (resolved) continue; // skip resolved inputs
 			if (!item.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(name)) continue; // skip resolved inputs
 			final Class<?> itemType = item.getType();
 			for (final Class<?> type : types) {
 				if (type.isAssignableFrom(itemType)) {

src/main/java/org/scijava/module/process/GatewayPreprocessor.java

@@ -64,7 +64,8 @@ public class GatewayPreprocessor extends AbstractPreprocessorPlugin {
 	@Override
 	public void process(final Module module) {
 		for (final ModuleItem<?> input : module.getInfo().inputs()) {
-			if (!input.isAutoFill()) continue; // cannot auto-fill this input
+			if (!input.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(input.getName())) continue; // skip resolved inputs
 			final Class<?> type = input.getType();
 			if (Gateway.class.isAssignableFrom(type)) {
 				// input is a gateway

src/main/java/org/scijava/module/process/ServicePreprocessor.java

@@ -70,7 +70,8 @@ public class ServicePreprocessor extends AbstractPreprocessorPlugin {
 	@Override
 	public void process(final Module module) {
 		for (final ModuleItem<?> input : module.getInfo().inputs()) {
-			if (!input.isAutoFill()) continue; // cannot auto-fill this input
+			if (!input.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(input.getName())) continue; // skip resolved inputs
 			final Class<?> type = input.getType();
 			if (Service.class.isAssignableFrom(type)) {
 				// input is a service
@@ -79,7 +80,9 @@ public void process(final Module module) {
 					(ModuleItem<? extends Service>) input;
 				setServiceValue(getContext(), module, serviceInput);
 			}
-			if (type.isAssignableFrom(getContext().getClass())) {
+			if (Context.class.isAssignableFrom(type) && //
+				type.isAssignableFrom(getContext().getClass()))
+			{
 				// input is a compatible context
 				final String name = input.getName();
 				module.setInput(name, getContext());

src/main/java/org/scijava/ui/UIPreprocessor.java

@@ -62,9 +62,12 @@ public void process(final Module module) {
 		if (ui == null) return; // no default UI
 
 		for (final ModuleItem<?> input : module.getInfo().inputs()) {
-			if (!input.isAutoFill()) continue; // cannot auto-fill this input
+			if (!input.isAutoFill()) continue; // skip unfillable inputs
+			if (module.isInputResolved(input.getName())) continue; // skip resolved inputs
 			final Class<?> type = input.getType();
-			if (type.isAssignableFrom(ui.getClass())) {
+			if (UserInterface.class.isAssignableFrom(type) && //
+				type.isAssignableFrom(ui.getClass()))
+			{
 				// input is a compatible UI
 				final String name = input.getName();
 				module.setInput(name, ui);

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

@@ -129,5 +129,4 @@ public void testArrayAliases() throws ScriptException {
 
 		ctx.dispose();
 	}
-
 }