Move ScriptModule#getLanguage() into ScriptInfo

For a given script, which language to use is a constant. It should
be part of the script _metadata_, not the script module _instance_.

Author: ctrueden

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.63.1-SNAPSHOT</version>
+	<version>2.64.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

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

@@ -101,6 +101,9 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
 	/** True iff the return value should be appended as an output. */
 	private boolean appendReturnValue;
 
+	/** Script language in which the script should be executed. */
+	private ScriptLanguage scriptLanguage;
+
 	/**
 	 * Creates a script metadata object which describes the given script file.
 	 * 
@@ -224,6 +227,22 @@ public BufferedReader getReader() {
 		return new BufferedReader(new StringReader(script), PARAM_CHAR_MAX);
 	}
 
+	/** Gets the scripting language of the script. */
+	public ScriptLanguage getLanguage() {
+		if (scriptLanguage == null) {
+			// infer the language from the script path's extension
+			final String scriptPath = getPath();
+			final String extension = FileUtils.getExtension(scriptPath);
+			scriptLanguage = scriptService.getLanguageByExtension(extension);
+		}
+		return scriptLanguage;
+	}
+
+	/** Overrides the script language to use when executing the script. */
+	public void setLanguage(final ScriptLanguage scriptLanguage) {
+		this.scriptLanguage = scriptLanguage;
+	}
+
 	/**
 	 * Parses the script's input and output parameters from the script header.
 	 * <p>

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

@@ -50,7 +50,6 @@
 import org.scijava.module.Module;
 import org.scijava.module.ModuleItem;
 import org.scijava.plugin.Parameter;
-import org.scijava.util.FileUtils;
 
 /**
  * A {@link Module} which executes a script.
@@ -76,9 +75,6 @@ public class ScriptModule extends AbstractModule implements Contextual {
 	@Parameter
 	private LogService log;
 
-	/** Script language in which the script should be executed. */
-	private ScriptLanguage scriptLanguage;
-
 	/** Script engine with which the script should be executed. */
 	private ScriptEngine scriptEngine;
 
@@ -96,22 +92,6 @@ public ScriptModule(final ScriptInfo info) {
 
 	// -- ScriptModule methods --
 
-	/** Gets the scripting language of the script. */
-	public ScriptLanguage getLanguage() {
-		if (scriptLanguage == null) {
-			// infer the language from the script path's extension
-			final String path = getInfo().getPath();
-			final String extension = FileUtils.getExtension(path);
-			scriptLanguage = scriptService.getLanguageByExtension(extension);
-		}
-		return scriptLanguage;
-	}
-
-	/** Overrides the script language to use when executing the script. */
-	public void setLanguage(final ScriptLanguage scriptLanguage) {
-		this.scriptLanguage = scriptLanguage;
-	}
-
 	/** Sets the writer used to record the standard output stream. */
 	public void setOutputWriter(final Writer output) {
 		this.output = output;
@@ -125,7 +105,7 @@ public void setErrorWriter(final Writer error) {
 	/** Gets the script engine used to execute the script. */
 	public ScriptEngine getEngine() {
 		if (scriptEngine == null) {
-			scriptEngine = getLanguage().getScriptEngine();
+			scriptEngine = getInfo().getLanguage().getScriptEngine();
 		}
 		return scriptEngine;
 	}
@@ -185,7 +165,7 @@ public void run() {
 		}
 
 		// populate output values
-		final ScriptLanguage language = getLanguage();
+		final ScriptLanguage language = getInfo().getLanguage();
 		for (final ModuleItem<?> item : getInfo().outputs()) {
 			final String name = item.getName();
 			final Object value;
@@ -230,4 +210,17 @@ public void setContext(final Context context) {
 		context.inject(this);
 	}
 
+	// -- Deprecated methods --
+
+	/** @deprecated Use {@link ScriptInfo#getLanguage()} instead. */
+	@Deprecated
+	public ScriptLanguage getLanguage() {
+		return getInfo().getLanguage();
+	}
+
+	/** @deprecated Use {@link ScriptInfo#setLanguage(ScriptLanguage)} instead. */
+	@Deprecated
+	public void setLanguage(final ScriptLanguage scriptLanguage) {
+		getInfo().setLanguage(scriptLanguage);
+	}
 }