fixed bug 543

darcs-hash:20040414214839-5007d-c456319cad81af40459eeab53c367610bfafcfd8.gz

diff --git a/Makefile b/Makefile
index c0ed5ac..65412b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -166,8 +166,7 @@ upstream/org.ibex.crypto/%.java:;   @make .download_org.ibex.crypto
 upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm
 link_upstream =  build/java/$(1): $(2)/$(1);
 link_upstream += @echo -e "\033[1mlinking            .java -> .java:  $$@\033[0m";
 upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm
 link_upstream =  build/java/$(1): $(2)/$(1);
 link_upstream += @echo -e "\033[1mlinking            .java -> .java:  $$@\033[0m";

-link_upstream += mkdir -p $$(@D);
-link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
+link_upstream += mkdir -p $$(@D); ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@

 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 $(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 $(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)

@@ -202,7 +201,7 @@ build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.
        java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
                org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
 
        java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
                org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
 

-build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
+build/Java2/ibex.jar: $(java_classes) build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class

        @echo -e "\n\033[1marchiving         .class -> .jar:   build/Java2/ibex.jar\033[0m"
        mkdir -p build/Java2
        echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest
        @echo -e "\n\033[1marchiving         .class -> .jar:   build/Java2/ibex.jar\033[0m"
        mkdir -p build/Java2
        echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest

diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java
index f333abb..8cf6271 100644 (file)
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -848,7 +848,7 @@ public final class Box extends JSScope implements Task {
         b.clear(MOUSEINSIDE);
         deleteNode(i);
         b.parent = null;
         b.clear(MOUSEINSIDE);
         deleteNode(i);
         b.parent = null;

-        RECONSTRAIN();
+        REPACK();

         putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
     }
     
         putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
     }
     

@@ -901,8 +901,8 @@ public final class Box extends JSScope implements Task {
             b.parent = this;
             
             // need both of these in case child was already uncalc'ed
             b.parent = this;
             
             // need both of these in case child was already uncalc'ed

-            b.RECONSTRAIN();
-            RECONSTRAIN();
+            b.REPACK();
+            REPACK();

             
             b.DIRTY; 
             putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
             
             b.DIRTY; 
             putAndTriggerTrapsAndCatchExceptions("ChildChange", b);