Removed pseudo-factory method GradientFactory.newInstance

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP-2393_gradient-rendering@1609511 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 17 deletions

diff --git a/src/java/org/apache/fop/render/shading/GradientFactory.java b/src/java/org/apache/fop/render/shading/GradientFactory.java
index 87ac11c83..882faa302 100644
--- a/src/java/org/apache/fop/render/shading/GradientFactory.java
+++ b/src/java/org/apache/fop/render/shading/GradientFactory.java
@@ -26,26 +26,9 @@ import java.util.List;
 import org.apache.xmlgraphics.java2d.color.ColorUtil;
 
 import org.apache.fop.pdf.PDFDeviceColorSpace;
-import org.apache.fop.render.ps.svg.PSSVGGraphics2D;
 
 public abstract class GradientFactory {
 
-    static GradientRegistrar registrar;
-
-    /**
-     * Constructor
-     * @param registrar The object used to register new embedded objects in the
-     * output format.
-     */
-    public static GradientFactory newInstance(GradientRegistrar theRegistrar) {
-        registrar = theRegistrar;
-        if (registrar instanceof PSSVGGraphics2D) {
-            return new PSGradientFactory();
-        } else {
-            return new PDFGradientFactory();
-        }
-    }
-
     /**
      * Creates a new gradient
      * @param radial Determines whether the gradient is radial
diff --git a/src/java/org/apache/fop/render/shading/PDFGradientFactory.java b/src/java/org/apache/fop/render/shading/PDFGradientFactory.java
index 3b3dcab75..c40ac0671 100644
--- a/src/java/org/apache/fop/render/shading/PDFGradientFactory.java
+++ b/src/java/org/apache/fop/render/shading/PDFGradientFactory.java
@@ -24,9 +24,16 @@ import org.apache.fop.pdf.PDFDeviceColorSpace;
 import org.apache.fop.pdf.PDFFunction;
 import org.apache.fop.pdf.PDFPattern;
 import org.apache.fop.pdf.PDFShading;
+import org.apache.fop.svg.PDFGraphics2D;
 
 public class PDFGradientFactory extends GradientFactory {
 
+    private final GradientRegistrar registrar;
+
+    public PDFGradientFactory(PDFGraphics2D pdfGraphics2D) {
+        this.registrar = pdfGraphics2D;
+    }
+
     @Override
     public PDFPattern createGradient(boolean radial, PDFDeviceColorSpace theColorspace, List<Color> theColors,
             List<Double> theBounds, List<Double> theCoords, List<Double> theMatrix) {