3 files changed, 44 insertions, 23 deletions
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";