RunService: allow passing arguments to executions

When running a class, you might want to pass some arguments. To be sure,
this is useful for two of our primary use cases: main methods & modules.

Author: ctrueden

src/main/java/org/scijava/command/run/CommandRunner.java

@@ -57,13 +57,13 @@ public class CommandRunner extends AbstractClassRunner {
 	// -- ClassRunner methods --
 
 	@Override
-	public void run(final Class<?> c) {
+	public void run(final Class<?> c, final Object... args) {
 		@SuppressWarnings("unchecked")
 		final Class<? extends Command> commandClass =  (Class<? extends Command>) c;
 		final Plugin annotation = c.getAnnotation(Plugin.class);
 		final CommandInfo info = new CommandInfo(commandClass, annotation);
 		pluginService.addPlugin(info);
-		commandService.run(info, true);
+		commandService.run(info, true, args);
 	}
 
 	// -- Typed methods --

src/main/java/org/scijava/main/run/MainRunner.java

@@ -55,9 +55,12 @@ public class MainRunner extends AbstractClassRunner {
 	// -- ClassRunner methods --
 
 	@Override
-	public void run(final Class<?> c) throws InvocationTargetException {
+	public void run(final Class<?> c, final Object... args)
+		throws InvocationTargetException
+	{
+		final Object[] sArgs = stringify(args);
 		try {
-			getMain(c).invoke(null, new Object[] { new String[0] });
+			getMain(c).invoke(null, new Object[] { sArgs });
 		}
 		catch (final IllegalArgumentException exc) {
 			throw new InvocationTargetException(exc);
@@ -90,4 +93,19 @@ private Method getMain(final Class<?> c) {
 		}
 	}
 
+	/** Ensures each element is a {@link String}. */
+	private String[] stringify(final Object... o) {
+		final String[] s;
+		if (o == null) s = null;
+		else {
+			s = new String[o.length];
+			for (int i = 0; i < o.length; i++) {
+				if (o[i] == null) s[i] = null;
+				else if (o[i] instanceof String) s[i] = (String) o[i];
+				else s[i] = o[i].toString();
+			}
+		}
+		return s;
+	}
+
 }

src/main/java/org/scijava/run/ClassRunner.java

@@ -52,7 +52,7 @@
  */
 public interface ClassRunner extends HandlerPlugin<Class<?>> {
 
-	/** Executes the given class. */
-	void run(Class<?> c) throws InvocationTargetException;
+	/** Executes the given class, with the specified arguments. */
+	void run(Class<?> c, Object... args) throws InvocationTargetException;
 
 }

src/main/java/org/scijava/run/DefaultRunService.java

@@ -55,7 +55,9 @@ public class DefaultRunService extends
 	// -- RunService methods --
 
 	@Override
-	public void run(final Class<?> c) throws InvocationTargetException {
+	public void run(final Class<?> c, final Object... args)
+		throws InvocationTargetException
+	{
 		for (final ClassRunner runner : getInstances()) {
 			if (runner.supports(c)) {
 				runner.run(c);

src/main/java/org/scijava/run/RunService.java

@@ -45,7 +45,10 @@ public interface RunService extends
 	HandlerService<Class<?>, ClassRunner>, SciJavaService
 {
 
-	/** Executes the given class using the most appropriate handler. */
-	void run(Class<?> c) throws InvocationTargetException;
+	/**
+	 * Executes the given class using the most appropriate handler, passing the
+	 * given arguments to the execution.
+	 */
+	void run(Class<?> c, Object... args) throws InvocationTargetException;
 
 }