From 7d04ffc7b6677bc70cd164595a62f414b51a2dc4 Mon Sep 17 00:00:00 2001 From: Louis Grignon Date: Thu, 10 May 2018 12:40:07 +0200 Subject: [PATCH] enhanced API - promise doc --- .../def/dom/CanvasRenderingContext2D.java | 273 ++++++++++++------ .../es6/src/main/java/def/dom/Document.java | 6 +- .../es6/src/main/java/def/dom/NodeList.java | 16 +- .../es6/src/main/java/def/dom/NodeListOf.java | 9 +- .../es6/src/main/java/def/js/Promise.java | 2 +- 5 files changed, 196 insertions(+), 110 deletions(-) diff --git a/core-lib/es6/src/main/java/def/dom/CanvasRenderingContext2D.java b/core-lib/es6/src/main/java/def/dom/CanvasRenderingContext2D.java index 493de2cc..ae14fe45 100644 --- a/core-lib/es6/src/main/java/def/dom/CanvasRenderingContext2D.java +++ b/core-lib/es6/src/main/java/def/dom/CanvasRenderingContext2D.java @@ -1,98 +1,185 @@ package def.dom; -import def.js.Object; +import jsweet.util.union.Union4; public class CanvasRenderingContext2D extends def.js.Object { - public HTMLCanvasElement canvas; - public java.lang.Object fillStyle; - public java.lang.String font; - public double globalAlpha; - public java.lang.String globalCompositeOperation; - public java.lang.String lineCap; - public double lineDashOffset; - public java.lang.String lineJoin; - public double lineWidth; - public double miterLimit; - public java.lang.String msFillRule; - public java.lang.Boolean msImageSmoothingEnabled; - public double shadowBlur; - public java.lang.String shadowColor; - public double shadowOffsetX; - public double shadowOffsetY; - public java.lang.Object strokeStyle; - public java.lang.String textAlign; - public java.lang.String textBaseline; - native public void arc(double x, double y, double radius, double startAngle, double endAngle, java.lang.Boolean anticlockwise); - native public void arcTo(double x1, double y1, double x2, double y2, double radius); - native public void beginPath(); - native public void bezierCurveTo(double cp1x, double cp1y, double cp2x, double cp2y, double x, double y); - native public void clearRect(double x, double y, double w, double h); - native public void clip(java.lang.String fillRule); - native public void closePath(); - native public ImageData createImageData(double imageDataOrSw, double sh); - native public ImageData createImageData(ImageData imageDataOrSw, double sh); - native public CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1); - native public CanvasPattern createPattern(HTMLImageElement image, java.lang.String repetition); - native public CanvasPattern createPattern(HTMLCanvasElement image, java.lang.String repetition); - native public CanvasPattern createPattern(HTMLVideoElement image, java.lang.String repetition); - native public CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1); - native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY, double canvasImageWidth, double canvasImageHeight); - native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY, double canvasImageWidth, double canvasImageHeight); - native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY, double canvasImageWidth, double canvasImageHeight); - native public void fill(java.lang.String fillRule); - native public void fillRect(double x, double y, double w, double h); - native public void fillText(java.lang.String text, double x, double y, double maxWidth); - native public ImageData getImageData(double sx, double sy, double sw, double sh); - native public double[] getLineDash(); - native public java.lang.Boolean isPointInPath(double x, double y, java.lang.String fillRule); - native public void lineTo(double x, double y); - native public TextMetrics measureText(java.lang.String text); - native public void moveTo(double x, double y); - native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight); - native public void quadraticCurveTo(double cpx, double cpy, double x, double y); - native public void rect(double x, double y, double w, double h); - native public void restore(); - native public void rotate(double angle); - native public void save(); - native public void scale(double x, double y); - native public void setLineDash(double[] segments); - native public void setTransform(double m11, double m12, double m21, double m22, double dx, double dy); - native public void stroke(); - native public void strokeRect(double x, double y, double w, double h); - native public void strokeText(java.lang.String text, double x, double y, double maxWidth); - native public void transform(double m11, double m12, double m21, double m22, double dx, double dy); - native public void translate(double x, double y); - public static CanvasRenderingContext2D prototype; - public CanvasRenderingContext2D(){} - native public void arc(double x, double y, double radius, double startAngle, double endAngle); - native public void clip(); - native public ImageData createImageData(double imageDataOrSw); - native public ImageData createImageData(ImageData imageDataOrSw); - native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY, double canvasImageWidth); - native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY); - native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX); - native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height); - native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width); - native public void drawImage(HTMLImageElement image, double offsetX, double offsetY); - native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY, double canvasImageWidth); - native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY); - native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX); - native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height); - native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width); - native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY); - native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY, double canvasImageWidth); - native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX, double canvasOffsetY); - native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, double canvasOffsetX); - native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height); - native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width); - native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY); - native public void fill(); - native public void fillText(java.lang.String text, double x, double y); - native public java.lang.Boolean isPointInPath(double x, double y); - native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth); - native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY); - native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX); - native public void putImageData(ImageData imagedata, double dx, double dy); - native public void strokeText(java.lang.String text, double x, double y); -} + public HTMLCanvasElement canvas; + public Union4 fillStyle; + public java.lang.String font; + public double globalAlpha; + public java.lang.String globalCompositeOperation; + public java.lang.String lineCap; + public double lineDashOffset; + public java.lang.String lineJoin; + public double lineWidth; + public double miterLimit; + public java.lang.String msFillRule; + public java.lang.Boolean msImageSmoothingEnabled; + public double shadowBlur; + public java.lang.String shadowColor; + public double shadowOffsetX; + public double shadowOffsetY; + public Union4 strokeStyle; + public java.lang.String textAlign; + public java.lang.String textBaseline; + native public void arc(double x, double y, double radius, double startAngle, double endAngle, + java.lang.Boolean anticlockwise); + + native public void arcTo(double x1, double y1, double x2, double y2, double radius); + + native public void beginPath(); + + native public void bezierCurveTo(double cp1x, double cp1y, double cp2x, double cp2y, double x, double y); + + native public void clearRect(double x, double y, double w, double h); + + native public void clip(java.lang.String fillRule); + + native public void closePath(); + + native public ImageData createImageData(double imageDataOrSw, double sh); + + native public ImageData createImageData(ImageData imageDataOrSw, double sh); + + native public CanvasGradient createLinearGradient(double x0, double y0, double x1, double y1); + + native public CanvasPattern createPattern(HTMLImageElement image, java.lang.String repetition); + + native public CanvasPattern createPattern(HTMLCanvasElement image, java.lang.String repetition); + + native public CanvasPattern createPattern(HTMLVideoElement image, java.lang.String repetition); + + native public CanvasGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1); + + native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY, double canvasImageWidth, double canvasImageHeight); + + native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY, double canvasImageWidth, double canvasImageHeight); + + native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY, double canvasImageWidth, double canvasImageHeight); + + native public void fill(java.lang.String fillRule); + + native public void fillRect(double x, double y, double w, double h); + + native public void fillText(java.lang.String text, double x, double y, double maxWidth); + + native public ImageData getImageData(double sx, double sy, double sw, double sh); + + native public double[] getLineDash(); + + native public java.lang.Boolean isPointInPath(double x, double y, java.lang.String fillRule); + + native public void lineTo(double x, double y); + + native public TextMetrics measureText(java.lang.String text); + + native public void moveTo(double x, double y); + + native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, + double dirtyWidth, double dirtyHeight); + + native public void quadraticCurveTo(double cpx, double cpy, double x, double y); + + native public void rect(double x, double y, double w, double h); + + native public void restore(); + + native public void rotate(double angle); + + native public void save(); + + native public void scale(double x, double y); + + native public void setLineDash(double[] segments); + + native public void setTransform(double m11, double m12, double m21, double m22, double dx, double dy); + + native public void stroke(); + + native public void strokeRect(double x, double y, double w, double h); + + native public void strokeText(java.lang.String text, double x, double y, double maxWidth); + + native public void transform(double m11, double m12, double m21, double m22, double dx, double dy); + + native public void translate(double x, double y); + + public static CanvasRenderingContext2D prototype; + + public CanvasRenderingContext2D() { + } + + native public void arc(double x, double y, double radius, double startAngle, double endAngle); + + native public void clip(); + + native public ImageData createImageData(double imageDataOrSw); + + native public ImageData createImageData(ImageData imageDataOrSw); + + native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY, double canvasImageWidth); + + native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY); + + native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX); + + native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width, double height); + + native public void drawImage(HTMLImageElement image, double offsetX, double offsetY, double width); + + native public void drawImage(HTMLImageElement image, double offsetX, double offsetY); + + native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY, double canvasImageWidth); + + native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY); + + native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX); + + native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width, double height); + + native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY, double width); + + native public void drawImage(HTMLCanvasElement image, double offsetX, double offsetY); + + native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY, double canvasImageWidth); + + native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX, double canvasOffsetY); + + native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height, + double canvasOffsetX); + + native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width, double height); + + native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY, double width); + + native public void drawImage(HTMLVideoElement image, double offsetX, double offsetY); + + native public void fill(); + + native public void fillText(java.lang.String text, double x, double y); + + native public java.lang.Boolean isPointInPath(double x, double y); + + native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, + double dirtyWidth); + + native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY); + + native public void putImageData(ImageData imagedata, double dx, double dy, double dirtyX); + + native public void putImageData(ImageData imagedata, double dx, double dy); + + native public void strokeText(java.lang.String text, double x, double y); +} diff --git a/core-lib/es6/src/main/java/def/dom/Document.java b/core-lib/es6/src/main/java/def/dom/Document.java index 50c1bb16..51066b6b 100644 --- a/core-lib/es6/src/main/java/def/dom/Document.java +++ b/core-lib/es6/src/main/java/def/dom/Document.java @@ -1,9 +1,5 @@ package def.dom; -import def.dom.ErrorEvent; -import jsweet.util.StringTypes; -import jsweet.util.StringTypes.*; - @jsweet.lang.Extends({GlobalEventHandlers.class,NodeSelector.class,DocumentEvent.class}) public class Document extends Node { /** @@ -1027,7 +1023,7 @@ public class Document extends Node { native public void addEventListener(jsweet.util.StringTypes.wheel type, java.util.function.Function listener, java.lang.Boolean useCapture); native public void addEventListener(java.lang.String type, EventListener listener, java.lang.Boolean useCapture); native public Element querySelector(java.lang.String selectors); - native public NodeList querySelectorAll(java.lang.String selectors); + native public NodeListOf querySelectorAll(java.lang.String selectors); native public AnimationEvent createEvent(jsweet.util.StringTypes.AnimationEvent eventInterface); native public AriaRequestEvent createEvent(jsweet.util.StringTypes.AriaRequestEvent eventInterface); native public AudioProcessingEvent createEvent(jsweet.util.StringTypes.AudioProcessingEvent eventInterface); diff --git a/core-lib/es6/src/main/java/def/dom/NodeList.java b/core-lib/es6/src/main/java/def/dom/NodeList.java index ec7981b5..8db225a4 100644 --- a/core-lib/es6/src/main/java/def/dom/NodeList.java +++ b/core-lib/es6/src/main/java/def/dom/NodeList.java @@ -1,10 +1,12 @@ package def.dom; -public class NodeList { - public double length; - native public Node item(double index); - native public Node $get(double index); - public static NodeList prototype; - public NodeList(){} -} +@jsweet.lang.Interface +public abstract class NodeList { + public int length; + native public Node item(int index); + + native public Node $get(int index); + + public static NodeList prototype; +} diff --git a/core-lib/es6/src/main/java/def/dom/NodeListOf.java b/core-lib/es6/src/main/java/def/dom/NodeListOf.java index 9b0df7a4..81241eb3 100644 --- a/core-lib/es6/src/main/java/def/dom/NodeListOf.java +++ b/core-lib/es6/src/main/java/def/dom/NodeListOf.java @@ -2,8 +2,9 @@ package def.dom; @jsweet.lang.Interface public abstract class NodeListOf extends NodeList implements Iterable { - public double length; - native public TNode item(int index); - native public TNode $get(int index); -} + public int length; + native public TNode item(int index); + + native public TNode $get(int index); +} diff --git a/core-lib/es6/src/main/java/def/js/Promise.java b/core-lib/es6/src/main/java/def/js/Promise.java index 8b464c0b..6069203e 100644 --- a/core-lib/es6/src/main/java/def/js/Promise.java +++ b/core-lib/es6/src/main/java/def/js/Promise.java @@ -30,7 +30,7 @@ import jsweet.util.Lang; }
* */ -public class Promise extends def.js.Object { +public class Promise extends PromiseLike { /** * Attaches callbacks for the resolution and/or rejection of the Promise. *