From 0fefda39d6ea3d841337c648d94a7ca9e2c10854 Mon Sep 17 00:00:00 2001
From: kitfox
Date: Wed, 22 Apr 2009 21:01:18 +0000
Subject: Gradient references are now handled as URIs rather than being
 referenced directly.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@62 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b
---
 src/main/java/com/kitfox/svg/Gradient.java | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/kitfox/svg/Gradient.java b/src/main/java/com/kitfox/svg/Gradient.java
index a1336f1..0b13167 100644
--- a/src/main/java/com/kitfox/svg/Gradient.java
+++ b/src/main/java/com/kitfox/svg/Gradient.java
@@ -57,7 +57,8 @@ abstract public class Gradient extends FillElement
     //Either this gradient contains a list of stops, or it will take it's
     // stops from the referenced gradient
     Vector stops = new Vector();
-    Gradient stopRef = null;
+    URI stopRef = null;
+//    Gradient stopRef = null;
 
     protected AffineTransform gradientTransform = null;
 
@@ -112,10 +113,10 @@ abstract public class Gradient extends FillElement
         if (getPres(sty.setName("xlink:href")))
         {
             try {
-                URI src = sty.getURIValue(getXMLBase());
+                stopRef = sty.getURIValue(getXMLBase());
 //System.err.println("Gradient: " + sty.getStringValue() + ", " + getXMLBase() + ", " + src);
 //                URI src = getXMLBase().resolve(href);
-                stopRef = (Gradient)diagram.getUniverse().getElement(src);
+//                stopRef = (Gradient)diagram.getUniverse().getElement(src);
             }
             catch (Exception e)
             {
@@ -126,7 +127,11 @@ abstract public class Gradient extends FillElement
     
     public float[] getStopFractions()
     {
-        if (stopRef != null) return stopRef.getStopFractions();
+        if (stopRef != null)
+        {
+            Gradient grad = (Gradient)diagram.getUniverse().getElement(stopRef);
+            return grad.getStopFractions();
+        }
 
         if (stopFractions != null) return stopFractions;
 
@@ -145,7 +150,11 @@ abstract public class Gradient extends FillElement
 
     public Color[] getStopColors()
     {
-        if (stopRef != null) return stopRef.getStopColors();
+        if (stopRef != null)
+        {
+            Gradient grad = (Gradient)diagram.getUniverse().getElement(stopRef);
+            return grad.getStopColors();
+        }
 
         if (stopColors != null) return stopColors;
 
@@ -181,7 +190,7 @@ abstract public class Gradient extends FillElement
         return val;
     }
     
-    public void setStopRef(Gradient grad)
+    public void setStopRef(URI grad)
     {
         stopRef = grad;
     }
@@ -250,9 +259,8 @@ abstract public class Gradient extends FillElement
         if (getPres(sty.setName("xlink:href")))
         {
             try {
-                URI src = sty.getURIValue(getXMLBase());
-                Gradient newVal = (Gradient)diagram.getUniverse().getElement(src);
-                if (newVal != stopRef)
+                URI newVal = sty.getURIValue(getXMLBase());
+                if ((newVal == null && stopRef != null) || !newVal.equals(stopRef))
                 {
                     stopRef = newVal;
                     stateChange = true;
-- 
cgit v1.2.3-55-g7522