implement AbstractScriptEngine methods, add py extension

Author: karlduderstadt

src/main/java/org/scijava/plugins/scripting/python/PythonScriptEngine.java

@@ -31,12 +31,16 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
+import javax.script.Bindings;
 import javax.script.ScriptException;
 import org.scijava.script.AbstractScriptEngine;
 import org.scijava.Context;
+import org.scijava.log.LogService;
 import org.scijava.object.ObjectService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugins.scripting.python.PythonScriptRunner;
@@ -52,17 +56,19 @@ public class PythonScriptEngine extends AbstractScriptEngine {
 
 	@Parameter
 	ObjectService objectService;
+	
+	@Parameter
+	LogService logService;
 
 	public PythonScriptEngine(Context context) {
 		context.inject(this);
+		setLogService(logService);
+		engineScopeBindings = new ScriptBindings();
 	}
 
 	@Override
 	public Object eval(String script) throws ScriptException {
-		Map<String, Object> vars = new HashMap<String, Object>();
-		//parse script parameters and build input map Map<String, Object> vars
-
-		return objectService.getObjects(PythonScriptRunner.class).stream().findAny().get().run(script, vars);
+		return objectService.getObjects(PythonScriptRunner.class).stream().findAny().get().run(script, engineScopeBindings);
 	}
 
 	@Override
@@ -81,4 +87,78 @@ public Object eval(Reader reader) throws ScriptException {
 		return eval(buf.toString());
 	}
 
+	@Override
+	public Bindings createBindings() {
+		return new ScriptBindings();
+	}
+	
+	//Somehow just type casting did not work...
+	class ScriptBindings implements Bindings {
+		
+		private Map<String, Object> bindingsMap; 
+		
+		ScriptBindings() {
+			bindingsMap = new HashMap<String, Object>();
+		}
+
+		@Override
+		public int size() {
+			return bindingsMap.size();
+		}
+
+		@Override
+		public boolean isEmpty() {
+			return bindingsMap.isEmpty();
+		}
+
+		@Override
+		public boolean containsValue(Object value) {
+			return bindingsMap.containsValue(value);
+		}
+
+		@Override
+		public void clear() {
+			bindingsMap.clear();
+		}
+
+		@Override
+		public Set<String> keySet() {
+			return bindingsMap.keySet();
+		}
+
+		@Override
+		public Collection<Object> values() {
+			return bindingsMap.values();
+		}
+
+		@Override
+		public Set<Entry<String, Object>> entrySet() {
+			return bindingsMap.entrySet();
+		}
+
+		@Override
+		public Object put(String name, Object value) {
+			return bindingsMap.put(name, value);
+		}
+
+		@Override
+		public void putAll(Map<? extends String, ? extends Object> toMerge) {
+			bindingsMap.putAll(toMerge);
+		}
+
+		@Override
+		public boolean containsKey(Object key) {
+			return bindingsMap.containsKey(key);
+		}
+
+		@Override
+		public Object get(Object key) {
+			return bindingsMap.get(key);
+		}
+
+		@Override
+		public Object remove(Object key) {
+			return bindingsMap.remove(key);
+		}
+	}
 }

src/main/java/org/scijava/plugins/scripting/python/PythonScriptLanguage.java

@@ -29,9 +29,11 @@
 
 package org.scijava.plugins.scripting.python;
 
+import java.util.Arrays;
+import java.util.List;
+
 import javax.script.ScriptEngine;
 
-import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.AbstractScriptLanguage;
 import org.scijava.script.ScriptLanguage;
@@ -43,11 +45,17 @@
  * @author Karl Duderstadt
  * @see ScriptEngine
  */
-@Plugin(type = ScriptLanguage.class, name = "Python 3", priority = Priority.HIGH)
+@Plugin(type = ScriptLanguage.class, name = "Python 3")
 public class PythonScriptLanguage extends AbstractScriptLanguage {
 
 	@Override
 	public ScriptEngine getScriptEngine() {
 		return new PythonScriptEngine(getContext());
 	}
+	
+	@Override
+	public List<String> getExtensions() {
+		return Arrays.asList("py");
+	}
+	
 }