Changeset 708

Timestamp:

01/16/14 15:34:01 (10 years ago)

Author:

jts21

Message:

Changes to javascript interpreter, implement detailed error messages

Location:

trunk/src/org/expeditee/actions

Files:

• Javascript2.java (added)
• Misc.java (modified) (2 diffs)

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

@@ -25 +25 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 
 import org.expeditee.gui.AttributeUtils;
@@ -1244 +1245 @@
         }
         
-        // Javascript stuff. Probably completely pointless since there is already a Javascript class,
-        // but I couldn't get the existing Javascript engine to work for some reason
-        private static ScriptEngineManager sem = new ScriptEngineManager();
-        private static ScriptEngine se = sem.getEngineByMimeType("application/javascript");
-        
-        private static class JSParser {
-                private List<Frame> seen = new LinkedList<Frame>();
-                private StringBuffer sb = new StringBuffer();
-                
-                public JSParser(Frame frame, boolean followLinks) throws Exception {
-                        parseScript(frame, followLinks);
-                }
-                
-                private void parseScript(Frame frame, boolean followLinks) throws Exception {
-                        
-                        if(frame == null) {
-                                return;
-                        }
-                        
-                        // make sure we don't get into an infinite loop
-                        // TODO: find a smarter way to do this that allows reusing frames but still stops infinite loops?
-                        seen.add(frame);
-                        
-                        // get all items on the frame
-                        List<Item> y_ordered_items = (List<Item>)frame.getItems();
-                        // remove the title item
-                        y_ordered_items.remove(frame.getTitleItem());
-                        
-                        XGroupItem toplevel_xgroup = new XGroupItem(frame,y_ordered_items);
-                        // ... following on from Steps 1 and 2 in the Constructor in XGroupItem ...
-                        
-                        // Step 3: Reposition any 'out-of-flow' XGroupItems
-                        toplevel_xgroup.repositionOutOfFlowGroups(toplevel_xgroup);
-                        
-                        // Step 4: Now add in the remaining (nested) XGroupItems
-                        List<XGroupItem> grouped_item_list = toplevel_xgroup.getGroupedItemList();
-                        toplevel_xgroup.mapInXGroupItemsRecursive(grouped_item_list);
-                
-                        // Finally, retrieve linear list of all Items, (ordered, Y by X, allowing for overlap, nested-boxing, and arrow flow)
-                        List<Item> overlapping_y_ordered_items = toplevel_xgroup.getYXOverlappingItemList();    
-                        
-                        // Loop through the items looking for code and links to new frames
-                        for(Item i : overlapping_y_ordered_items) {
-                                if(followLinks && i.hasLink()) {
-                                        Frame child = i.getChild();
-                                        if(child != null && !seen.contains(child)) {
-                                                this.parseScript(child, true);
-                                        }
-                                }
-                                if(i instanceof Text && !i.isAnnotation()) {
-                                        sb.append(((Text)i).getText() + "\n");
-                                }
-                        }
-                }
-                
-                public String getScript() {
-                        System.out.println("*****\n" + sb.toString() + "\n*****");
-                        return sb.toString();
-                }
-        }
-        
-        public static void runJSFrame(Frame frame) throws Exception {
-                se.eval(new JSParser(frame, true).getScript());
-        }
-        
-        public static void runJSItem(Item item) throws Exception {
-                // if the user clicked on the action without an item on their cursor
-                if(item.hasAction()) {
-                        for(String s : item.getAction()) {
-                                if(!s.equalsIgnoreCase("runJSItem")) {
-                                        return;
-                                }
-                        }
-                        item.getParent().getNonAnnotationText(true);
-                        // Check if there is an arrow pointing from the action to a link
-                        // Seemed like a cool idea before I made it, but the arrows kind of get in the way when trying to click on the action
-                        Collection<Item> itemsWithin = item.getParentOrCurrentFrame().getItemsWithin(item.getPolygon());
-                        for(Item i : itemsWithin) {
-                                if(i instanceof Line && itemsWithin.contains(((Line)i).getStartItem())) {
-                                        Polygon p = ((Line)i).getEndItem().getPolygon();
-                                        for(Item j : ((Line)i).getEndItem().getParent().getAllItems()) {
-                                                if(p.intersects(j.getArea().getBounds2D()) && j instanceof Text && j.hasLink()) {
-                                                        Frame child = j.getChild();
-                                                        if(child == null) {
-                                                                continue;
-                                                        }
-                                                        runJSFrame(child);
-                                                        return;
-                                                }
-                                        }
-                                }
-                        }
-                        
-                        runJSFrame(item.getParentOrCurrentFrame());
-                        return;
-                }
-                Frame frame = item.getChild();
-                if(frame == null) {
-                        frame = FrameIO.CreateNewFrame(item);
-                        item.setLink("" + frame.getNumber());
-                        frame.addText(100, 100, "print(\"test\");", null);
-                        FrameIO.SaveFrame(frame);
+        public static void runJSFrame(Item item) throws Exception {
+                if(item.getChild() == null) {
+                        // if the user clicked on the action without an item on their cursor
+                if(item.hasAction()) {
+                        boolean isThis = false;
+                        for(String s : item.getAction()) {
+                                if(s.equalsIgnoreCase("runJSFrame")) {
+                                        isThis = true;
+                                        break;
+                                }
+                        }
+                        if(isThis) {
+                                Javascript2.runFrame(item.getParentOrCurrentFrame(), true);
+                                return;
+                        }
+                }
+                MessageBay.warningMessage("Requires either an item with a link to a frame, or no item (will run the current frame)");
                 } else {
-                        runJSFrame(frame);
+                        Javascript2.runFrame(item.getChild(), true);
                 }
         }