Add needed imports and remove unused imports

karlduderstadt · karlduderstadt · commit f37550c11183 · 2021-12-18T17:42:16.000+01:00
diff --git a/src/main/java/org/scijava/plugins/scripting/python/PythonScriptEngine.java b/src/main/java/org/scijava/plugins/scripting/python/PythonScriptEngine.java
@@ -29,8 +29,16 @@
 
 package org.scijava.plugins.scripting.python;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.script.ScriptException;
 import org.scijava.script.AbstractScriptEngine;
+import org.scijava.Context;
+import org.scijava.object.ObjectService;
+import org.scijava.plugin.Parameter;
 import org.scijava.plugins.scripting.python.PythonScriptRunner;
 
 /**
@@ -51,26 +59,26 @@ public PythonScriptEngine(Context context) {
 
 	@Override
 	public Object eval(String script) throws ScriptException {
-		Map<String, Object> vars;
+		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);
 	}
 
 	@Override
-		public Object eval(Reader reader) throws ScriptException {
-			StringBuilder buf = new StringBuilder();
-			char [] cbuf = new char [65536];
-			while (true) {
-				try {
-					int nChars = reader.read(cbuf);
-					if (nChars <= 0) break;
-					buf.append(cbuf, 0, nChars);
-				} catch (IOException e) {
-					throw new ScriptException(e);
-				}
+	public Object eval(Reader reader) throws ScriptException {
+		StringBuilder buf = new StringBuilder();
+		char [] cbuf = new char [65536];
+		while (true) {
+			try {
+				int nChars = reader.read(cbuf);
+				if (nChars <= 0) break;
+				buf.append(cbuf, 0, nChars);
+			} catch (IOException e) {
+				throw new ScriptException(e);
 			}
-			return eval(buf.toString());
+		}
+		return eval(buf.toString());
 	}
 
 }
diff --git a/src/main/java/org/scijava/plugins/scripting/python/PythonScriptLanguage.java b/src/main/java/org/scijava/plugins/scripting/python/PythonScriptLanguage.java
@@ -29,19 +29,12 @@
 
 package org.scijava.plugins.scripting.python;
 
-import java.security.CodeSource;
-
-import javax.script.CompiledScript;
-import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
-import javax.script.ScriptException;
 
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.AdaptedScriptLanguage;
 import org.scijava.script.ScriptLanguage;
-import org.scijava.util.ClassUtils;
-import org.scijava.util.Types;
 
 /**
  * An adapter for conda-based python to the SciJava scripting interface.
@@ -53,6 +46,11 @@
 @Plugin(type = ScriptLanguage.class, name = "Python 3", priority = Priority.HIGH)
 public class PythonScriptLanguage extends AdaptedScriptLanguage {
 
+	public PythonScriptLanguage(String factoryName) {
+		super(factoryName);
+		// TODO Auto-generated constructor stub
+	}
+
 	@Override
 	public ScriptEngine getScriptEngine() {
 		return new PythonScriptEngine(getContext());
diff --git a/src/main/java/org/scijava/plugins/scripting/python/PythonScriptRunner.java b/src/main/java/org/scijava/plugins/scripting/python/PythonScriptRunner.java
@@ -29,6 +29,8 @@
 
 package org.scijava.plugins.scripting.python;
 
+import java.util.Map;
+
 /**
  * Interface for conda-based python script running implementations.
  *

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`
`30`	`30`	`package org.scijava.plugins.scripting.python;`
`31`	`31`
	`32`	`+import java.util.Map;`
	`33`	`+`
`32`	`34`	`/**`
`33`	`35`	`* Interface for conda-based python script running implementations.`
`34`	`36`	`*`