# HG changeset patch
# User Anton Epple <toni.epple@eppleton.de>
# Date 1369373818 -7200
# Node ID 964e42c9448d20c3fb84c04c4a63530a423e0a5f
# Parent  591d06d8e06f33d5748e665bf3d0fdde2afa30fb
Added Dimension class to fix problem with TextMetrics

diff -r 591d06d8e06f -r 964e42c9448d javaquery/canvas/src/main/java/net/java/html/canvas/Dimension.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/canvas/src/main/java/net/java/html/canvas/Dimension.java	Fri May 24 07:36:58 2013 +0200
@@ -0,0 +1,38 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package net.java.html.canvas;
+
+/**
+ *
+ * @author antonepple
+ */
+public class Dimension {
+    double width, height;
+
+    public Dimension(double width, double height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    
+    
+    public double getWidth() {
+        return width;
+    }
+
+    public void setWidth(double width) {
+        this.width = width;
+    }
+
+    public double getHeight() {
+        return height;
+    }
+
+    public void setHeight(double height) {
+        this.height = height;
+    }
+    
+    
+}
diff -r 591d06d8e06f -r 964e42c9448d 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 15:36:42 2013 +0200
+++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Fri May 24 07:36:58 2013 +0200
@@ -18,7 +18,6 @@
 package net.java.html.canvas;
 
 import net.java.html.canvas.spi.GraphicsEnvironment;
-import java.awt.Dimension;
 
 /**
  *
@@ -133,17 +132,17 @@
         graphicsEnvironmentImpl.scale(x, y);
     }
 
-    public void drawImage(ImageData image, double x, double y){
-        graphicsEnvironmentImpl.drawImage(image, x, y);
-    }
-
-    public void drawImage(ImageData 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){
-        graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height);
-    }
+////    public void drawImage(ImageData image, double x, double y){
+////        graphicsEnvironmentImpl.drawImage(image, x, y);
+////    }
+////
+////    public void drawImage(ImageData 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){
+////        graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height);
+////    }
 
     public void setFillStyle(String style){
         graphicsEnvironmentImpl.setFillStyle(style);
@@ -269,25 +268,25 @@
         graphicsEnvironmentImpl.strokeText(text, x, y, maxWidth);
     }
 
-//    public ImageData createImageData(double x, double y){
-//        return graphicsEnvironmentImpl.createImageData(x, y);
-//    }
-//
-//    public ImageData createImageData(ImageData imageData){
-//        return graphicsEnvironmentImpl.createImageData(imageData);
-//    }
-//
-//    public ImageData 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){
-//        graphicsEnvironmentImpl.putImageData(imageData, x, y);
-//    }
-//
-//    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){
-//        graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight);
-//    }
+////    public ImageData createImageData(double x, double y){
+////        return graphicsEnvironmentImpl.createImageData(x, y);
+////    }
+////
+////    public ImageData createImageData(ImageData imageData){
+////        return graphicsEnvironmentImpl.createImageData(imageData);
+////    }
+////
+////    public ImageData 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){
+////        graphicsEnvironmentImpl.putImageData(imageData, x, y);
+////    }
+////
+////    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight){
+////        graphicsEnvironmentImpl.putImageData(imageData, x, y, dirtyx, dirtyy, dirtywidth, dirtyheight);
+////    }
 
     public void setGlobalAlpha(double alpha){
         graphicsEnvironmentImpl.setGlobalAlpha(alpha);
@@ -309,17 +308,17 @@
         return new LinearGradient(x0, y0, x1, y1);
     }
 
-    public Pattern createPattern(ImageData image, String repeat){
-        return new Pattern(image, repeat);
-    }
+////    public Pattern createPattern(ImageData image, String repeat){
+////        return new Pattern(image, repeat);
+////    }
 
     public RadialGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1){
         return new RadialGradient(x0, y0, r0, x1, y1, r1);
     }
 
-//    public ImageData getImageDataForPath(String path){
-//        return graphicsEnvironmentImpl.getImageForPath(path);
-//    }
+////    public ImageData getImageDataForPath(String path){
+////        return graphicsEnvironmentImpl.getImageForPath(path);
+////    }
 
     public int getHeight(){
         return graphicsEnvironmentImpl.getHeight();
diff -r 591d06d8e06f -r 964e42c9448d javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java
--- a/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Thu May 23 15:36:42 2013 +0200
+++ b/javaquery/canvas/src/main/java/net/java/html/canvas/spi/GraphicsEnvironment.java	Fri May 24 07:36:58 2013 +0200
@@ -17,8 +17,7 @@
  */
 package net.java.html.canvas.spi;
 
-import java.awt.Dimension;
-import net.java.html.canvas.ImageData;
+import net.java.html.canvas.Dimension;
 import net.java.html.canvas.Style;
 
 /**
@@ -82,12 +81,12 @@
 
     public void scale(double x, double y);
 
-    public void drawImage(ImageData image, double x, double y);
-
-    public void drawImage(ImageData image, double x, double y, double width, double 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(ImageData image, double x, double y);
+////
+////    public void drawImage(ImageData image, double x, double y, double width, double height);
+////
+////    public void drawImage(ImageData image, double sx, double sy, double sWidth, double sHeight, double x, double y, double width, double height);
+//
     public void setFillStyle(String style);
 
     public String getFillStyle();
@@ -154,15 +153,15 @@
 
     public void strokeText(String text, double x, double y, double maxWidth);
 
-//    public ImageData createImageData(double x, double y);
-//
-//    public ImageData createImageData(ImageData imageData);
-//
-//    public ImageData getImageData(double x, double y, double width, double height);
-//
-//    public void putImageData(ImageData imageData, double x, double y);
-//
-//    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
+////    public ImageData createImageData(double x, double y);
+////
+////    public ImageData createImageData(ImageData imageData);
+////
+////    public ImageData getImageData(double x, double y, double width, double height);
+////
+////    public void putImageData(ImageData imageData, double x, double y);
+////
+////    public void putImageData(ImageData imageData, double x, double y, double dirtyx, double dirtyy, double dirtywidth, double dirtyheight);
 
     public void setGlobalAlpha(double alpha);
 
@@ -172,7 +171,7 @@
 
     public String getGlobalCompositeOperation();
 
-//    public ImageData getImageForPath(String path);
+////    public ImageData getImageForPath(String path);
 
     public int getHeight();