Changeset 715

Timestamp:

01/17/14 16:40:34 (10 years ago)

Author:

jts21

Message:

Move JS actions to Javascript2 class, handle java ClassNotFound exceptions caused by trying to access an non-existant class from javascript

Location:

trunk/src/org/expeditee/actions

Files:

• Javascript2.java (modified) (4 diffs)
• Misc.java (modified) (1 diff)

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

@@ -17 +17 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
+import org.expeditee.items.Line;
 import org.expeditee.items.Text;
 
@@ -33 +34 @@
         private static ScriptEngine se = sem.getEngineByMimeType("application/javascript");
         
-        public static synchronized void runFrame(Frame frame, boolean followLinks) throws Exception {
+        public static void printJSFrame(Item item) {
+                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) {
+                                System.out.println(new Javascript2(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 {
+                        System.out.println(new Javascript2(item.getChild(), true));
+                }
+        }
+        
+        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 {
+                        Javascript2.runFrame(item.getChild(), true);
+                }
+        }
+        
+        private static synchronized void runFrame(Frame frame, boolean followLinks) throws Exception {
                 Javascript2 js = new Javascript2(frame, followLinks);
                 try {
             se.eval(js.toString());
         } catch (ScriptException e) {
-                int lineNumber = e.getLineNumber();
-                if(lineNumber != -1) {
-                        CodeLine cl = js.lines.get(lineNumber - 1);
-                        Frame errorSourceFrame = cl.item.getParent();
-                        if(errorSourceFrame == null) {
-                                throw new Exception("Failed to find frame on which error occurred");
-                        }
-                        Frame errorFrame;
-                        String title = "Error parsing \"" + errorSourceFrame.getTitle() + "\" (" + errorSourceFrame.getName() + ")";
-                        if(FrameIO.canAccessFrameset(ERROR_FRAMESET)) {
-                                errorFrame = FrameIO.CreateFrame(ERROR_FRAMESET, title, null);
-                        } else {
-                                errorFrame = FrameIO.CreateFrameset(ERROR_FRAMESET, FrameIO.FRAME_PATH);
-                                errorFrame.setTitle(title);
-                        }
-                        Collection<Item> toAdd = errorSourceFrame.getAllItems();
-                        toAdd.remove(errorSourceFrame.getTitleItem());
-                        toAdd.remove(cl.item);
-                        errorFrame.addAllItems(ItemUtils.CopyItems(toAdd));
-                        String errorItemText = cl.item.getText().trim();
-                        String[] errorItemLines = errorItemText.split("[\\n|\\r]+");
-                        int errorLinePos = 0;
-                        for(int i = 0; i < cl.line; i++) {
-                                errorLinePos += errorItemLines[i].length();
-                        }
-                        Text beforeErrorItem = errorFrame.addText(cl.item.getX(), cl.item.getY(),
-                                        errorItemText.substring(0, errorLinePos), null);
-                        Text errorItem;
-                        errorItem = errorFrame.addText(cl.item.getX(),
-                                        beforeErrorItem.getY() + beforeErrorItem.getBoundsHeight(), 
-                                        errorItemLines[cl.line], null);
-                        errorItem.setBackgroundColor(Color.RED);
-                        // todo set width to 80 characters worth
-                        for(String line : e.getMessage().split("[\\n|\\r]+")) {
-                                errorItem.setTooltip("text: " + line);
-                        }
-                        errorItem.setTooltip("font: " + Text.MONOSPACED_FONT);
-                        errorItem.setTooltip("width: " + 80 * 12);
-                        errorLinePos += errorItemLines[cl.line].length();
-                        if(++errorLinePos < errorItemText.length()) {
-                                errorFrame.addText(cl.item.getX(), errorItem.getY() + errorItem.getBoundsHeight(),
-                                                errorItemText.substring(errorLinePos + 1), null);
-                        }
-                        errorFrame.change();
-                        FrameIO.SaveFrame(errorFrame);
-                        MessageBay.displayMessage("Script failed at line " + lineNumber +  " - `" + cl.source + "`",
-                                        errorFrame.getName(), MessageBay.ERROR_COLOR, true, null);
-                        FrameUtils.DisplayFrame(errorFrame, true, true);
+                js.handleError(e.getMessage(), e.getLineNumber());
+        } catch (RuntimeException e) {
+                // there doesn't seem to be a way to safely get the lineNumber on which the error occurred
+                // so as a workaround we just parse the exception
+                String detail = e.getCause().getStackTrace()[1].toString();
+                int lastColon = detail.lastIndexOf(':');
+                int lastBracket = detail.lastIndexOf(')');
+                int lineNumber;
+                if(lastColon == -1 || lastBracket == -1) {
+                        lineNumber = -1;
+                } else {
+                        lineNumber = Integer.parseInt(detail.substring(lastColon + 1, lastBracket));
                 }
+                js.handleError(e.getMessage(), lineNumber);
         }
         }
@@ -134 +144 @@
         
                 // 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();    
+                List<Item> overlapping_y_ordered_items = toplevel_xgroup.getYXOverlappingItemList(true);        
                 
                 // Loop through the items looking for code and links to new frames
@@ -155 +165 @@
         }
         
+        private void handleError(String message, int lineNumber) throws Exception {
+                // negative line number bad
+                if(lineNumber < 0) {
+                        MessageBay.errorMessage("Failed to determine the line on which the error occurred");
+                        return;
+                }
+                // if for some reason the error is after the end of the code, assume it should be the last line
+                if(lineNumber >= this.lines.size()) {
+                        lineNumber = this.lines.size() - 1;
+                }
+                CodeLine cl = this.lines.get(lineNumber - 1);
+                Frame errorSourceFrame = cl.item.getParent();
+                if(errorSourceFrame == null) {
+                        MessageBay.errorMessage("Failed to find frame on which the error occurred");
+                        return;
+                }
+                Frame errorFrame;
+                String title = "Error parsing \"" + errorSourceFrame.getTitle() + "\" (" + errorSourceFrame.getName() + ")";
+                if(FrameIO.canAccessFrameset(ERROR_FRAMESET)) {
+                        errorFrame = FrameIO.CreateFrame(ERROR_FRAMESET, title, null);
+                } else {
+                        errorFrame = FrameIO.CreateFrameset(ERROR_FRAMESET, FrameIO.FRAME_PATH);
+                        errorFrame.setTitle(title);
+                }
+                Collection<Item> toAdd = errorSourceFrame.getAllItems();
+                toAdd.remove(errorSourceFrame.getTitleItem());
+                toAdd.remove(cl.item);
+                errorFrame.addAllItems(ItemUtils.CopyItems(toAdd));
+                String errorItemText = cl.item.getText().trim();
+                String[] errorItemLines = errorItemText.split("[\\n|\\r]+");
+                int errorLinePos = 0;
+                int x = cl.item.getX();
+                int y = cl.item.getY();
+                if(cl.line != 0) {
+                for(int i = 0; i < cl.line; i++) {
+                        errorLinePos += errorItemLines[i].length();
+                }
+                Text beforeErrorItem = errorFrame.addText(x, y,
+                                errorItemText.substring(0, errorLinePos), null);
+                y = beforeErrorItem.getY() + beforeErrorItem.getBoundsHeight();
+                }
+                Text errorItem;
+                errorItem = errorFrame.addText(x, y, errorItemLines[cl.line], null);
+                errorItem.setBackgroundColor(Color.RED);
+                for(String line : message.split("[\\n|\\r]+")) {
+                        errorItem.setTooltip("text: " + line);
+                }
+                errorItem.setTooltip("font: " + Text.MONOSPACED_FONT);
+                errorItem.setTooltip("width: " + 80 * 12);
+                errorLinePos += errorItemLines[cl.line].length();
+                if(++errorLinePos < errorItemText.length()) {
+                        errorFrame.addText(cl.item.getX(), errorItem.getY() + errorItem.getBoundsHeight(),
+                                        errorItemText.substring(errorLinePos + 1), null);
+                }
+                errorFrame.change();
+                FrameIO.SaveFrame(errorFrame);
+                MessageBay.displayMessage("Script failed at line " + lineNumber +  " - `" + cl.source + "`",
+                                errorFrame.getName(), MessageBay.ERROR_COLOR, true, null);
+                FrameUtils.DisplayFrame(errorFrame, true, true);
+        }
+        
         public String toString() {
                 return this.sb.toString();

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

@@ -1245 +1245 @@
         }
         
-        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 {
-                        Javascript2.runFrame(item.getChild(), true);
-                }
-        }
-        
         public static void parsePage(Item text) throws Exception {
                 if (!(text instanceof Text) || !FreeItems.textOnlyAttachedToCursor()) {