Changeset 11525 in josm for trunk/src/com/kitfox/svg/SVGDiagram.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/SVGDiagram.java (modified) (3 diffs)

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

@@ -62 +62 @@
     
     //Indexes elements within this SVG diagram
-    final HashMap idMap = new HashMap();
+    final HashMap<String, SVGElement> idMap = new HashMap<>();
 
     SVGRoot root;
@@ -116 +116 @@
      * @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 +133 @@
     }
 
-    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<>();
         }