1.1 --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Fri May 24 07:36:58 2013 +0200
     1.2 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java	Fri May 24 12:29:58 2013 +0200
     1.3 @@ -144,18 +144,6 @@
     1.4  ////        graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height);
     1.5  ////    }
     1.6  
     1.7 -    public void setFillStyle(String style){
     1.8 -        graphicsEnvironmentImpl.setFillStyle(style);
     1.9 -    }
    1.10 -
    1.11 -    public String getFillStyle(){
    1.12 -        return graphicsEnvironmentImpl.getFillStyle();
    1.13 -    }
    1.14 -
    1.15 -    public void setStrokeStyle(String style){
    1.16 -        graphicsEnvironmentImpl.setStrokeStyle(style);
    1.17 -    }
    1.18 -
    1.19      public void setShadowColor(String color){
    1.20          graphicsEnvironmentImpl.setShadowColor(color);
    1.21      }
    1.22 @@ -172,10 +160,6 @@
    1.23          graphicsEnvironmentImpl.setShadowOffsetY(y);
    1.24      }
    1.25  
    1.26 -    public String getStrokeStyle(){
    1.27 -        return graphicsEnvironmentImpl.getStrokeStyle();
    1.28 -    }
    1.29 -
    1.30      public String getShadowColor(){
    1.31          return graphicsEnvironmentImpl.getShadowColor();
    1.32      }
    1.33 @@ -223,6 +207,11 @@
    1.34      public void setMiterLimit(double limit){
    1.35          graphicsEnvironmentImpl.setMiterLimit(limit);
    1.36      }
    1.37 +    
    1.38 +    public void setFillStyle(Style style){
    1.39 +        Object nativeFillStyle = graphicsEnvironmentImpl.setFillStyle(style, style.getCached());
    1.40 +        style.cache(nativeFillStyle);
    1.41 +    }
    1.42  
    1.43      public String getFont(){
    1.44          return graphicsEnvironmentImpl.getFont();
    1.45 @@ -231,6 +220,11 @@
    1.46      public void setFont(String font){
    1.47          graphicsEnvironmentImpl.setFont(font);
    1.48      }
    1.49 +    
    1.50 +    public void setStrokeStyle(Style style){
    1.51 +        Object nativeStrokeStyle = graphicsEnvironmentImpl.setStrokeStyle(style, style.getCached());
    1.52 +        style.cache(nativeStrokeStyle);
    1.53 +    }
    1.54  
    1.55      public String getTextAlign(){
    1.56          return graphicsEnvironmentImpl.getTextAlign();