diff -r dec5f4e7d031 -r 368626597f1a javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Thu May 23 08:15:11 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Thu May 23 09:47:20 2013 +0200 @@ -132,15 +132,15 @@ graphicsEnvironmentImpl.scale(x, y); } - public void drawImage(ImageData image, double x, double y){ + public void drawImage(Image image, double x, double y){ graphicsEnvironmentImpl.drawImage(image, x, y); } - public void drawImage(ImageData image, double x, double y, double width, double height){ + public void drawImage(Image image, double x, double y, double width, double height){ graphicsEnvironmentImpl.drawImage(image, x, y, width, height); } - public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){ + public void drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){ graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height); } @@ -152,18 +152,10 @@ return graphicsEnvironmentImpl.getFillStyle(); } - public void setFillStyle(Pattern style){ - graphicsEnvironmentImpl.setFillStyle(style); - } - public void setStrokeStyle(String style){ graphicsEnvironmentImpl.setStrokeStyle(style); } - public void setStrokeStyle(Pattern style){ - graphicsEnvironmentImpl.setStrokeStyle(style); - } - public void setShadowColor(String color){ graphicsEnvironmentImpl.setShadowColor(color); } @@ -276,23 +268,23 @@ graphicsEnvironmentImpl.strokeText(text, x, y, maxWidth); } - public ImageData createImageData(double x, double y){ + public Image createImageData(double x, double y){ return graphicsEnvironmentImpl.createImageData(x, y); } - public ImageData createImageData(ImageData imageData){ + public Image createImageData(Image imageData){ return graphicsEnvironmentImpl.createImageData(imageData); } - public ImageData getImageData(double x, double y, double width, double height){ + public Image getImageData(double x, double y, double width, double height){ return graphicsEnvironmentImpl.getImageData(x, y, width, height); } - public void putImageData(ImageData imageData, double x, double y){ + public void putImageData(Image imageData, double x, double y){ graphicsEnvironmentImpl.putImageData(imageData, x, y); } - public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){ + public void putImageData(Image imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){ graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight); } @@ -316,7 +308,7 @@ return new LinearGradient(x0, y0, x1, y1); } - public Pattern createPattern(ImageData image, String repeat){ + public Pattern createPattern(Image image, String repeat){ return new Pattern(image, repeat); } @@ -324,7 +316,7 @@ return new RadialGradient(x0, y0, r0, x1, y1, r1); } - public ImageData getImageDataForPath(String path){ + public Image getImageDataForPath(String path){ return graphicsEnvironmentImpl.getImageDataForPath(path); }