Fixed bug where chained 'move' path commands were not switching to 'line' after first path segment. Switched from using Vector to List. Added new project containing example files.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@70 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b

21 files changed, 133 insertions, 158 deletions

diff --git a/src/main/java/com/kitfox/svg/ClipPath.java b/src/main/java/com/kitfox/svg/ClipPath.java
index 4c16f06..8354c03 100644
--- a/src/main/java/com/kitfox/svg/ClipPath.java
+++ b/src/main/java/com/kitfox/svg/ClipPath.java
@@ -42,8 +42,6 @@ import org.xml.sax.*;
 public class ClipPath extends SVGElement 

 {

 

-//    final Vector members = new Vector();

-

     public static final int CP_USER_SPACE_ON_USE = 0;

     public static final int CP_OBJECT_BOUNDING_BOX = 1;

 

diff --git a/src/main/java/com/kitfox/svg/Defs.java b/src/main/java/com/kitfox/svg/Defs.java
index ed7e615..18586ab 100644
--- a/src/main/java/com/kitfox/svg/Defs.java
+++ b/src/main/java/com/kitfox/svg/Defs.java
@@ -38,9 +38,8 @@ import org.xml.sax.*;
  * @author Mark McKay

  * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>

  */

-public class Defs extends TransformableElement {

-

-//    final Vector members = new Vector();

+public class Defs extends TransformableElement

+{

 

     /** Creates a new instance of Stop */

     public Defs() {

diff --git a/src/main/java/com/kitfox/svg/Filter.java b/src/main/java/com/kitfox/svg/Filter.java
index 0c41f15..d64e582 100644
--- a/src/main/java/com/kitfox/svg/Filter.java
+++ b/src/main/java/com/kitfox/svg/Filter.java
@@ -27,14 +27,11 @@
 

 package com.kitfox.svg;

 

-import com.kitfox.svg.xml.StyleAttribute;

-import java.awt.*;

 import java.awt.geom.*;

 import java.net.*;

 import java.util.*;

 

 import com.kitfox.svg.xml.*;

-import org.xml.sax.*;

 

 /**

  * @author Mark McKay

@@ -61,7 +58,7 @@ public class Filter extends SVGElement
     

     URL href = null;

 

-    final Vector filterEffects = new Vector();

+    final ArrayList filterEffects = new ArrayList();

 

     /** Creates a new instance of FillElement */

     public Filter() {

diff --git a/src/main/java/com/kitfox/svg/Font.java b/src/main/java/com/kitfox/svg/Font.java
index 0896472..7d4a665 100644
--- a/src/main/java/com/kitfox/svg/Font.java
+++ b/src/main/java/com/kitfox/svg/Font.java
@@ -50,8 +50,6 @@ public class Font extends SVGElement
     int vertOriginY = -1;  //Defaults to font's ascent

     int vertAdvY = -1;  //Defaults to one 'em'.  See font-face

 

-    //Vector members = null;

-

     FontFace fontFace = null;

     MissingGlyph missingGlyph = null;

     final HashMap glyphs = new HashMap();

diff --git a/src/main/java/com/kitfox/svg/Gradient.java b/src/main/java/com/kitfox/svg/Gradient.java
index 0b13167..0ebacdf 100644
--- a/src/main/java/com/kitfox/svg/Gradient.java
+++ b/src/main/java/com/kitfox/svg/Gradient.java
@@ -27,14 +27,12 @@
 

 package com.kitfox.svg;

 

-import com.kitfox.svg.xml.StyleAttribute;

 import java.net.*;

 import java.util.*;

 import java.awt.geom.*;

 import java.awt.*;

 

 import com.kitfox.svg.xml.*;

-import org.xml.sax.*;

 

 /**

  * @author Mark McKay

@@ -56,7 +54,7 @@ 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();

+    ArrayList stops = new ArrayList();

     URI stopRef = null;

 //    Gradient stopRef = null;

 

diff --git a/src/main/java/com/kitfox/svg/Group.java b/src/main/java/com/kitfox/svg/Group.java
index ff13629..3c3b6ee 100644
--- a/src/main/java/com/kitfox/svg/Group.java
+++ b/src/main/java/com/kitfox/svg/Group.java
@@ -27,20 +27,25 @@
 

 package com.kitfox.svg;

 

-import java.awt.*;

-import java.awt.geom.*;

-import java.util.*;

+import com.kitfox.svg.xml.StyleAttribute;

+import java.awt.Graphics2D;

+import java.awt.Rectangle;

+import java.awt.Shape;

+import java.awt.geom.AffineTransform;

+import java.awt.geom.Area;

+import java.awt.geom.NoninvertibleTransformException;

+import java.awt.geom.Point2D;

+import java.awt.geom.Rectangle2D;

+import java.util.Iterator;

+import java.util.List;

 

-import com.kitfox.svg.xml.*;

-import org.xml.sax.*;

 

 /**

  * @author Mark McKay

  * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>

  */

-public class Group extends ShapeElement {

-

-//    final Vector members = new Vector();

+public class Group extends ShapeElement

+{

 

     //Cache bounding box for faster clip testing

     Rectangle2D boundingBox;

@@ -93,7 +98,7 @@ public class Group extends ShapeElement {
         return true;

     }

 

-    void pick(Point2D point, boolean boundingBox, Vector retVec) throws SVGException

+    void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException

     {

         Point2D xPoint = new Point2D.Double(point.getX(), point.getY());

         if (xform != null)

@@ -121,7 +126,7 @@ public class Group extends ShapeElement {
         }

     }

 

-    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, Vector retVec) throws SVGException

+    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException

     {

         if (xform != null)

         {

diff --git a/src/main/java/com/kitfox/svg/ImageSVG.java b/src/main/java/com/kitfox/svg/ImageSVG.java
index 6f4b301..f8d3a54 100644
--- a/src/main/java/com/kitfox/svg/ImageSVG.java
+++ b/src/main/java/com/kitfox/svg/ImageSVG.java
@@ -27,14 +27,13 @@
 

 package com.kitfox.svg;

 

-import com.kitfox.svg.xml.StyleAttribute;

 import com.kitfox.svg.xml.*;

 

 import java.awt.*;

 import java.awt.geom.*;

 import java.awt.image.*;

-import java.util.*;

 import java.net.*;

+import java.util.List;

 

 /**

  * Implements an embedded font.

@@ -127,7 +126,7 @@ public class ImageSVG extends RenderableElement
     public float getWidth() { return width; }

     public float getHeight() { return height; }

 

-    void pick(Point2D point, boolean boundingBox, Vector retVec) throws SVGException

+    void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException

     {

         if (getBoundingBox().contains(point))

         {

@@ -135,7 +134,7 @@ public class ImageSVG extends RenderableElement
         }

     }

 

-    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, Vector retVec) throws SVGException

+    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException

     {

         if (ltw.createTransformedShape(getBoundingBox()).intersects(pickArea))

         {

diff --git a/src/main/java/com/kitfox/svg/MissingGlyph.java b/src/main/java/com/kitfox/svg/MissingGlyph.java
index bc0cd2c..e36be01 100644
--- a/src/main/java/com/kitfox/svg/MissingGlyph.java
+++ b/src/main/java/com/kitfox/svg/MissingGlyph.java
@@ -27,9 +27,7 @@
 

 package com.kitfox.svg;

 

-import com.kitfox.svg.xml.StyleAttribute;

 import com.kitfox.svg.xml.*;

-import org.xml.sax.*;

 

 import java.awt.*;

 import java.awt.geom.*;

@@ -53,7 +51,6 @@ public class MissingGlyph extends ShapeElement
     Shape path = null;

 

     //Alternately, we may have child graphical elements

-//    Vector members = null;

 

     int horizAdvX = -1;  //Inherits font's value if not set

     int vertOriginX = -1;  //Inherits font's value if not set

@@ -118,10 +115,7 @@ public class MissingGlyph extends ShapeElement
      */

     public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException

     {

-		super.loaderAddChild(helper, child);

-

-//        if (members == null) members = new Vector();

-//        members.add(child);

+        super.loaderAddChild(helper, child);

     }

 

     

diff --git a/src/main/java/com/kitfox/svg/PatternSVG.java b/src/main/java/com/kitfox/svg/PatternSVG.java
index e2bc93b..44dc0ec 100644
--- a/src/main/java/com/kitfox/svg/PatternSVG.java
+++ b/src/main/java/com/kitfox/svg/PatternSVG.java
@@ -57,8 +57,6 @@ public class PatternSVG extends FillElement {
     AffineTransform patternXform = new AffineTransform();

     Rectangle2D.Float viewBox;

 

-//    final Vector members = new Vector();

-

     Paint texPaint;

 

     /** Creates a new instance of Gradient */

diff --git a/src/main/java/com/kitfox/svg/Polyline.java b/src/main/java/com/kitfox/svg/Polyline.java
index 335dd87..bf572f8 100644
--- a/src/main/java/com/kitfox/svg/Polyline.java
+++ b/src/main/java/com/kitfox/svg/Polyline.java
@@ -27,13 +27,10 @@
 

 package com.kitfox.svg;

 

-import com.kitfox.svg.xml.StyleAttribute;

-import com.kitfox.svg.xml.XMLParseUtil;

 import java.awt.geom.*;

 import java.awt.*;

 

 import com.kitfox.svg.xml.*;

-import java.util.Vector;

 

 /**

  * @author Mark McKay

diff --git a/src/main/java/com/kitfox/svg/RenderableElement.java b/src/main/java/com/kitfox/svg/RenderableElement.java
index 7afb50b..f0fee73 100644
--- a/src/main/java/com/kitfox/svg/RenderableElement.java
+++ b/src/main/java/com/kitfox/svg/RenderableElement.java
@@ -27,13 +27,17 @@
 

 package com.kitfox.svg;

 

-

 import com.kitfox.svg.xml.StyleAttribute;

-import java.awt.geom.*;

-import java.awt.*;

-import java.net.*;

-import java.util.LinkedList;

-import java.util.Vector;

+import java.awt.Graphics2D;

+import java.awt.Shape;

+import java.awt.geom.AffineTransform;

+import java.awt.geom.Area;

+import java.awt.geom.Point2D;

+import java.awt.geom.Rectangle2D;

+import java.net.URI;

+import java.util.List;

+

+

 

 /**

  * Maintains bounding box for this element

@@ -85,9 +89,9 @@ abstract public class RenderableElement extends TransformableElement
     

     abstract public void render(Graphics2D g) throws SVGException;

     

-    abstract void pick(Point2D point, boolean boundingBox, Vector retVec) throws SVGException;

+    abstract void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException;

     

-    abstract void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, Vector retVec) throws SVGException;

+    abstract void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException;

     

     abstract public Rectangle2D getBoundingBox() throws SVGException;

 /*

diff --git a/src/main/java/com/kitfox/svg/SVGDiagram.java b/src/main/java/com/kitfox/svg/SVGDiagram.java
index 41de5f5..c28e6e6 100644
--- a/src/main/java/com/kitfox/svg/SVGDiagram.java
+++ b/src/main/java/com/kitfox/svg/SVGDiagram.java
@@ -27,11 +27,17 @@
 

 package com.kitfox.svg;

 

-import java.util.*;

-import java.net.*;

-import java.awt.*;

-import java.awt.geom.*;

+import java.awt.Graphics2D;

+import java.awt.Rectangle;

+import java.awt.geom.AffineTransform;

+import java.awt.geom.Point2D;

+import java.awt.geom.Rectangle2D;

 import java.io.Serializable;

+import java.net.URI;

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+

 

 /**

  * Top level structure in an SVG tree.

@@ -92,22 +98,22 @@ public class SVGDiagram implements Serializable
      * Searches thorough the scene graph for all RenderableElements that have

      * shapes that contain the passed point.

      * 

-     * For every shape which contains the pick point, a Vector containing the

-     * path to the node is added to the return vector.  That is, the result of

+     * For every shape which contains the pick point, a List containing the

+     * path to the node is added to the return list.  That is, the result of

      * SVGElement.getPath() is added for each entry.

      *

-     * @return the passed in vector

+     * @return the passed in list

      */

-    public Vector pick(Point2D point, Vector retVec) throws SVGException

+    public List pick(Point2D point, List retVec) throws SVGException

     {

         return pick(point, false, retVec);

     }

     

-    public Vector pick(Point2D point, boolean boundingBox, Vector retVec) throws SVGException

+    public List pick(Point2D point, boolean boundingBox, List retVec) throws SVGException

     {

         if (retVec == null)

         {

-            retVec = new Vector();

+            retVec = new ArrayList();

         }

         

         root.pick(point, boundingBox, retVec);

@@ -115,16 +121,16 @@ public class SVGDiagram implements Serializable
         return retVec;

     }

 

-    public Vector pick(Rectangle2D pickArea, Vector retVec) throws SVGException

+    public List pick(Rectangle2D pickArea, List retVec) throws SVGException

     {

         return pick(pickArea, false, retVec);

     }

     

-    public Vector pick(Rectangle2D pickArea, boolean boundingBox, Vector retVec) throws SVGException

+    public List pick(Rectangle2D pickArea, boolean boundingBox, List retVec) throws SVGException

     {

         if (retVec == null)

         {

-            retVec = new Vector();

+            retVec = new ArrayList();

         }

         

         root.pick(pickArea, new AffineTransform(), boundingBox, retVec);

diff --git a/src/main/java/com/kitfox/svg/SVGElement.java b/src/main/java/com/kitfox/svg/SVGElement.java
index 7b73870..06803de 100644
--- a/src/main/java/com/kitfox/svg/SVGElement.java
+++ b/src/main/java/com/kitfox/svg/SVGElement.java
@@ -27,8 +27,6 @@
 

 package com.kitfox.svg;

 

-import com.kitfox.svg.xml.StyleAttribute;

-import com.kitfox.svg.xml.XMLParseUtil;

 import java.util.*;

 import java.util.regex.*;

 import java.net.*;

@@ -52,7 +50,7 @@ abstract public class SVGElement implements Serializable
     

     protected SVGElement parent = null;

     

-    protected final Vector children = new Vector();

+    protected final ArrayList children = new ArrayList();

     

     protected String id = null;

     /**

@@ -139,9 +137,9 @@ abstract public class SVGElement implements Serializable
     /**

      * @return an ordered list of nodes from the root of the tree to this node

      */

-    public Vector getPath(Vector retVec)

+    public List getPath(List retVec)

     {

-        if (retVec == null) retVec = new Vector();

+        if (retVec == null) retVec = new ArrayList();

         

         if (parent != null)

         {

@@ -153,14 +151,14 @@ abstract public class SVGElement implements Serializable
     }

     

     /**

-     * @param retVec - A vector to add all children to.  If null, a new vector is

+     * @param retVec - A list to add all children to.  If null, a new list is

      * created and children of this group are added.

      *

-     * @return The vector containing the children of this group

+     * @return The list containing the children of this group

      */

-    public Vector getChildren(Vector retVec)

+    public List getChildren(List retVec)

     {

-        if (retVec == null) retVec = new Vector();

+        if (retVec == null) retVec = new ArrayList();

         

         retVec.addAll(children);

         

@@ -742,9 +740,11 @@ abstract public class SVGElement implements Serializable
             {

                 case 'M':

                     cmd = new MoveTo(false, nextFloat(tokens), nextFloat(tokens));

+                    curCmd = 'L';

                     break;

                 case 'm':

                     cmd = new MoveTo(true, nextFloat(tokens), nextFloat(tokens));

+                    curCmd = 'l';

                     break;

                 case 'L':

                     cmd = new LineTo(false, nextFloat(tokens), nextFloat(tokens));

diff --git a/src/main/java/com/kitfox/svg/ShapeElement.java b/src/main/java/com/kitfox/svg/ShapeElement.java
index b346b97..6446d11 100644
--- a/src/main/java/com/kitfox/svg/ShapeElement.java
+++ b/src/main/java/com/kitfox/svg/ShapeElement.java
@@ -27,13 +27,21 @@
 

 package com.kitfox.svg;

 

-

 import com.kitfox.svg.xml.StyleAttribute;

-import java.net.*;

-import java.awt.*;

-import java.awt.geom.*;

-import com.kitfox.svg.xml.*;

-import java.util.Vector;

+import java.awt.AlphaComposite;

+import java.awt.BasicStroke;

+import java.awt.Color;

+import java.awt.Composite;

+import java.awt.Graphics2D;

+import java.awt.Paint;

+import java.awt.Shape;

+import java.awt.geom.AffineTransform;

+import java.awt.geom.Point2D;

+import java.awt.geom.Rectangle2D;

+import java.net.URI;

+import java.util.List;

+

+

 

 /**

  * Parent of shape objects

@@ -64,7 +72,7 @@ abstract public class ShapeElement extends RenderableElement
     }

      */

 

-    void pick(Point2D point, boolean boundingBox, Vector retVec) throws SVGException

+    void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException

     {

         StyleAttribute styleAttrib = new StyleAttribute();

 //        if (getStyle(styleAttrib.setName("fill")) && getShape().contains(point))

@@ -74,7 +82,7 @@ abstract public class ShapeElement extends RenderableElement
         }

     }

 

-    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, Vector retVec) throws SVGException

+    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException

     {

         StyleAttribute styleAttrib = new StyleAttribute();

 //        if (getStyle(styleAttrib.setName("fill")) && getShape().contains(point))

diff --git a/src/main/java/com/kitfox/svg/animation/AnimTimeParser.jjt b/src/main/java/com/kitfox/svg/animation/AnimTimeParser.jjt
index 3a63b4c..c538738 100644
--- a/src/main/java/com/kitfox/svg/animation/AnimTimeParser.jjt
+++ b/src/main/java/com/kitfox/svg/animation/AnimTimeParser.jjt
@@ -94,7 +94,7 @@ TOKEN :
 TimeBase Expr() :

 {

     TimeBase term;

-    Vector list = new Vector();

+    ArrayList list = new ArrayList();

 }

 {

     ( term = Sum() 

@@ -145,40 +145,6 @@ TimeBase Sum() :
 }

 

 

-/*

-{

-    TimeBase base;

-    Vector timeList = new Vector();

-    Token t;

-}

-{

-    base=Term()

-        {

-            timeList.add(base);

-        }

-    ( (t="+" | t="-") base=Term()

-        {

-            if (t.image.equals"-")

-                timeList.sub(base);

-            else

-                timeList.add(base);

-        }

-    )*

-        {

-            switch (timeList.size())

-            {

-                case 0:

-                    return new TimeIndefinite();

-                case 1:

-                    return (TimeBase)timeList.get(0);

-                default:

-                    return new TimeCompound(timeList);

-            }

-        }

-    

-}

-*/

-

 TimeBase Term() :

 {

     TimeBase base;

diff --git a/src/main/java/com/kitfox/svg/animation/AnimateMotion.java b/src/main/java/com/kitfox/svg/animation/AnimateMotion.java
index f4adcdc..97a84b3 100644
--- a/src/main/java/com/kitfox/svg/animation/AnimateMotion.java
+++ b/src/main/java/com/kitfox/svg/animation/AnimateMotion.java
@@ -35,8 +35,8 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;

 import java.awt.geom.PathIterator;

 import java.awt.geom.Point2D;

+import java.util.ArrayList;

 import java.util.Iterator;

-import java.util.Vector;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 import org.xml.sax.Attributes;

@@ -60,7 +60,7 @@ public class AnimateMotion extends AnimateXform
     public static final int RT_ANGLE = 0;  //Rotate by constant 'rotate' degrees

     public static final int RT_AUTO = 1;  //Rotate to reflect tangent of position on path

     

-    final Vector bezierSegs = new Vector();

+    final ArrayList bezierSegs = new ArrayList();

     double curveLength;

     

     /** Creates a new instance of Animate */

diff --git a/src/main/java/com/kitfox/svg/animation/TimeCompound.java b/src/main/java/com/kitfox/svg/animation/TimeCompound.java
index 0545fc6..2ba47e2 100644
--- a/src/main/java/com/kitfox/svg/animation/TimeCompound.java
+++ b/src/main/java/com/kitfox/svg/animation/TimeCompound.java
@@ -26,8 +26,11 @@
 

 package com.kitfox.svg.animation;

 

-import java.util.*;

-import java.util.regex.*;

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.List;

+import java.util.regex.Pattern;

+

 

 /**

  * This represents a summation of other time elements.  It is used for complex

@@ -49,26 +52,11 @@ public class TimeCompound extends TimeBase
     private AnimationElement parent;

     

     /** Creates a new instance of TimeDiscrete */

-    public TimeCompound(Vector timeBases)

+    public TimeCompound(List timeBases)

     {

         componentTimes = Collections.unmodifiableList(timeBases);

     }

     

-    /*

-    public TimeCompound(String text)

-    {

-        String[] vals = patPlus.split(text);

-        

-        Vector times = new Vector(vals.length);

-        

-        for (int i = 0; i < vals.length; i++)

-        {

-            times.set(i, parseTimeComponent(vals[i]));

-        }

-        

-        this(times);

-    }*/

-    

     public double evalTime()

     {

         double agg = 0.0;

diff --git a/src/main/java/com/kitfox/svg/animation/TrackBase.java b/src/main/java/com/kitfox/svg/animation/TrackBase.java
index a38866f..007f6ad 100644
--- a/src/main/java/com/kitfox/svg/animation/TrackBase.java
+++ b/src/main/java/com/kitfox/svg/animation/TrackBase.java
@@ -26,7 +26,6 @@
 

 package com.kitfox.svg.animation;

 

-import com.kitfox.svg.xml.StyleAttribute;

 import java.util.*;

 

 import com.kitfox.svg.xml.*;

@@ -50,7 +49,7 @@ abstract public class TrackBase
     

     //It doesn't make sense to sort this, since some events will depend on

     // other events - in many cases, there will be no meaningful sorted order.

-    final Vector animEvents = new Vector();

+    final ArrayList animEvents = new ArrayList();

     

     /** Creates a new instance of TrackManager */

 //    public TrackBase(SVGElement parent)

diff --git a/src/main/java/com/kitfox/svg/app/SVGPlayer.java b/src/main/java/com/kitfox/svg/app/SVGPlayer.java
index d2c4b33..3d16b2f 100644
--- a/src/main/java/com/kitfox/svg/app/SVGPlayer.java
+++ b/src/main/java/com/kitfox/svg/app/SVGPlayer.java
@@ -27,19 +27,29 @@
 

 package com.kitfox.svg.app;

 

-import java.net.*;

-import java.awt.*;

-import java.io.*;

-import java.util.regex.*;

 

-import javax.swing.*;

-

-import com.kitfox.svg.*;

+import com.kitfox.svg.SVGDiagram;

+import com.kitfox.svg.SVGDisplayPanel;

+import com.kitfox.svg.SVGElement;

+import com.kitfox.svg.SVGException;

+import com.kitfox.svg.SVGUniverse;

+import java.awt.Color;

 import java.awt.event.MouseAdapter;

 import java.awt.event.MouseEvent;

 import java.awt.geom.Point2D;

+import java.io.File;

+import java.io.InputStream;

+import java.net.URI;

+import java.net.URL;

+import java.net.URLEncoder;

 import java.security.AccessControlException;

+import java.util.ArrayList;

+import java.util.List;

 import java.util.Vector;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

+import javax.swing.JFileChooser;

+import javax.swing.JOptionPane;

 

 /**

  * @author Mark McKay

@@ -118,10 +128,10 @@ public class SVGPlayer extends javax.swing.JFrame
                 System.out.println("Picking at cursor (" + evt.getX() + ", " + evt.getY() + ")");

                 try

                 {

-                    Vector paths = diagram.pick(new Point2D.Float(evt.getX(), evt.getY()), null);

+                    List paths = diagram.pick(new Point2D.Float(evt.getX(), evt.getY()), null);

                     for (int i = 0; i < paths.size(); i++)

                     {

-                        Vector path = (Vector)paths.get(i);

+                        ArrayList path = (ArrayList)paths.get(i);

                         System.out.println(pathToString(path));

                     }

                 }

@@ -139,7 +149,7 @@ public class SVGPlayer extends javax.swing.JFrame
         playerDialog = new PlayerDialog(this);

     }

     

-    private String pathToString(Vector path)

+    private String pathToString(List path)

     {

         if (path.size() == 0) return "";

         

diff --git a/src/main/java/com/kitfox/svg/app/SVGViewer.java b/src/main/java/com/kitfox/svg/app/SVGViewer.java
index c991f35..c9b1ad1 100644
--- a/src/main/java/com/kitfox/svg/app/SVGViewer.java
+++ b/src/main/java/com/kitfox/svg/app/SVGViewer.java
@@ -27,18 +27,29 @@
 

 package com.kitfox.svg.app;

 

-import java.net.*;

-import java.awt.*;

-import java.io.*;

-import java.util.regex.*;

-import javax.swing.*;

-

-//import javax.jnlp.*;

-

-import com.kitfox.svg.*;

+import com.kitfox.svg.SVGCache;

+import com.kitfox.svg.SVGDiagram;

+import com.kitfox.svg.SVGDisplayPanel;

+import com.kitfox.svg.SVGElement;

+import com.kitfox.svg.SVGException;

+import com.kitfox.svg.SVGUniverse;

+import java.awt.BorderLayout;

+import java.awt.Color;

+import java.awt.Point;

+import java.io.File;

+import java.io.InputStream;

+import java.net.URI;

+import java.net.URL;

+import java.net.URLEncoder;

 import java.security.AccessControlException;

+import java.util.ArrayList;

 import java.util.Iterator;

-import java.util.Vector;

+import java.util.List;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

+import javax.swing.JFileChooser;

+import javax.swing.JOptionPane;

+

 

 /**

  * @author Mark McKay

@@ -303,7 +314,7 @@ is.close();
     private void panel_svgAreaMouseReleased(java.awt.event.MouseEvent evt)//GEN-FIRST:event_panel_svgAreaMouseReleased

     {//GEN-HEADEREND:event_panel_svgAreaMouseReleased

         SVGDiagram diagram = svgDisplayPanel.getDiagram();

-        Vector pickedElements;

+        List pickedElements;

         try

         {

             pickedElements = diagram.pick(new Point(evt.getX(), evt.getY()), null);

@@ -317,7 +328,7 @@ is.close();
         System.out.println("Pick results:");

         for (Iterator it = pickedElements.iterator(); it.hasNext();)

         {

-            Vector path = (Vector)it.next();

+            ArrayList path = (ArrayList)it.next();

             

             System.out.print("  Path: ");

             

diff --git a/src/main/java/com/kitfox/svg/app/ant/SVGToImageAntTask.java b/src/main/java/com/kitfox/svg/app/ant/SVGToImageAntTask.java
index f4cd85a..53f8687 100644
--- a/src/main/java/com/kitfox/svg/app/ant/SVGToImageAntTask.java
+++ b/src/main/java/com/kitfox/svg/app/ant/SVGToImageAntTask.java
@@ -70,7 +70,7 @@ import com.kitfox.svg.xml.ColorTable;
  */

 public class SVGToImageAntTask extends Task

 {

-    private Vector filesets = new Vector();

+    private ArrayList filesets = new ArrayList();

     boolean verbose = false;

     File destDir;

     private String format = "png";