1.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Thu May 23 09:47:20 2013 +0200
     1.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Thu May 23 09:56:49 2013 +0200
     1.3 @@ -268,25 +268,25 @@
     1.4          graphicsEnvironmentImpl.strokeText(text, x, y, maxWidth);
     1.5      }
     1.6  
     1.7 -    public Image createImageData(double x, double y){
     1.8 -        return graphicsEnvironmentImpl.createImageData(x, y);
     1.9 -    }
    1.10 -
    1.11 -    public Image createImageData(Image imageData){
    1.12 -        return graphicsEnvironmentImpl.createImageData(imageData);
    1.13 -    }
    1.14 -
    1.15 -    public Image getImageData(double x, double y, double width, double height){
    1.16 -        return graphicsEnvironmentImpl.getImageData(x, y, width, height);
    1.17 -    }
    1.18 -
    1.19 -    public void putImageData(Image imageData, double x, double y){
    1.20 -        graphicsEnvironmentImpl.putImageData(imageData, x, y);
    1.21 -    }
    1.22 -
    1.23 -    public void putImageData(Image imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){
    1.24 -        graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight);
    1.25 -    }
    1.26 +//    public ImageData createImageData(double x, double y){
    1.27 +//        return graphicsEnvironmentImpl.createImageData(x, y);
    1.28 +//    }
    1.29 +//
    1.30 +//    public ImageData createImageData(Image imageData){
    1.31 +//        return graphicsEnvironmentImpl.createImageData(imageData);
    1.32 +//    }
    1.33 +//
    1.34 +//    public ImageData getImageData(double x, double y, double width, double height){
    1.35 +//        return graphicsEnvironmentImpl.getImageData(x, y, width, height);
    1.36 +//    }
    1.37 +//
    1.38 +//    public void putImageData(ImageData imageData, double x, double y){
    1.39 +//        graphicsEnvironmentImpl.putImageData(imageData, x, y);
    1.40 +//    }
    1.41 +//
    1.42 +//    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){
    1.43 +//        graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight);
    1.44 +//    }
    1.45  
    1.46      public void setGlobalAlpha(double alpha){
    1.47          graphicsEnvironmentImpl.setGlobalAlpha(alpha);
    1.48 @@ -317,7 +317,7 @@
    1.49      }
    1.50  
    1.51      public Image getImageDataForPath(String path){
    1.52 -        return graphicsEnvironmentImpl.getImageDataForPath(path);
    1.53 +        return graphicsEnvironmentImpl.getImageForPath(path);
    1.54      }
    1.55  
    1.56      public int getHeight(){

     2.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java	Thu May 23 09:47:20 2013 +0200
     2.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java	Thu May 23 09:56:49 2013 +0200
     2.3 @@ -152,15 +152,15 @@
     2.4  
     2.5      public void strokeText(String text, double x, double y, double maxWidth);
     2.6  
     2.7 -    public Image createImageData(double x, double y);
     2.8 -
     2.9 -    public Image createImageData(Image imageData);
    2.10 -
    2.11 -    public Image getImageData(double x, double y, double width, double height);
    2.12 -
    2.13 -    public void putImageData(Image imageData, double x, double y);
    2.14 -
    2.15 -    public void putImageData(Image imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
    2.16 +//    public ImageData createImageData(double x, double y);
    2.17 +//
    2.18 +//    public ImageData createImageData(Image imageData);
    2.19 +//
    2.20 +//    public ImageData getImageData(double x, double y, double width, double height);
    2.21 +//
    2.22 +//    public void putImageData(ImageData imageData, double x, double y);
    2.23 +//
    2.24 +//    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
    2.25  
    2.26      public void setGlobalAlpha(double alpha);
    2.27  
    2.28 @@ -170,7 +170,7 @@
    2.29  
    2.30      public String getGlobalCompositeOperation();
    2.31  
    2.32 -    public Image getImageDataForPath(String path);
    2.33 +    public Image getImageForPath(String path);
    2.34  
    2.35      public int getHeight();
    2.36  

     3.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/Image.java	Thu May 23 09:47:20 2013 +0200
     3.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/Image.java	Thu May 23 09:56:49 2013 +0200
     3.3 @@ -27,8 +27,5 @@
     3.4  
     3.5      public double getWidth();
     3.6      
     3.7 -    public int getValueAt(double x, double y);
     3.8 -    
     3.9 -    public void setValueAt(double x, double y, int value);
    3.10      
    3.11  }