Index: trunk/src/com/kitfox/svg/SVGDiagram.java
===================================================================
--- trunk/src/com/kitfox/svg/SVGDiagram.java	(revision 8084)
+++ trunk/src/com/kitfox/svg/SVGDiagram.java	(revision 11525)
@@ -62,5 +62,5 @@
     
     //Indexes elements within this SVG diagram
-    final HashMap idMap = new HashMap();
+    final HashMap<String, SVGElement> idMap = new HashMap<>();
 
     SVGRoot root;
@@ -116,14 +116,14 @@
      * @return the passed in list
      */
-    public List pick(Point2D point, List retVec) throws SVGException
+    public List<List<SVGElement>> pick(Point2D point, List<List<SVGElement>> retVec) throws SVGException
     {
         return pick(point, false, retVec);
     }
     
-    public List pick(Point2D point, boolean boundingBox, List retVec) throws SVGException
+    public List<List<SVGElement>> pick(Point2D point, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
     {
         if (retVec == null)
         {
-            retVec = new ArrayList();
+            retVec = new ArrayList<>();
         }
         
@@ -133,14 +133,14 @@
     }
 
-    public List pick(Rectangle2D pickArea, List retVec) throws SVGException
+    public List<List<SVGElement>> pick(Rectangle2D pickArea, List<List<SVGElement>> retVec) throws SVGException
     {
         return pick(pickArea, false, retVec);
     }
     
-    public List pick(Rectangle2D pickArea, boolean boundingBox, List retVec) throws SVGException
+    public List<List<SVGElement>> pick(Rectangle2D pickArea, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
     {
         if (retVec == null)
         {
-            retVec = new ArrayList();
+            retVec = new ArrayList<>();
         }