Cache ScriptModule

The ScriptModule is always passed to the bindings, but this will fail
if we aren't running inside MATLAB - as the object can not be passed
across JVMs.

So let's keep a local copy of it that can at least be used on this side
of the JVM.

Author: hinerm

src/main/java/org/scijava/plugins/scripting/matlab/MATLABBindings.java

@@ -49,6 +49,7 @@
 import org.scijava.log.LogService;
 import org.scijava.options.OptionsService;
 import org.scijava.plugin.Parameter;
+import org.scijava.script.ScriptModule;
 
 /**
  * A {@link Bindings} wrapper around MATLAB's local variables.
@@ -73,6 +74,8 @@ public class MATLABBindings implements Bindings {
 	private final Set<String> keys = new HashSet<String>();
 	private final Set<Object> values = new HashSet<Object>();
 	private final Map<String, Object> entries = new HashMap<String, Object>();
+	private String scriptModuleKey = ScriptModule.class.getName();
+	private Object scriptModule = null;
 
 	// -- Map API --
 
@@ -108,6 +111,7 @@ public void clear() {
 	public Set<String> keySet() {
 		keys.clear();
 		keys.addAll(Arrays.asList(getVars()));
+		if (scriptModule != null) keys.add(scriptModuleKey);
 
 		return keys;
 	}
@@ -136,6 +140,12 @@ public Set<java.util.Map.Entry<String, Object>> entrySet() {
 	public Object put(final String name, final Object value) {
 		final MatlabProxy proxy = MATLABControlUtils.proxy(opts());
 
+		// If we aren't inside MATLAB we cache the ScriptModule in the local JVM
+		// Because MATLAB is running in a separate JVM we can not pass it a
+		// ScriptModule instance.
+		if (!proxy.isRunningInsideMatlab() &&
+			name.equals(scriptModuleKey)) return (scriptModule = value);
+
 		// Try special MATLAB data types
 		if (value != null) {
 			MatlabNumericArray arrayVal = null;
@@ -215,6 +225,8 @@ private Object retrieveValue(final Object key, final boolean remove) {
 		final String k = (String) key;
 		final MatlabProxy proxy = MATLABControlUtils.proxy(opts());
 
+		if (!proxy.isRunningInsideMatlab() && k.equals(scriptModuleKey)) return scriptModule;
+
 		Object v = null;
 		try {
 			v = proxy.getVariable(k);