Factorized creation of gradient colors

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

diff --git a/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java b/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
index c4035a3f47f1cf85b7912298225b4e32baf49303..43212aebd55bbaad77532c6f168050f0421c390a 100644 (file)
--- a/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
+++ b/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
@@ -110,21 +110,9 @@ public class PSSVGGraphics2D extends PSGraphics2D implements GradientRegistrar {
         theCoords.add(gp.getEndPoint().getX());
         theCoords.add(gp.getEndPoint().getY());
 
+        List<Color> colors = createGradientColors(gp);
 
-        Color[] cols = gp.getColors();
-        List<Color> someColors = new java.util.ArrayList<Color>();
         float[] fractions = gp.getFractions();
-        if (fractions[0] > 0f) {
-            someColors.add(cols[0]);
-        }
-        for (int count = 0; count < cols.length; count++) {
-            Color c = cols[count];
-            someColors.add(c);
-        }
-        if (fractions[fractions.length - 1] < 1f) {
-            someColors.add(cols[cols.length - 1]);
-        }
-
         List<Double> theBounds = new java.util.ArrayList<Double>();
         for (int count = 0; count < fractions.length; count++) {
             float offset = fractions[count];
@@ -137,7 +125,7 @@ public class PSSVGGraphics2D extends PSGraphics2D implements GradientRegistrar {
 
         PSGradientFactory gradientFactory = new PSGradientFactory();
         PSPattern myPattern = gradientFactory.createGradient(false, colSpace,
-                someColors, theBounds, theCoords, matrix);
+                colors, theBounds, theCoords, matrix);
 
         gen.write(myPattern.toString());
 
@@ -173,20 +161,9 @@ public class PSSVGGraphics2D extends PSGraphics2D implements GradientRegistrar {
         theCoords.add(new Double(ac.getY()));
         theCoords.add(new Double(ar));
 
-        Color[] cols = gp.getColors();
-        List<Color> someColors = new java.util.ArrayList<Color>();
-        float[] fractions = gp.getFractions();
-        if (fractions[0] > 0f) {
-            someColors.add(cols[0]);
-        }
-        for (int count = 0; count < cols.length; count++) {
-            Color c = cols[count];
-            someColors.add(c);
-        }
-        if (fractions[fractions.length - 1] < 1f) {
-            someColors.add(cols[cols.length - 1]);
-        }
+        List<Color> colors = createGradientColors(gp);
 
+        float[] fractions = gp.getFractions();
         List<Double> theBounds = new java.util.ArrayList<Double>();
         for (int count = 0; count < fractions.length; count++) {
             float offset = fractions[count];
@@ -199,7 +176,7 @@ public class PSSVGGraphics2D extends PSGraphics2D implements GradientRegistrar {
 
         PSGradientFactory gradientFactory = new PSGradientFactory();
         PSPattern myPattern = gradientFactory.createGradient(true, colSpace,
-                someColors, theBounds, theCoords, matrix);
+                colors, theBounds, theCoords, matrix);
 
         gen.write(myPattern.toString());
     }
@@ -217,6 +194,22 @@ public class PSSVGGraphics2D extends PSGraphics2D implements GradientRegistrar {
         return matrix;
     }
 
+    private List<Color> createGradientColors(MultipleGradientPaint gradient) {
+        Color[] svgColors = gradient.getColors();
+        List<Color> gradientColors = new ArrayList<Color>(svgColors.length + 2);
+        float[] fractions = gradient.getFractions();
+        if (fractions[0] > 0f) {
+            gradientColors.add(svgColors[0]);
+        }
+        for (Color c : svgColors) {
+            gradientColors.add(c);
+        }
+        if (fractions[fractions.length - 1] < 1f) {
+            gradientColors.add(svgColors[svgColors.length - 1]);
+        }
+        return gradientColors;
+    }
+
     private AffineTransform applyTransform(AffineTransform base, double posX, double posY) {
         AffineTransform result = AffineTransform.getTranslateInstance(posX, posY);
         AffineTransform orig = base;