Index: trunk/src/com/kitfox/svg/Text.java
===================================================================
--- trunk/src/com/kitfox/svg/Text.java	(revision 10787)
+++ trunk/src/com/kitfox/svg/Text.java	(revision 11525)
@@ -44,6 +44,7 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.util.Iterator;
+import java.io.Serializable;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -63,5 +64,5 @@
     float fontSize;
     //List of strings and tspans containing the content of this node
-    LinkedList content = new LinkedList();
+    LinkedList<Serializable> content = new LinkedList<>();
     Shape textShape;
     public static final int TXAN_START = 0;
@@ -98,4 +99,5 @@
     }
 
+    @Override
     public String getTagName()
     {
@@ -122,5 +124,5 @@
     }
 
-    public java.util.List getContent()
+    public List<Serializable> getContent()
     {
         return content;
@@ -131,4 +133,5 @@
      * each child tag that has been processed
      */
+    @Override
     public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException
     {
@@ -141,4 +144,5 @@
      * Called during load process to add text scanned within a tag
      */
+    @Override
     public void loaderAddText(SVGLoaderHelper helper, String text)
     {
@@ -150,4 +154,5 @@
     }
 
+    @Override
     public void build() throws SVGException
     {
@@ -273,5 +278,5 @@
             }
         }
-
+        
         if (font == null)
         {
@@ -286,8 +291,5 @@
         AffineTransform xform = new AffineTransform();
 
-        for (Iterator it = content.iterator(); it.hasNext();)
-        {
-            Object obj = it.next();
-
+        for (Serializable obj : content) {
             if (obj instanceof String)
             {
@@ -451,4 +453,5 @@
 //    }
 
+    @Override
     public void render(Graphics2D g) throws SVGException
     {
@@ -458,4 +461,5 @@
     }
 
+    @Override
     public Shape getShape()
     {
@@ -463,4 +467,5 @@
     }
 
+    @Override
     public Rectangle2D getBoundingBox() throws SVGException
     {
@@ -475,4 +480,5 @@
      * update
      */
+    @Override
     public boolean updateTime(double curTime) throws SVGException
     {