X-Git-Url: http://git.megacz.com/?p=org.ibex.js.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FJSExn.java;h=af72ce438a6ac3ffd5c2dc06afdd4aa828325b2f;hp=df905e8b7b3f2d9101cda2e1871b6f1e864398df;hb=a1e6b7e9307319c0195b0efbe5e5354c128be481;hpb=73131826a18c93af4fb04672bc3ec820e1197ad1

diff --git a/src/org/ibex/js/JSExn.java b/src/org/ibex/js/JSExn.java
index df905e8..af72ce4 100644
--- a/src/org/ibex/js/JSExn.java
+++ b/src/org/ibex/js/JSExn.java
@@ -4,14 +4,14 @@
 
 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 { 
-    private Vec backtrace = new Vec();
+    private Basket.List backtrace = new Basket.Array();
     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); }
     
@@ -23,23 +23,23 @@ public class JSExn extends Exception {
     }
     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) {
-        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);
     }
-    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; } 
     
-    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 JSExn refill() {
+        public JSExn unwrap() {
             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());
-            JS.warn(ioe);
+            JSU.warn(ioe);
         }
     }
 }