RunService: use InvocationTargetException instead

The code migrated from scijava/scripting-java used ScriptException.
But now that this code is part of core SJC, and is not script-specific
anymore, it makes more sense to use InvocationTargetException instead.

Author: ctrueden

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

@@ -34,8 +34,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import javax.script.ScriptException;
-
 import org.scijava.Priority;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
@@ -57,18 +55,15 @@ public class MainRunner extends AbstractClassRunner {
 	// -- ClassRunner methods --
 
 	@Override
-	public void run(final Class<?> c) throws ScriptException {
+	public void run(final Class<?> c) throws InvocationTargetException {
 		try {
 			getMain(c).invoke(null, new Object[] { new String[0] });
 		}
 		catch (final IllegalArgumentException exc) {
-			throw new ScriptException(exc);
+			throw new InvocationTargetException(exc);
 		}
 		catch (final IllegalAccessException exc) {
-			throw new ScriptException(exc);
-		}
-		catch (final InvocationTargetException exc) {
-			throw new ScriptException(exc);
+			throw new InvocationTargetException(exc);
 		}
 	}
 

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

@@ -31,7 +31,7 @@
 
 package org.scijava.run;
 
-import javax.script.ScriptException;
+import java.lang.reflect.InvocationTargetException;
 
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
@@ -53,6 +53,6 @@
 public interface ClassRunner extends HandlerPlugin<Class<?>> {
 
 	/** Executes the given class. */
-	void run(Class<?> c) throws ScriptException;
+	void run(Class<?> c) throws InvocationTargetException;
 
 }

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

@@ -31,7 +31,7 @@
 
 package org.scijava.run;
 
-import javax.script.ScriptException;
+import java.lang.reflect.InvocationTargetException;
 
 import org.scijava.log.LogService;
 import org.scijava.plugin.AbstractHandlerService;
@@ -55,14 +55,14 @@ public class DefaultRunService extends
 	// -- RunService methods --
 
 	@Override
-	public void run(final Class<?> c) throws ScriptException {
+	public void run(final Class<?> c) throws InvocationTargetException {
 		for (final ClassRunner runner : getInstances()) {
 			if (runner.supports(c)) {
 				runner.run(c);
 				return;
 			}
 		}
-		log.error("Unknown class type: " + c.getName());
+		throw new IllegalArgumentException("Unknown class type: " + c.getName());
 	}
 
 	// -- PTService methods --

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

@@ -31,7 +31,7 @@
 
 package org.scijava.run;
 
-import javax.script.ScriptException;
+import java.lang.reflect.InvocationTargetException;
 
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
@@ -46,6 +46,6 @@ public interface RunService extends
 {
 
 	/** Executes the given class using the most appropriate handler. */
-	void run(Class<?> c) throws ScriptException;
+	void run(Class<?> c) throws InvocationTargetException;
 
 }