[499108] Consider the new bgPattern attribute in popState and pushState

In bug 491913, a new attribute bgPattern has been added to correctly
handled the gradient in all kind of format for export as image. But it
is not correctly set during the popState() and pushState() methods.
So after drawing a shape with gradient background color, there was a
side effect for following shapes.

Bug: 499108
Bug: 491913
Change-Id: I17d7b370f4581ad4abe5b3545b380f99e310f522
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

1 files changed, 2 insertions, 0 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java
index 5d94be7619..36914ea000 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/render/SiriusGraphicsToGraphics2DAdaptor.java
@@ -159,6 +159,7 @@ public class SiriusGraphicsToGraphics2DAdaptor extends Graphics implements Drawa
             font = state.font;
             fgColor = state.fgColor;
             bgColor = state.bgColor;
+            bgPattern = state.bgPattern;
             XorMode = state.XorMode;
             alpha = state.alpha;
             graphicHints = state.graphicHints;
@@ -939,6 +940,7 @@ public class SiriusGraphicsToGraphics2DAdaptor extends Graphics implements Drawa
 
         setBackgroundColor(state.bgColor);
         setForegroundColor(state.fgColor);
+        setBackgroundPattern(state.bgPattern);
         setLineAttributes(state.lineAttributes);
         setXORMode(state.XorMode);