X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FBox.java;fp=src%2Forg%2Fibex%2Fcore%2FBox.java;h=0ccd42145df09a81907b68b9a8338473e44a24b8;hp=16bae8585e0443d36ae11e1e0b62b8bd05532daa;hb=890000a10a0ccdc49f62946bddf1c0b840495a94;hpb=1de73c721bbd73f275ba85de292463cdd8a0fbc0 diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java index 16bae85..0ccd421 100644 --- a/src/org/ibex/core/Box.java +++ b/src/org/ibex/core/Box.java @@ -58,7 +58,7 @@ public final class Box extends JS.Obj implements Callable { //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&JSU.toString(value).equals(prop))) break; prop=JSU.toString(value); // FIXME memory leak - static Basket.Map boxToCursor = new Basket.HashMap(500, 3); + static Basket.Map boxToCursor = new Basket.Hash(500, 3); static final Font DEFAULT_FONT; static { @@ -608,9 +608,9 @@ public final class Box extends JS.Obj implements Callable { JSU.error("redirect can only be set to a descendant of its current value"); case "fontsize": font = Font.getFont(font == null ? null : font.stream, JSU.toInt(value)); RECONSTRAIN(); dirty(); case "font": - if(!(value instanceof Stream)) throw new JSExn("You can only put streams to the font property"); + if(!(value instanceof Fountain)) throw new JSExn("You can only put streams to the font property"); //FIXME: if (font == value) return; // FIXME: unclone() - font = value == null ? null : Font.getFont((Stream)value, font == null ? 10 : font.pointsize); + font = value == null ? null : Font.getFont((Fountain)value, font == null ? 10 : font.pointsize); RECONSTRAIN(); dirty(); case "x": if (parent==null && Surface.fromBox(this)!=null) {