Changeset 1080 for trunk/src/org/expeditee/actions

Timestamp:

07/04/17 14:42:52 (7 years ago)

Author:

davidb

Message:

Updates to cope with changes in Java ScriptEngine

Location:

trunk/src/org/expeditee/actions

Files:

• Javascript2.java (modified) (1 diff)
• Python.java (modified) (1 diff)
• ScriptBase.java (modified) (2 diffs)

trunk/src/org/expeditee/actions/Javascript2.java

@@ -52 +52 @@
     protected void init() {
         ERROR_FRAMESET = "JavascriptErrors";
-        scriptEngineManager = new ScriptEngineManager();
         scriptEngine = scriptEngineManager.getEngineByMimeType("application/javascript");
         scriptEngine.put("invocable", (Invocable) scriptEngine);

trunk/src/org/expeditee/actions/Python.java

@@ -53 +53 @@
     protected void init() {
         ERROR_FRAMESET = "PythonErrors";
-        scriptEngineManager = new ScriptEngineManager();
         scriptEngine = scriptEngineManager.getEngineByMimeType("application/python");
         scriptEngine.put("invocable", (Invocable) scriptEngine);

trunk/src/org/expeditee/actions/ScriptBase.java

@@ -51 +51 @@
 public abstract class ScriptBase {
         
-    public String ERROR_FRAMESET;       
-    public ScriptEngineManager scriptEngineManager;
-    public ScriptEngine scriptEngine = null;
-        
+    protected static ScriptEngineManager scriptEngineManager;
+    protected String ERROR_FRAMESET;    
+    protected ScriptEngine scriptEngine = null;
+
+    static {
+        scriptEngineManager = new ScriptEngineManager();
+    }
+    
     protected abstract void init();
     
@@ -117 +121 @@
 
     protected ScriptBase(Frame frame, boolean followLinks) {
-        if (scriptEngine == null) {
-            init();
-        }
+        init();
         this.parseFrame(frame, followLinks);
     }