Let the bindings accept the current ScriptModule instance

dscho · dscho · commit b351c2db459b · 2014-05-26T11:08:26.000-05:00
We recently improved the Scripting engine to accomodate the needs of the ImageJ 1.x macro engine with regards to @parameter annotations. The major change was that the current ScriptModule instance is made available to the engine bindings. However, the Java script engine is a slightly different beast and needs to make sure that no unexpected bindings are set (because they cannot be used by the 'script'). Let's play nice and just ignore the binding. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/src/main/java/org/scijava/plugins/scripting/java/JavaEngineBindings.java b/src/main/java/org/scijava/plugins/scripting/java/JavaEngineBindings.java
@@ -39,6 +39,8 @@
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
 
+import org.scijava.script.ScriptModule;
+
 /**
  * TODO
  * 
@@ -85,7 +87,8 @@ public Set<Entry<String, Object>> entrySet() {
 
 	@Override
 	public Object put(String name, Object value) {
-		if (!name.equals(ScriptEngine.FILENAME) && !name.equals("IJ")) {
+		if (!name.equals(ScriptEngine.FILENAME) && !name.equals("IJ") &&
+				!name.equals(ScriptModule.class.getName())) {
 			throw new UnsupportedOperationException();
 		}
 		return map.put(name, value);
