Merge pull request #377 from scijava/fix-autofill-in-scripts

Respect autoFill parameter in script parameters

Author: ctrueden

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

@@ -54,6 +54,7 @@ public class DefaultMutableModuleItem<T> extends AbstractModuleItem<T>
 	private final Type genericType;
 	private ItemIO ioType;
 	private ItemVisibility visibility;
+	private boolean autoFill;
 	private boolean required;
 	private boolean persisted;
 	private String persistKey;
@@ -88,6 +89,7 @@ public DefaultMutableModuleItem(final ModuleInfo info, final String name,
 		genericType = type;
 		ioType = super.getIOType();
 		visibility = super.getVisibility();
+		autoFill = super.isAutoFill();
 		required = super.isRequired();
 		persisted = super.isPersisted();
 		persistKey = super.getPersistKey();
@@ -115,6 +117,7 @@ public DefaultMutableModuleItem(final ModuleInfo info,
 		genericType = item.getGenericType();
 		ioType = item.getIOType();
 		visibility = item.getVisibility();
+		autoFill = item.isAutoFill();
 		required = item.isRequired();
 		persisted = item.isPersisted();
 		persistKey = item.getPersistKey();
@@ -146,6 +149,11 @@ public void setVisibility(final ItemVisibility visibility) {
 		this.visibility = visibility;
 	}
 
+	@Override
+	public void setAutoFill(final boolean autoFill) {
+		this.autoFill = autoFill;
+	}
+
 	@Override
 	public void setRequired(final boolean required) {
 		this.required = required;
@@ -244,6 +252,11 @@ public ItemVisibility getVisibility() {
 		return visibility;
 	}
 
+	@Override
+	public boolean isAutoFill() {
+		return autoFill;
+	}
+
 	@Override
 	public boolean isRequired() {
 		return required;

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

@@ -49,6 +49,8 @@ public interface MutableModuleItem<T> extends ModuleItem<T> {
 
 	void setVisibility(ItemVisibility visibility);
 
+	void setAutoFill(boolean autoFill);
+
 	void setRequired(boolean required);
 
 	void setPersisted(boolean persisted);

src/main/java/org/scijava/script/process/ParameterScriptProcessor.java

@@ -270,6 +270,7 @@ private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
 		else if (is(k, "max")) item.setMaximumValue(as(v, item.getType()));
 		else if (is(k, "min")) item.setMinimumValue(as(v, item.getType()));
 		else if (is(k, "name")) item.setName(as(v, String.class));
+		else if (is(k, "autoFill")) item.setAutoFill(as(v, boolean.class));
 		else if (is(k, "persist")) item.setPersisted(as(v, boolean.class));
 		else if (is(k, "persistKey")) item.setPersistKey(as(v, String.class));
 		else if (is(k, "required")) item.setRequired(as(v, boolean.class));

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

@@ -252,13 +252,14 @@ public void testVersion() throws IOException {
 	@Test
 	public void testParameters() {
 		final String script = "" + //
-			"% @LogService(required = false) log\n" + //
-			"% @int(label=\"Slider Value\", softMin=5, softMax=15, " + //
+			"#@ LogService (required = false) log\n" + //
+			"#@ int (label=\"Slider Value\", softMin=5, softMax=15, " + //
 			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
-			"% @String(persist = false, family='Carnivora', " + //
+			"#@ String (persist = false, family='Carnivora', " + //
 			"choices={'quick brown fox', 'lazy dog'}) animal\n" + //
-			"% @String(visibility=MESSAGE) msg\n" + //
-			"% @BOTH java.lang.StringBuilder buffer";
+			"#@ Double (autoFill = false) notAutoFilled\n" + //
+			"#@ String (visibility=MESSAGE) msg\n" + //
+			"#@BOTH java.lang.StringBuilder buffer";
 
 		final ScriptInfo info =
 			new ScriptInfo(context, "params.bsizes", new StringReader(script));
@@ -280,6 +281,9 @@ public void testParameters() {
 			null, null, null, null, null, null, null, null, animalChoices, animal);
 		assertEquals(animal.get("family"), "Carnivora"); // test custom attribute
 
+		final ModuleItem<?> notAutoFilled = info.getInput("notAutoFilled");
+		assertFalse(notAutoFilled.isAutoFill());
+
 		final ModuleItem<?> msg = info.getInput("msg");
 		assertSame(ItemVisibility.MESSAGE, msg.getVisibility());
 
@@ -288,7 +292,7 @@ public void testParameters() {
 			null, null, null, null, null, null, null, null, noChoices, buffer);
 
 		int inputCount = 0;
-		final ModuleItem<?>[] inputs = { log, sliderValue, animal, msg, buffer };
+		final ModuleItem<?>[] inputs = { log, sliderValue, animal, notAutoFilled, msg, buffer };
 		for (final ModuleItem<?> inItem : info.inputs()) {
 			assertSame(inputs[inputCount++], inItem);
 		}
@@ -404,7 +408,7 @@ public List<String> getExtensions() {
 		}
 	}
 
-	// -- Test script langauge --
+	// -- Test script language --
 
 	private static class BindingSizesEngine extends AbstractScriptEngine {