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

Timestamp:

01/28/14 11:58:55 (10 years ago)

Author:

jts21

Message:

Add global variable to widgets so they can share state. Tried to make widgets all use the same ScriptEngine with different ScriptContexts, but there doesn't seem to be a way to explicitly invoke a method within a specific script context, which was required for save/load. Also changed save() method so it takes a List<String> as a parameter and populates that rather than having to create one itself.

File:

• trunk/src/org/expeditee/actions/Javascript2.java (modified) (5 diffs)

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

@@ -6 +6 @@
 import java.util.List;
 
+import javax.script.Bindings;
 import javax.script.Invocable;
+import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
+import javax.script.SimpleScriptContext;
 
 import org.expeditee.gui.Frame;
@@ -18 +21 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
-import org.expeditee.items.Line;
 import org.expeditee.items.Text;
 
@@ -33 +35 @@
         
         public static final ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
-        private static ScriptEngine se = scriptEngineManager.getEngineByMimeType("application/javascript");
+        public static final ScriptEngine scriptEngine = scriptEngineManager.getEngineByMimeType("application/javascript");
         static {
-                se.put("invocable", (Invocable) se);
+                scriptEngine.put("invocable", (Invocable) scriptEngine);
         }
         
@@ -84 +86 @@
         public static Object eval(String code) {
                 try {
-                return se.eval(code);
+                return scriptEngine.eval(code);
         } catch (ScriptException e) {
                 e.printStackTrace();
@@ -95 +97 @@
                 try {
                 try {
-                se.eval(js.toString());
+                scriptEngine.eval(js.toString());
             } catch (ScriptException e) {
                         js.handleError(e.getMessage(), e.getLineNumber());