Changeset 11525 in josm for trunk/src/com/kitfox/svg/Text.java

Timestamp:

2017-02-02T00:08:08+01:00 (7 years ago)

Author:

Don-vip

Message:

see #14319 - update to latest version of svgSalamander (2017-01-07, patched)

File:

• trunk/src/com/kitfox/svg/Text.java (modified) (13 diffs)

trunk/src/com/kitfox/svg/Text.java

@@ -44 +44 @@
 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 +64 @@
     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 +99 @@
     }
 
+    @Override
     public String getTagName()
     {
@@ -122 +124 @@
     }
 
-    public java.util.List getContent()
+    public List<Serializable> getContent()
     {
         return content;
@@ -131 +133 @@
      * each child tag that has been processed
      */
+    @Override
     public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException
     {
@@ -141 +144 @@
      * Called during load process to add text scanned within a tag
      */
+    @Override
     public void loaderAddText(SVGLoaderHelper helper, String text)
     {
@@ -150 +154 @@
     }
 
+    @Override
     public void build() throws SVGException
     {
@@ -273 +278 @@
             }
         }
-
+        
         if (font == null)
         {
@@ -286 +291 @@
         AffineTransform xform = new AffineTransform();
 
-        for (Iterator it = content.iterator(); it.hasNext();)
-        {
-            Object obj = it.next();
-
+        for (Serializable obj : content) {
             if (obj instanceof String)
             {
@@ -451 +453 @@
 //    }
 
+    @Override
     public void render(Graphics2D g) throws SVGException
     {
@@ -458 +461 @@
     }
 
+    @Override
     public Shape getShape()
     {
@@ -463 +467 @@
     }
 
+    @Override
     public Rectangle2D getBoundingBox() throws SVGException
     {
@@ -475 +480 @@
      * update
      */
+    @Override
     public boolean updateTime(double curTime) throws SVGException
     {