Merge pull request #85 from scijava/macro-options

Support implicit script parameters

Author: ctrueden

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

@@ -343,17 +343,23 @@ private void assignInputs(final Module module,
 
 		for (final String name : inputMap.keySet()) {
 			final ModuleItem<?> input = module.getInfo().getInput(name);
+			final Object value = inputMap.get(name);
+			final Object converted;
 			if (input == null) {
-				log.error("No such input: " + name);
-				continue;
+				// inputs whose name starts with a dot are implicitly known by convention
+				if (!name.startsWith(".")) {
+					log.warn("Unmatched input: " + name);
+				}
+				converted = value;
 			}
-			final Object value = inputMap.get(name);
-			final Class<?> type = input.getType();
-			final Object converted = ConversionUtils.convert(value, type);
-			if (value != null && converted == null) {
-				log.error("For input " + name + ": incompatible object " +
-					value.getClass().getName() + " for type " + type.getName());
-				continue;
+			else {
+				final Class<?> type = input.getType();
+				converted = ConversionUtils.convert(value, type);
+				if (value != null && converted == null) {
+					log.error("For input " + name + ": incompatible object " +
+						value.getClass().getName() + " for type " + type.getName());
+					continue;
+				}
 			}
 			module.setInput(name, converted);
 			module.setResolved(name, true);

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

@@ -40,6 +40,11 @@
  * A ModuleInfo object encapsulates metadata about a particular {@link Module}
  * (but not a specific instance of it). In particular, it can report details on
  * the names and types of inputs and outputs.
+ * <p>
+ * A special class of implicit input parameters is available: when the
+ * {@code name} starts with a dot (e.g. {@code .helloWorld}), no warning is
+ * issued about an unmatched input.
+ * </p>
  * 
  * @author Aivar Grislis
  * @author Curtis Rueden

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

@@ -56,6 +56,10 @@
 
 /**
  * Metadata about a script.
+ * <p>
+ * This class is responsible for parsing the script for parameters. See
+ * {@link #parseParameters()} for details.
+ * </p>
  * 
  * @author Curtis Rueden
  * @author Johannes Schindelin