Changeset 765

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.

Location:

trunk/src/org/expeditee

Files:

• actions/Javascript2.java (modified) (5 diffs)
• items/widgets/JSWidget.java (modified) (6 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());

trunk/src/org/expeditee/items/widgets/JSWidget.java

@@ -5 +5 @@
 import java.util.List;
 
+import javax.script.Bindings;
 import javax.script.Invocable;
+import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
-import javax.script.ScriptException;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -23 +24 @@
 public class JSWidget extends DataFrameWidget {
         
+        private static final Object global = Javascript2.eval("new Object()");
+        
         // a method to run that will set up and return the root JComponent for this Widget
         private final String init;
-        // a method to run to generate a List<String> to save the state
+        // a method to run to populate a List<String> with our state
         private final String save;
         // a method to run that will load state from a String[]
         private final String load;
         
-        // we have our own script engine since it needs to have some global variables which are specific to each widget
+        // we have our own script context since it needs to have some global variables which are specific to each widget
         private final ScriptEngine scriptEngine;
+        private final Invocable invocable;
         // component created by running our constructor
         private final JComponent component;
@@ -38 +42 @@
         
         private static Text getSauce() {
-                Text source = new Text("@iw: org.expeditee.items.widgets.JSWidget");
+                Text source = new Text(DisplayIO.getCurrentFrame().getNextItemID(), "@iw: org.expeditee.items.widgets.JSWidget");
                 source.setParent(DisplayIO.getCurrentFrame());
                 return source;
@@ -50 +54 @@
                 this.container = (JPanel) super._swingComponent;
                 this.scriptEngine = Javascript2.scriptEngineManager.getEngineByMimeType("application/javascript");
-                this.scriptEngine.put("invocable", (Invocable) this.scriptEngine);
+                this.invocable = (Invocable) this.scriptEngine;
+                this.scriptEngine.put("global", global);
+                this.scriptEngine.put("invocable", this.invocable);
                 this.scriptEngine.put("widget", this);
                 this.scriptEngine.put("container", this.container);
@@ -63 +69 @@
                                 source.getData().get(1).replaceAll("\\\\n", "\n"),
                                 source.getData().get(2).replaceAll("\\\\n", "\n"));
-                this.scriptEngine.eval("var load = " + this.load);
-                ((Invocable)this.scriptEngine).invokeFunction("load", (Object) args);
+                this.scriptEngine.eval("load = " + this.load);
+                this.invocable.invokeFunction("load", (Object) args);
         }
         
@@ -80 +86 @@
         }
 
-        @SuppressWarnings("unchecked")
     @Override
         protected String[] getArgs() {
                 try {
-                        List<String> data = (List<String>)this.scriptEngine.eval("var save = " + this.save + "\nsave()");
-                return data.toArray(new String[0]);
-        } catch (ScriptException e) {
+                        List<String> args = new LinkedList<String>();
+                        this.scriptEngine.eval("save = " + this.save);
+                        this.invocable.invokeFunction("save", (Object)args);
+                        return args.toArray(new String[0]);
+                } catch(NullPointerException e) {
+                        // caused when a null list is returned
+                        return null;
+        } catch (Exception e) {
                 e.printStackTrace();
                 return null;