2002/04/28 06:48:19

darcs-hash:20040130064612-2ba56-f29325beab68a918f69ea1f8d460b7d075142c6c.gz

diff --git a/CHANGES b/CHANGES
index 352f263..7b57d40 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,8 @@
 27-Apr megacz Surface.java, Box.java: nuked dirtiedTimeStamp
               altogether; it caused more problems than it solved.
 
-27-Apr megacz Changed capitalization of faultstring/faultcode for
-              xwt.soap() to match SOAP spec.
+27-Apr megacz reference.html: Changed capitalization of
+              faultstring/faultcode for xwt.soap() to match SOAP spec.
+
+27-Apr megacz XWT.java, Box.java: fixed ConversionError bug
 

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index acb4cac..ba54b9c 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -1079,6 +1079,7 @@ public final class Box extends JSObject {
         if (name.equals("Array")) return JSObject.defaultObjects.get("Array", null);
         if (name.equals("Function")) return JSObject.defaultObjects.get("Function", null);
         if (name.equals("TypeError")) return JSObject.defaultObjects.get("TypeError", null);
+        if (name.equals("ConversionError")) return JSObject.defaultObjects.get("ConversionError", null);
 
         // See if we're reading back the function value of a trap
         if (name.charAt(0) == '_') {
@@ -1105,7 +1106,8 @@ public final class Box extends JSObject {
         if (traps != null && traps.get(name) != null) return true;
         if (name.charAt(0) == '_') return true;
         if (SpecialBoxProperty.specialBoxProperties.get(name) != null) return true;
-        if (name.equals("Function") || name.equals("Array") || name.equals("Object") || name.equals("TypeError")) return true;
+        if (name.equals("Function") || name.equals("Array") || name.equals("Object") ||
+            name.equals("TypeError") || name.equals("ConversionError")) return true;
         return super.has(name, start);
     }