svn commit: r14069 - trunk/src_new/org/argouml/persistence

Author: mvw
Date: 2008-01-30 11:07:27-0800
New Revision: 14069

Modified:
   trunk/src_new/org/argouml/persistence/PGML.tee
   trunk/src_new/org/argouml/persistence/PGMLStackParser.java

Log:
Fix for issue 4951, point 3: Persist the color of the primitive text fig.

Modified: trunk/src_new/org/argouml/persistence/PGML.tee
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/PGML.tee?view=diff&rev=14069&p1=trunk/src_new/org/argouml/persistence/PGML.tee&p2=trunk/src_new/org/argouml/persistence/PGML.tee&r1=14068&r2=14069
==============================================================================
--- trunk/src_new/org/argouml/persistence/PGML.tee	(original)
+++ trunk/src_new/org/argouml/persistence/PGML.tee	2008-01-30 11:07:27-0800
@@ -216,7 +216,7 @@
   width="<ocl>self.width.intValue</ocl>"
   height="<ocl>self.height.intValue</ocl>"
   FILL_AND_STROKE
-
+  textcolor="<ocl>self.textColor</ocl>"
   font="<ocl>self.fontFamily</ocl>"
   italic="<ocl>self.italic</ocl>"
   bold="<ocl>self.bold</ocl>"

Modified: trunk/src_new/org/argouml/persistence/PGMLStackParser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/PGMLStackParser.java?view=diff&rev=14069&p1=trunk/src_new/org/argouml/persistence/PGMLStackParser.java&p2=trunk/src_new/org/argouml/persistence/PGMLStackParser.java&r1=14068&r2=14069
==============================================================================
--- trunk/src_new/org/argouml/persistence/PGMLStackParser.java	(original)
+++ trunk/src_new/org/argouml/persistence/PGMLStackParser.java	2008-01-30 11:07:27-0800
@@ -68,6 +68,7 @@
 import org.tigris.gef.presentation.FigPoly;
 import org.tigris.gef.presentation.FigRRect;
 import org.tigris.gef.presentation.FigText;
+import org.tigris.gef.util.ColorFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -187,6 +188,12 @@
                     text.setBold(Boolean.valueOf(bold));
                 }
 
+                String textColor = attributes.getValue("textcolor");
+                if (textColor != null && !textColor.equals("")) {
+                    text.setTextColor(
+                            ColorFactory.getColor(textColor));
+                }
+
                 return new FigTextHandler(this, text);
             }
         }