ScriptInterpreter: remember the associated language

It simplifies things downstream to be able to query the associated
ScriptLanguage later, since it is known at construction time anyway.

This does *not* persist the most recently used interpreter language!

Author: ctrueden

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

@@ -42,20 +42,21 @@
  */
 public class DefaultScriptInterpreter implements ScriptInterpreter {
 
+	private final ScriptLanguage language;
 	private final ScriptEngine engine;
 	private final History history;
-	private String currentCommand = "";
 
 	/**
 	 * Constructs a new {@link DefaultScriptInterpreter}.
 	 * 
 	 * @param scriptService the script service
-	 * @param engine the script engine
+	 * @param language the script language
 	 */
 	public DefaultScriptInterpreter(final PrefService prefs,
-		final ScriptService scriptService, final ScriptEngine engine)
+		final ScriptService scriptService, final ScriptLanguage language)
 	{
-		this.engine = engine;
+		this.language = language;
+		engine = language.getScriptEngine();
 		history = new History(prefs, engine.getClass().getName());
 		readHistory();
 	}
@@ -74,7 +75,6 @@ public synchronized void writeHistory() {
 
 	@Override
 	public synchronized String walkHistory(final String currentCommand, boolean forward) {
-		this.currentCommand = currentCommand;
 		if (history == null) return currentCommand;
 		history.replace(currentCommand);
 		return forward ? history.next() : history.previous();
@@ -87,6 +87,11 @@ public void eval(String command) throws ScriptException {
 		engine.eval(command);
 	}
 
+	@Override
+	public ScriptLanguage getLanguage() {
+		return language;
+	}
+
 	@Override
 	public ScriptEngine getEngine() {
 		return engine;

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

@@ -69,6 +69,11 @@ public interface ScriptInterpreter {
 	 */
 	void eval(String command) throws ScriptException;
 
+	/**
+	 * Returns the associated {@link ScriptLanguage}.
+	 */
+	ScriptLanguage getLanguage();
+
 	/**
 	 * Returns the associated {@link ScriptEngine}.
 	 *