move JS's Hashtable to JS.O

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

diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java
index e39e201..bb8a27b 100644 (file)
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -232,7 +232,7 @@ public final class Box extends JSScope implements Task {
     
     void resize(int x, int y, int width, int height) {
         if (x == this.x && y == this.y && width == this.width && height == this.height) return;
     
     void resize(int x, int y, int width, int height) {
         if (x == this.x && y == this.y && width == this.width && height == this.height) return;

-        boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
+        boolean sizechange = (this.width != width || this.height != height) && hasTrap("SizeChange");

         int thisx = parent == null ? 0 : this.x;
         int thisy = parent == null ? 0 : this.y;
         Box who = (parent == null ? this : parent);
         int thisx = parent == null ? 0 : this.x;
         int thisy = parent == null ? 0 : this.y;
         Box who = (parent == null ? this : parent);

@@ -448,7 +448,7 @@ public final class Box extends JSScope implements Task {
 
                 case "distanceto":
                     Box b = (Box)a0;
 
                 case "distanceto":
                     Box b = (Box)a0;

-                    JS ret = new JS();
+                    JS ret = new JS.O();

                     ret.put("x", N(b.localToGlobalX(0) - localToGlobalX(0)));
                     ret.put("y", N(b.localToGlobalY(0) - localToGlobalY(0)));
                     return ret;
                     ret.put("x", N(b.localToGlobalX(0) - localToGlobalX(0)));
                     ret.put("y", N(b.localToGlobalY(0) - localToGlobalY(0)));
                     return ret;