Changeset 723

Timestamp:

01/20/14 16:38:34 (10 years ago)

Author:

jts21

Message:

Fix off-by-one error with javascript error handling

File:

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

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

@@ -81 +81 @@
                 Javascript2 js = new Javascript2(frame, followLinks);
                 try {
-            se.eval(js.toString());
-        } catch (ScriptException e) {
-                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);
-        }
+                try {
+                se.eval(js.toString());
+            } catch (ScriptException e) {
+                        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
+                if(e.getCause() == null) {
+                        throw e;
+                }
+                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);
+            }
+                } catch(Exception e) {
+                        js.handleError(null, -1);
+                        System.out.println(js.toString());
+                        e.printStackTrace();
+                }
         }
         
@@ -109 +118 @@
                         this.line = line;
                         this.source = source;
+                }
+                
+                public String toString() {
+                        return line + ": " + source;
                 }
         }
@@ -172 +185 @@
                 }
                 // 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;
+                if(lineNumber > this.lines.size()) {
+                        lineNumber = this.lines.size();
                 }
                 CodeLine cl = this.lines.get(lineNumber - 1);