JavaScriptScriptLanguage: minor code cleanup

ctrueden · ctrueden · commit 8c05f6716d7a · 2015-06-11T17:01:24.000-05:00
This brings it closer to, but not 100% in line with, the style template.
diff --git a/src/main/java/org/scijava/plugins/scripting/javascript/JavaScriptScriptLanguage.java b/src/main/java/org/scijava/plugins/scripting/javascript/JavaScriptScriptLanguage.java
@@ -91,15 +91,15 @@ public ScriptEngine getScriptEngine() {
 			}
 			if (isRhino()) {
 				// for the load function, which is somehow otherwise unavailable (?)
-				engine.eval("function load(path) {\n"
-						+ "  importClass(Packages." + contextClass(engine) + ");\n"
-						+ "  importClass(Packages.java.io.FileReader);\n"
-						+ "  var cx = Context.getCurrentContext();\n"
-						+ "  cx.evaluateReader(this, new FileReader(path), path, 1, null);\n"
-						+ "}");
+				engine.eval("function load(path) {\n" +
+					"  importClass(Packages." + contextClass(engine) + ");\n" +
+					"  importClass(Packages.java.io.FileReader);\n" +
+					"  var cx = Context.getCurrentContext();\n" +
+					"  cx.evaluateReader(this, new FileReader(path), path, 1, null);\n" +
+					"}");
 			}
 		}
-		catch (ScriptException e) {
+		catch (final ScriptException e) {
 			e.printStackTrace();
 		}
 		return engine;

Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,15 @@ public ScriptEngine getScriptEngine() {`
`91`	`91`	`}`
`92`	`92`	`if (isRhino()) {`
`93`	`93`	`// for the load function, which is somehow otherwise unavailable (?)`
`94`		`- engine.eval("function load(path) {\n"`
`95`		`- + " importClass(Packages." + contextClass(engine) + ");\n"`
`96`		`- + " importClass(Packages.java.io.FileReader);\n"`
`97`		`- + " var cx = Context.getCurrentContext();\n"`
`98`		`- + " cx.evaluateReader(this, new FileReader(path), path, 1, null);\n"`
`99`		`- + "}");`
	`94`	`+ engine.eval("function load(path) {\n" +`
	`95`	`+ " importClass(Packages." + contextClass(engine) + ");\n" +`
	`96`	`+ " importClass(Packages.java.io.FileReader);\n" +`
	`97`	`+ " var cx = Context.getCurrentContext();\n" +`
	`98`	`+ " cx.evaluateReader(this, new FileReader(path), path, 1, null);\n" +`
	`99`	`+ "}");`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`- catch (ScriptException e) {`
	`102`	`+ catch (final ScriptException e) {`
`103`	`103`	`e.printStackTrace();`
`104`	`104`	`}`
`105`	`105`	`return engine;`