2004/01/13 03:56:00

darcs-hash:20040130074415-2ba56-f4989a8ca5a7b52e39acf299c3ded25ea698987a.gz

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 0572b66..469ba70 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -54,10 +54,10 @@ public final class XWT extends JS {
         case "graft": return METHOD;
         case "clone": return METHOD;
         case "regexp": return METHOD;
-        case "font": return getSub("font");
-        case "font.sansserif": return Main.builtin.get("fonts/vera/Vera.ttf");
-        case "font.monospace": return Main.builtin.get("fonts/vera/VeraMono.ttf");
-        case "font.serif": return Main.builtin.get("fonts/vera/VeraSe.ttf");
+        case "ui.font": return getSub("ui.font");
+        case "ui.font.sansserif": return Main.builtin.get("fonts/vera/Vera.ttf");
+        case "ui.font.monospace": return Main.builtin.get("fonts/vera/VeraMono.ttf");
+        case "ui.font.serif": return Main.builtin.get("fonts/vera/VeraSe.ttf");
         case "ui": return getSub("ui");
         case "ui.browser": return METHOD;
         case "ui.mouse": return getSub("ui.mouse");
@@ -92,9 +92,10 @@ public final class XWT extends JS {
         case "stream.parse.html": return METHOD;
         case "stream.parse.xml": return METHOD;
         case "stream.parse.utf8": return METHOD;
-        case "rpc": return getSub("rpc");
-        case "rpc.xml": return METHOD;
-        case "rpc.soap": return METHOD;
+        case "net": return getSub("net");
+        case "net.rpc": return getSub("net.rpc");
+        case "net.rpc.xml": return METHOD;
+        case "net.rpc.soap": return METHOD;
         case "log": return getSub("log");
         case "log.debug": return METHOD;
         case "log.info": return METHOD;

diff --git a/src/org/xwt/js/Interpreter.java b/src/org/xwt/js/Interpreter.java
index 32bf03e..c6c61b7 100644 (file)
--- a/src/org/xwt/js/Interpreter.java
+++ b/src/org/xwt/js/Interpreter.java
@@ -163,7 +163,8 @@ class Interpreter implements ByteCodes, Tokens {
                     } else if (o instanceof CallMarker) {
                         if (scope instanceof Trap.TrapScope) { // handles return component of a read trap
                             Trap.TrapScope ts = (Trap.TrapScope)scope;
-                            if (retval != null) ts.cascadeHappened = true;
+                            if (retval != null && retval instanceof Boolean && ((Boolean)retval).booleanValue())
+                                ts.cascadeHappened = true;
                             if (!ts.cascadeHappened) {
                                 ts.cascadeHappened = true;
                                 Trap t = ts.t.next;