Changeset 784

Timestamp:

01/29/14 15:53:51 (10 years ago)

Author:

jts21

Message:

Add JSItem class, which like JSWidget is an item controlled by javascript, but with an Expeditee item rather than Swing.
TODO: Add the ability to set input and click handlers for the item.

Location:

trunk/src/org/expeditee

Files:

• gui/FrameUtils.java (modified) (2 diffs)
• items/JSItem.java (added)
• items/widgets/InteractiveWidget.java (modified) (1 diff)
• items/widgets/JSWidget.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -34 +34 @@
 import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.ItemUtils;
+import org.expeditee.items.JSItem;
 import org.expeditee.items.Line;
 import org.expeditee.items.PermissionPair;
@@ -1012 +1013 @@
                                         toParse.addItem(new Circle((Text) i));
                                     }
+                                    // Check for JSItem
+                                } else if(ItemUtils.startsWithTag(i, "@js")) {
+                                        toParse.addItem(new JSItem((Text) i));
                                     // Check for interactive widgets
                                 } else if (ItemUtils.startsWithTag(i,

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

@@ -292 +292 @@
          * @return An array of args. null if none provided
          */
-        static String[] parseArgs(String args) {
+        public static String[] parseArgs(String args) {
 
                 if (args == null)

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.swing.JComponent;
@@ -63 +61 @@
         this.container.add(component);
         this.scriptEngine.put("component", this.component);
+        this.scriptEngine.eval("save = " + this.save);
+        this.scriptEngine.eval("load = " + this.load);
         }
         
@@ -69 +69 @@
                                 source.getData().get(1).replaceAll("\\\\n", "\n"),
                                 source.getData().get(2).replaceAll("\\\\n", "\n"));
-                this.scriptEngine.eval("load = " + this.load);
                 this.invocable.invokeFunction("load", (Object) args);
         }
@@ -90 +89 @@
                 try {
                         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();