fixed heinous breakage, added backtrace support

[org.ibex.core.git] / src / org / ibex / Scheduler.java

diff --git a/src/org/ibex/Scheduler.java b/src/org/ibex/Scheduler.java
index 43be3d9..9b39509 100644 (file)
--- a/src/org/ibex/Scheduler.java
+++ b/src/org/ibex/Scheduler.java
@@ -1,6 +1,8 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.ibex;
 
+import java.io.IOException;
+
 import org.ibex.js.*;
 import org.ibex.util.*;
 
@@ -10,7 +12,7 @@ public class Scheduler {
     // Public API Exposed to org.ibex /////////////////////////////////////////////////
 
     private static Scheduler singleton;
-    public static interface Task { public abstract void perform() throws Exception; }
+    public static interface Task { public abstract void perform() throws IOException, JSExn; }
     public static void add(Task t) { Scheduler.runnable.append(t); }
     public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
 
@@ -77,11 +79,12 @@ public class Scheduler {
                 renderAll();
             } catch (JSExn e) {
                 Log.info(Scheduler.class, "a JavaScript thread spawned with ibex.thread() threw an exception:");
-                Log.info(Scheduler.class, "JS Exception: " + e.getObject() + "\n" + e.backtrace());
                 Log.info(Scheduler.class,e);
             } catch (Exception e) {
                 Log.info(Scheduler.class, "a Task threw an exception which was caught by the scheduler:");
                 Log.info(Scheduler.class, e);
+            } catch (Throwable t) {
+                t.printStackTrace();
             }
             // if an Error is thrown it will cause the engine to quit
         }