1.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Thu May 23 08:15:11 2013 +0200
     1.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Thu May 23 09:47:20 2013 +0200
     1.3 @@ -132,15 +132,15 @@
     1.4          graphicsEnvironmentImpl.scale(x, y);
     1.5      }
     1.6  
     1.7 -    public void drawImage(ImageData image, double x, double y){
     1.8 +    public void drawImage(Image image, double x, double y){
     1.9          graphicsEnvironmentImpl.drawImage(image, x, y);
    1.10      }
    1.11  
    1.12 -    public void drawImage(ImageData image, double x, double y, double width, double height){
    1.13 +    public void drawImage(Image image, double x, double y, double width, double height){
    1.14          graphicsEnvironmentImpl.drawImage(image, x, y, width, height);
    1.15      }
    1.16  
    1.17 -    public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){
    1.18 +    public void drawImage(Image image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height){
    1.19          graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height);
    1.20      }
    1.21  
    1.22 @@ -152,18 +152,10 @@
    1.23          return graphicsEnvironmentImpl.getFillStyle();
    1.24      }
    1.25  
    1.26 -    public void setFillStyle(Pattern style){
    1.27 -        graphicsEnvironmentImpl.setFillStyle(style);
    1.28 -    }
    1.29 -
    1.30      public void setStrokeStyle(String style){
    1.31          graphicsEnvironmentImpl.setStrokeStyle(style);
    1.32      }
    1.33  
    1.34 -    public void setStrokeStyle(Pattern style){
    1.35 -        graphicsEnvironmentImpl.setStrokeStyle(style);
    1.36 -    }
    1.37 -
    1.38      public void setShadowColor(String color){
    1.39          graphicsEnvironmentImpl.setShadowColor(color);
    1.40      }
    1.41 @@ -276,23 +268,23 @@
    1.42          graphicsEnvironmentImpl.strokeText(text, x, y, maxWidth);
    1.43      }
    1.44  
    1.45 -    public ImageData createImageData(double x, double y){
    1.46 +    public Image createImageData(double x, double y){
    1.47          return graphicsEnvironmentImpl.createImageData(x, y);
    1.48      }
    1.49  
    1.50 -    public ImageData createImageData(ImageData imageData){
    1.51 +    public Image createImageData(Image imageData){
    1.52          return graphicsEnvironmentImpl.createImageData(imageData);
    1.53      }
    1.54  
    1.55 -    public ImageData getImageData(double x, double y, double width, double height){
    1.56 +    public Image getImageData(double x, double y, double width, double height){
    1.57          return graphicsEnvironmentImpl.getImageData(x, y, width, height);
    1.58      }
    1.59  
    1.60 -    public void putImageData(ImageData imageData, double x, double y){
    1.61 +    public void putImageData(Image imageData, double x, double y){
    1.62          graphicsEnvironmentImpl.putImageData(imageData, x, y);
    1.63      }
    1.64  
    1.65 -    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){
    1.66 +    public void putImageData(Image imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){
    1.67          graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight);
    1.68      }
    1.69  
    1.70 @@ -316,7 +308,7 @@
    1.71          return new LinearGradient(x0, y0, x1, y1);
    1.72      }
    1.73  
    1.74 -    public Pattern createPattern(ImageData image, String repeat){
    1.75 +    public Pattern createPattern(Image image, String repeat){
    1.76          return new Pattern(image, repeat);
    1.77      }
    1.78  
    1.79 @@ -324,7 +316,7 @@
    1.80          return new RadialGradient(x0, y0, r0, x1, y1, r1);
    1.81      }
    1.82  
    1.83 -    public ImageData getImageDataForPath(String path){
    1.84 +    public Image getImageDataForPath(String path){
    1.85          return graphicsEnvironmentImpl.getImageDataForPath(path);
    1.86      }
    1.87