svn commit: r1402820 - in /xmlgraphics/commons/trunk: src/java/org/apache/xmlgraphics/java2d/GraphicContext.java test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java

[lb...@apache.org]

Author: lbernardo
Date: Sat Oct 27 16:46:20 2012
New Revision: 1402820

URL: http://svn.apache.org/viewvc?rev=1402820&view=rev
Log:
bugzilla #49516: patch 29221; fixes gradient fill opacity incorrectly inherits stroke opacity of previous svg element

Added:
    xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java   (with props)
Modified:
    xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java

Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java?rev=1402820&r1=1402819&r2=1402820&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/java2d/GraphicContext.java Sat Oct 27 16:46:20 2012
@@ -428,6 +428,9 @@ public class GraphicContext implements C
         this.paint = paint;
         if(paint instanceof Color) {
             foreground = (Color)paint;
+        } else {
+            // use default; otherwise the previous Color will be used
+            foreground = Color.black;
         }
     }
 

Added: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java?rev=1402820&view=auto
==============================================================================
--- xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java (added)
+++ xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java Sat Oct 27 16:46:20 2012
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id: GraphicContext.java 1345683 2012-06-03 14:50:33Z gadams $ */
+
+package org.apache.xmlgraphics.java2d;
+
+import java.awt.Color;
+import java.awt.LinearGradientPaint;
+import java.awt.geom.Point2D;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class GraphicContextTestCase {
+
+    @Test
+    public void testSetPaint() {
+        GraphicContext gc = new GraphicContext();
+        Color red = Color.RED;
+        gc.setPaint(red);
+        assertEquals(red, gc.getColor());
+        Point2D start = new Point2D.Float(0, 0);
+        Point2D end = new Point2D.Float(50, 50);
+        float[] dist = {0.0f, 0.2f, 1.0f};
+        Color[] colors = {Color.RED, Color.WHITE, Color.BLUE};
+        LinearGradientPaint lgp = new LinearGradientPaint(start, end, dist, colors);
+        gc.setPaint(lgp);
+        assertEquals(Color.BLACK, gc.getColor());
+    }
+}

Propchange: xmlgraphics/commons/trunk/test/java/org/apache/xmlgraphics/java2d/GraphicContextTestCase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org