diff -r 964e42c9448d -r 69c81bdaf193 javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Fri May 24 07:36:58 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Fri May 24 12:29:58 2013 +0200 @@ -144,18 +144,6 @@ //// graphicsEnvironmentImpl.drawImage(image, sx, sy, sWidth, sHeight, x, y, width, height); //// } - public void setFillStyle(String style){ - graphicsEnvironmentImpl.setFillStyle(style); - } - - public String getFillStyle(){ - return graphicsEnvironmentImpl.getFillStyle(); - } - - public void setStrokeStyle(String style){ - graphicsEnvironmentImpl.setStrokeStyle(style); - } - public void setShadowColor(String color){ graphicsEnvironmentImpl.setShadowColor(color); } @@ -172,10 +160,6 @@ graphicsEnvironmentImpl.setShadowOffsetY(y); } - public String getStrokeStyle(){ - return graphicsEnvironmentImpl.getStrokeStyle(); - } - public String getShadowColor(){ return graphicsEnvironmentImpl.getShadowColor(); } @@ -223,6 +207,11 @@ public void setMiterLimit(double limit){ graphicsEnvironmentImpl.setMiterLimit(limit); } + + public void setFillStyle(Style style){ + Object nativeFillStyle = graphicsEnvironmentImpl.setFillStyle(style, style.getCached()); + style.cache(nativeFillStyle); + } public String getFont(){ return graphicsEnvironmentImpl.getFont(); @@ -231,6 +220,11 @@ public void setFont(String font){ graphicsEnvironmentImpl.setFont(font); } + + public void setStrokeStyle(Style style){ + Object nativeStrokeStyle = graphicsEnvironmentImpl.setStrokeStyle(style, style.getCached()); + style.cache(nativeStrokeStyle); + } public String getTextAlign(){ return graphicsEnvironmentImpl.getTextAlign();