# HG changeset patch # User Anton Epple # Date 1369289711 -7200 # Node ID dec5f4e7d031d831f0ef0abebf46e6d2df088019 # Parent 6790eb381615a12f58c8a4b9083e6fda1ed093b7 moved creation of Gradient and patterns to GC and removed it from GE diff -r 6790eb381615 -r dec5f4e7d031 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 08:07:54 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsContext.java Thu May 23 08:15:11 2013 +0200 @@ -313,15 +313,15 @@ } public LinearGradient createLinearGradient(double x0, double y0, double x1, double y1){ - return graphicsEnvironmentImpl.createLinearGradient(x0, y0, x1, y1); + return new LinearGradient(x0, y0, x1, y1); } public Pattern createPattern(ImageData image, String repeat){ - return graphicsEnvironmentImpl.createPattern(image, repeat); + return new Pattern(image, repeat); } public RadialGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1){ - return graphicsEnvironmentImpl.createRadialGradient(x0, y0, r0, x1, y1, r1); + return new RadialGradient(x0, y0, r0, x1, y1, r1); } public ImageData getImageDataForPath(String path){ diff -r 6790eb381615 -r dec5f4e7d031 javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java Thu May 23 08:07:54 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/GraphicsEnvironment.java Thu May 23 08:15:11 2013 +0200 @@ -170,12 +170,6 @@ public String getGlobalCompositeOperation(); - public LinearGradient createLinearGradient(double x0, double y0, double x1, double y1); - - public Pattern createPattern(ImageData image, String repeat); - - public RadialGradient createRadialGradient(double x0, double y0, double r0, double x1, double y1, double r1); - public void addColorStop(LinearGradient gradient, double position, String color); public ImageData getImageDataForPath(String path); diff -r 6790eb381615 -r dec5f4e7d031 javaquery/canvas/src/main/java/net/java/html/canvas/LinearGradient.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/LinearGradient.java Thu May 23 08:07:54 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/LinearGradient.java Thu May 23 08:15:11 2013 +0200 @@ -29,6 +29,15 @@ double x0, y0, x1, y1; + public LinearGradient( double x0, double y0, double x1, double y1) { + this.x0 = x0; + this.y0 = y0; + this.x1 = x1; + this.y1 = y1; + } + + + void addColorStop(double position, String color){ if (stops == null) stops = new HashMap<>(); stops.put(position, color); diff -r 6790eb381615 -r dec5f4e7d031 javaquery/canvas/src/main/java/net/java/html/canvas/Pattern.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/Pattern.java Thu May 23 08:07:54 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/Pattern.java Thu May 23 08:15:11 2013 +0200 @@ -26,6 +26,11 @@ ImageData imageData; String repeat; + public Pattern(ImageData imageData, String repeat) { + this.imageData = imageData; + this.repeat = repeat; + } + public ImageData getImageData() { return imageData; } diff -r 6790eb381615 -r dec5f4e7d031 javaquery/canvas/src/main/java/net/java/html/canvas/RadialGradient.java --- a/javaquery/canvas/src/main/java/net/java/html/canvas/RadialGradient.java Thu May 23 08:07:54 2013 +0200 +++ b/javaquery/canvas/src/main/java/net/java/html/canvas/RadialGradient.java Thu May 23 08:15:11 2013 +0200 @@ -24,6 +24,12 @@ public class RadialGradient extends LinearGradient{ double r0, r1; + public RadialGradient( double x0, double y0,double r0, double x1, double y1, double r1) { + super(x0, y0, x1, y1); + this.r0 = r0; + this.r1 = r1; + } + public double getR0() { return r0; }