Wait for command or module execution to complete

CodeRunner plugins should fully execute their associated code,
blocking until execution is complete.

Author: ctrueden

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

@@ -55,15 +55,17 @@ public class CommandCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Object code, final Object... args) {
-		commandService.run(getCommandClass(code), true, args);
+	public void run(final Object code, final Object... args)
+		throws InvocationTargetException
+	{
+		waitFor(commandService.run(getCommandClass(code), true, args));
 	}
 
 	@Override
 	public void run(final Object code, final Map<String, Object> inputMap)
 		throws InvocationTargetException
 	{
-		commandService.run(getCommandClass(code), true, inputMap);
+		waitFor(commandService.run(getCommandClass(code), true, inputMap));
 	}
 
 	// -- Typed methods --

src/main/java/org/scijava/module/run/ModuleCodeRunner.java

@@ -57,15 +57,17 @@ public class ModuleCodeRunner extends AbstractCodeRunner {
 	// -- CodeRunner methods --
 
 	@Override
-	public void run(final Object code, final Object... args) {
-		moduleService.run(getModuleInfo(code), true, args);
+	public void run(final Object code, final Object... args)
+		throws InvocationTargetException
+	{
+		waitFor(moduleService.run(getModuleInfo(code), true, args));
 	}
 
 	@Override
 	public void run(final Object code, final Map<String, Object> inputMap)
 		throws InvocationTargetException
 	{
-		moduleService.run(getModuleInfo(code), true, inputMap);
+		waitFor(moduleService.run(getModuleInfo(code), true, inputMap));
 	}
 
 	// -- Typed methods --

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

@@ -31,6 +31,10 @@
 
 package org.scijava.run;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
 import org.scijava.plugin.AbstractHandlerPlugin;
 
 /**
@@ -49,4 +53,20 @@ public Class<Object> getType() {
 		return Object.class;
 	}
 
+	// -- Internal methods --
+
+	protected <T> T waitFor(final Future<T> future)
+		throws InvocationTargetException
+	{
+		try {
+			return future.get();
+		}
+		catch (final InterruptedException exc) {
+			throw new InvocationTargetException(exc);
+		}
+		catch (final ExecutionException exc) {
+			throw new InvocationTargetException(exc);
+		}
+	}
+
 }