diff -r 836bc1845c65 -r 94bd7330ff58 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java Thu May 23 15:33:14 2013 +0200 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java Fri May 24 07:37:46 2013 +0200 @@ -17,19 +17,16 @@ */ package org.apidesign.bck2brwsr.htmlpage; -import java.awt.Dimension; import java.util.HashMap; import java.util.Set; -import net.java.html.canvas.GraphicsEnvironment; -import net.java.html.canvas.ImageData; +import net.java.html.canvas.Dimension; import net.java.html.canvas.LinearGradient; import net.java.html.canvas.Pattern; import net.java.html.canvas.RadialGradient; import net.java.html.canvas.Style; +import net.java.html.canvas.spi.GraphicsEnvironment; import org.apidesign.bck2brwsr.core.JavaScriptBody; import org.apidesign.bck2brwsr.htmlpage.api.Canvas; -import org.apidesign.bck2brwsr.htmlpage.api.Element; -import org.apidesign.bck2brwsr.htmlpage.api.Image; /** * @@ -149,29 +146,29 @@ @Override public native void scale(double x, double y); - @Override - public void drawImage(ImageData image, double x, double y) { - drawImageImpl(context, Element.getElementById((Image) image), x, y); - } - - @Override - public void drawImage(ImageData image, double x, double y, double width, double height) { - drawImageImpl(context, Element.getElementById((Image) image), x, y, width, height); - } - - @Override - public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height) { - drawImageImpl(context, Element.getElementById((Image) image), sx, sy, sWidth, sHeight, x, y, width, height); - } - - @JavaScriptBody(args = {"ctx", "img", "x", "y", "width", "height"}, body = "ctx.drawImage(img,x,y,width,height);") - private native static void drawImageImpl(Object ctx, Object img, double x, double y, double width, double height); - - @JavaScriptBody(args = {"ctx", "img", "sx", "sy", "swidth", "sheight", "x", "y", "width", "height"}, body = "ctx.drawImage(img,sx,sy,swidth,sheight,x,y,width,height);") - private native static void drawImageImpl(Object ctx, Object img, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height); - - @JavaScriptBody(args = {"ctx", "img", "x", "y"}, body = "ctx.drawImage(img,x,y);") - private native static void drawImageImpl(Object ctx, Object img, double x, double y); +//// @Override +//// public void drawImage(Image image, double x, double y) { +//// drawImageImpl(context, Element.getElementById((Image) image), x, y); +//// } +//// +//// @Override +//// public void drawImage(Image image, double x, double y, double width, double height) { +//// drawImageImpl(context, Element.getElementById((Image) image), x, y, width, height); +//// } +//// +//// @Override +//// public void drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height) { +//// drawImageImpl(context, Element.getElementById((Image) image), sx, sy, sWidth, sHeight, x, y, width, height); +//// } +// +//// @JavaScriptBody(args = {"ctx", "img", "x", "y", "width", "height"}, body = "ctx.drawImage(img,x,y,width,height);") +//// private native static void drawImageImpl(Object ctx, Object img, double x, double y, double width, double height); +//// +//// @JavaScriptBody(args = {"ctx", "img", "sx", "sy", "swidth", "sheight", "x", "y", "width", "height"}, body = "ctx.drawImage(img,sx,sy,swidth,sheight,x,y,width,height);") +//// private native static void drawImageImpl(Object ctx, Object img, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height); +//// +//// @JavaScriptBody(args = {"ctx", "img", "x", "y"}, body = "ctx.drawImage(img,x,y);") +//// private native static void drawImageImpl(Object ctx, Object img, double x, double y); @JavaScriptBody(args = {"style"}, body = "this._context().fillStyle=style.valueOf();") @Override @@ -215,8 +212,9 @@ addColorStopImpl(style, double1, stops.get(double1)); } return gradient; - } else if (style instanceof Pattern) { - return createPatternWrapper(((Pattern) style).getImageData(), ((Pattern) style).getRepeat()); + } + else if (style instanceof Pattern) { +// return createPatternWrapper(((Pattern) style).getImage(), ((Pattern) style).getRepeat()); } return null; } @@ -334,6 +332,7 @@ public native void setTextBaseline(String textbaseline); @JavaScriptBody(args = {"text", "x", "y"}, body = "this._context().fillText(text,x,y);") +// @JavaScriptBody(args = {"text", "x", "y"}, body = "console.log(text);") @Override public native void fillText(String text, double x, double y); @@ -344,8 +343,8 @@ @Override public Dimension measureText(String text) { - TextMetrics textMetrics = new TextMetrics(measureTextImpl(text)); - return new Dimension((int) textMetrics.getWidth(), (int) textMetrics.getHeight()); + measureTextImpl(text); + return new Dimension(1,1); } @JavaScriptBody(args = {"text"}, @@ -360,42 +359,42 @@ @Override public native void strokeText(String text, double x, double y, double maxWidth); -// @Override -// public ImageData createImageData(double x, double y) { -// return new ImageDataWrapper(createImageDataImpl(x, y)); -// } +//// @Override +//// public ImageData createImageData(double x, double y) { +//// return new ImageDataWrapper(createImageDataImpl(x, y)); +//// } +//// +//// @JavaScriptBody(args = {"x", "y"}, +//// body = "return this._context().createImageData(x,y);") +//// private native Object createImageDataImpl(double x, double y); +//// +//// @Override +//// public ImageData createImageData(ImageData imageData) { +//// return new ImageDataWrapper(createImageDataImpl(imageData.getWidth(), imageData.getHeight())); +//// } +//// +//// @Override +//// public ImageData getImageData(double x, double y, double width, double height) { +//// return new ImageDataWrapper(getImageDataImpl(x, y, width, height)); +//// } // -// @JavaScriptBody(args = {"x", "y"}, -// body = "return this._context().createImageData(x,y);") -// private native Object createImageDataImpl(double x, double y); +// @JavaScriptBody(args = {"x", "y", "width", "height"}, +// body = "return this._context().getImageData(x,y,width,height);") +// private native Object getImageDataImpl(double x, double y, double width, double height); // -// @Override -// public ImageData createImageData(ImageData imageData) { -// return new ImageDataWrapper(createImageDataImpl(imageData.getWidth(), imageData.getHeight())); -// } -// -// @Override -// public ImageData getImageData(double x, double y, double width, double height) { -// return new ImageDataWrapper(getImageDataImpl(x, y, width, height)); -// } - - @JavaScriptBody(args = {"x", "y", "width", "height"}, - body = "return this._context().getImageData(x,y,width,height);") - private native Object getImageDataImpl(double x, double y, double width, double height); - -// @Override -// public void putImageData(ImageData imageData, double x, double y) { -// putImageDataImpl(((ImageDataWrapper) imageData).object(), x, y); -// } -// -// @JavaScriptBody(args = {"imageData", "x", "y"}, -// body = "this._context().putImageData(imageData,x,y);") -// private native void putImageDataImpl(Object imageData, double x, double y); -// -// @Override -// public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight) { -// putImageDataImpl(((ImageDataWrapper) imageData).object(), x, y, dirtyx, dirtyy, dirtywidth, dirtyheight); -// } +//// @Override +//// public void putImageData(ImageData imageData, double x, double y) { +//// putImageDataImpl(((ImageDataWrapper) imageData).object(), x, y); +//// } +//// +//// @JavaScriptBody(args = {"imageData", "x", "y"}, +//// body = "this._context().putImageData(imageData,x,y);") +//// private native void putImageDataImpl(Object imageData, double x, double y); +//// +//// @Override +//// public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight) { +//// putImageDataImpl(((ImageDataWrapper) imageData).object(), x, y, dirtyx, dirtyy, dirtywidth, dirtyheight); +//// } @JavaScriptBody(args = {"imageData", "x", "y", "dirtyx", "dirtyy", "dirtywidth", "dirtyheight"}, body = "this._context().putImageData(imageData,x,y, dirtyx, dirtyy, dirtywidth,dirtyheight);") @@ -424,12 +423,12 @@ @JavaScriptBody(args = {"context", "x0", "y0", "x1", "y1"}, body = "return context.createLinearGradient(x0,y0,x1,y1);") private native Object createLinearGradientImpl(Object context, double x0, double y0, double x1, double y1); - public PatternWrapper createPatternWrapper(ImageData image, String repeat) { - return new PatternWrapper(createPatternImpl(context, image, repeat)); - } - - @JavaScriptBody(args = {"context", "image", "repeat"}, body = "return context.createPattern(image, repeat);") - private static native Object createPatternImpl(Object context, ImageData image, String repeat); +// public PatternWrapper createPatternWrapper(Image image, String repeat) { +// return new PatternWrapper(createPatternImpl(context, image, repeat)); +// } +// +// @JavaScriptBody(args = {"context", "image", "repeat"}, body = "return context.createPattern(image, repeat);") +// private static native Object createPatternImpl(Object context, Image image, String repeat); public RadialGradientWrapper createRadialGradientWrapper(double x0, double y0, double r0, double x1, double y1, double r1) { return new RadialGradientWrapper(createRadialGradientImpl(context, x0, y0, r0, x1, y1, r1)); @@ -438,9 +437,9 @@ @JavaScriptBody(args = {"context", "x0", "y0", "r0", "x1", "y1", "r1"}, body = "return context.createRadialGradient(x0,y0,r0,x1,y1,r1);") private static native Object createRadialGradientImpl(Object context, double x0, double y0, double r0, double x1, double y1, double r1); -// -// @JavaScriptBody(args = {"path"}, body = "var b = new Image(); b.src=path; return b;") -// public native Image getImageForPath(String path); +//// +//// @JavaScriptBody(args = {"path"}, body = "var b = new Image(); b.src=path; return b;") +//// public native Image getImageForPath(String path);