ModuleInfo: add a loadDelegateClass() method

This makes it easier to more consistently and safely obtain the Class<?>
object associated with the meat of the module being described.

Previously, you could call getDelegateClassName() but then there was no
safe way, in general, to load that class in all situations

Previously, you could call getDelegateClassName() but then there was
no safe way, in general, to load that class in all situations.

Author: ctrueden

src/main/java/org/scijava/command/CommandInfo.java

@@ -297,6 +297,18 @@ public String getDelegateClassName() {
 		return getClassName();
 	}
 
+	@Override
+	public Class<?> loadDelegateClass() throws ClassNotFoundException {
+		try {
+			return loadClass();
+		}
+		catch (final InstantiableException exc) {
+			final ClassNotFoundException cnfe = new ClassNotFoundException();
+			cnfe.initCause(exc);
+			throw cnfe;
+		}
+	}
+
 	@Override
 	public Module createModule() throws ModuleException {
 		// if the command implements Module, return a new instance directly

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

@@ -95,6 +95,11 @@ public String getDelegateClassName() {
 		return getModuleClass().getName();
 	}
 
+	@Override
+	public Class<?> loadDelegateClass() {
+		return getModuleClass();
+	}
+
 	@Override
 	public Module createModule() throws ModuleException {
 		try {

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

@@ -94,6 +94,15 @@ public interface ModuleInfo extends UIDetails, Validated {
 	 */
 	String getDelegateClassName();
 
+	/**
+	 * Loads the class containing the module's actual implementation. The name of
+	 * the loaded class will match the value returned by
+	 * {@link #getDelegateClassName()}.
+	 * 
+	 * @see org.scijava.Instantiable#loadClass()
+	 */
+	Class<?> loadDelegateClass() throws ClassNotFoundException;
+
 	/** Instantiates the module described by this module info. */
 	Module createModule() throws ModuleException;
 

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

@@ -236,6 +236,11 @@ public String getDelegateClassName() {
 		return ScriptModule.class.getName();
 	}
 
+	@Override
+	public Class<?> loadDelegateClass() {
+		return ScriptModule.class;
+	}
+
 	@Override
 	public ScriptModule createModule() throws ModuleException {
 		return new ScriptModule(this);