projects
/
org.ibex.js.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved ProxyAutoConfig.java from org.ibex.net.HTTP to this package
[org.ibex.js.git]
/
src
/
org
/
ibex
/
js
/
JSExn.java
diff --git
a/src/org/ibex/js/JSExn.java
b/src/org/ibex/js/JSExn.java
index
df905e8
..
af72ce4
100644
(file)
--- a/
src/org/ibex/js/JSExn.java
+++ b/
src/org/ibex/js/JSExn.java
@@
-4,14
+4,14
@@
package org.ibex.js;
package org.ibex.js;
-import org.ibex.util.*;
+import org.ibex.util.*;
import java.io.*;
/** An exception which can be thrown and caught by JavaScript code */
public class JSExn extends Exception {
import java.io.*;
/** An exception which can be thrown and caught by JavaScript code */
public class JSExn extends Exception {
- private Vec backtrace = new Vec();
+ private Basket.List backtrace = new Basket.Array();
private JS js;
private JS js;
- public JSExn(String s) { this(JS.S(s)); }
+ public JSExn(String s) { this(JSU.S(s)); }
public JSExn(JS js) { this(js,null); }
public JSExn(JS js, Interpreter cx) { this.js = js; fill(cx); }
public JSExn(JS js) { this(js,null); }
public JSExn(JS js, Interpreter cx) { this.js = js; fill(cx); }
@@
-23,23
+23,23
@@
public class JSExn extends Exception {
}
public void printStackTrace() { printStackTrace(System.err); }
public void printStackTrace(PrintWriter pw) {
}
public void printStackTrace() { printStackTrace(System.err); }
public void printStackTrace(PrintWriter pw) {
- for(int i=0; i<backtrace.size(); i++) pw.println(" at " + (String) backtrace.elementAt(i));
+ for(int i=0; i<backtrace.size(); i++) pw.println(" at " + (String) backtrace.get(i));
super.printStackTrace(pw);
}
public void printStackTrace(PrintStream ps) {
super.printStackTrace(pw);
}
public void printStackTrace(PrintStream ps) {
- for(int i=0; i<backtrace.size(); i++) ps.println(" at " + (String) backtrace.elementAt(i));
+ for(int i=0; i<backtrace.size(); i++) ps.println(" at " + (String) backtrace.get(i));
super.printStackTrace(ps);
}
super.printStackTrace(ps);
}
- public String toString() { return "JSExn: " + JS.debugToString(js); }
+ public String toString() { return "JSExn: " + JSU.str(js); }
public String getMessage() { return toString(); }
public JS getObject() { return js; }
public String getMessage() { return toString(); }
public JS getObject() { return js; }
- void addBacktrace(String line) { backtrace.addElement(line); }
+ void addBacktrace(String line) { backtrace.add(line); }
public static class Wrapper extends RuntimeException {
public final JSExn e;
public Wrapper(JSExn e) { this.e = e; }
public static class Wrapper extends RuntimeException {
public final JSExn e;
public Wrapper(JSExn e) { this.e = e; }
- public JSExn refill() {
+ public JSExn unwrap() {
e.addBacktrace("[foreign code]");
e.fill(null);
return e;
e.addBacktrace("[foreign code]");
e.fill(null);
return e;
@@
-49,7
+49,7
@@
public class JSExn extends Exception {
public static class IO extends JSExn {
public IO(java.io.IOException ioe) {
super("ibex.io: " + ioe.toString());
public static class IO extends JSExn {
public IO(java.io.IOException ioe) {
super("ibex.io: " + ioe.toString());
- JS.warn(ioe);
+ JSU.warn(ioe);
}
}
}
}
}
}