# HG changeset patch # User Anton Epple # Date 1379945353 25200 # Node ID 6fed3663b751c722ab73cafc67fdce084c162fd8 # Parent 3fc3e7c4fb5cf307d65fe9191556e719a47cb483 Fixed bug in logger & registered Graphicsenvironment service diff -r 3fc3e7c4fb5c -r 6fed3663b751 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java Wed Sep 18 11:25:14 2013 +0200 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java Mon Sep 23 07:09:13 2013 -0700 @@ -30,16 +30,23 @@ import net.java.html.canvas.spi.GraphicsEnvironment; import org.apidesign.bck2brwsr.core.JavaScriptBody; import org.apidesign.bck2brwsr.htmlpage.api.Canvas; +import org.openide.util.lookup.ServiceProvider; /** * * @author Anton Epple */ +@ServiceProvider(service = GraphicsEnvironment.class) public class HTML5GraphicsEnvironment implements GraphicsEnvironment { Object context; Canvas canvas; + public HTML5GraphicsEnvironment() { + } + + + public HTML5GraphicsEnvironment(Object contextImpl, Canvas canvas) { this.context = contextImpl; this.canvas = canvas; @@ -233,7 +240,7 @@ "gradient.addColorStop(position,color)") private static native void addColorStopImpl(Object gradient, double position, String color); - @JavaScriptBody(args = {"context", "obj"}, body = "console.log('style: '+obj);context.fillStyle=obj;") + @JavaScriptBody(args = {"context", "obj"}, body = "context.fillStyle=obj;") private native void setFillStyleImpl(Object context, Object obj); @JavaScriptBody(args = {"style"}, body = "this._context().strokeStyle=style.valueOf();") @@ -470,13 +477,16 @@ canvas.setWidth(width); } - @JavaScriptBody(args = {"src"}, body = "var image = new Image(); image.src = src; return image;") +// @JavaScriptBody(args = {"src"}, body = "var image = new Image();console.log('image complete '+image.complete);image.src = './'+ src; return image;") + @JavaScriptBody(args = {"src"}, body = "console.log ('looking up image by id '+src);return document.getElementById(src);") private static native Object createImage(String src); @Override public int getWidth(Image image, Object nativeImage) { + if (nativeImage == null) { nativeImage = createImage(image.getSrc()); + } return getWidth(nativeImage); } diff -r 3fc3e7c4fb5c -r 6fed3663b751 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Logger.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Logger.java Wed Sep 18 11:25:14 2013 +0200 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Logger.java Mon Sep 23 07:09:13 2013 -0700 @@ -13,7 +13,7 @@ public class Logger { @JavaScriptBody(args = "message",body = "console.log(message)") - public static native void log(String text); + public static native void log(String message); @JavaScriptBody(args = "object",body = "console.log(object)") public static native void logObject(Object object);