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

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/com/kitfox/svg/ShapeElement.java (modified) (3 diffs)

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

@@ -87 +87 @@
 
     @Override
-    void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException
+    void pick(Point2D point, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
     {
 //        StyleAttribute styleAttrib = new StyleAttribute();
@@ -98 +98 @@
 
     @Override
-    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException
-    {
-        StyleAttribute styleAttrib = new StyleAttribute();
+    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
+    {
+//        StyleAttribute styleAttrib = new StyleAttribute();
 //        if (getStyle(styleAttrib.setName("fill")) && getShape().contains(point))
         if (ltw.createTransformedShape((boundingBox ? getBoundingBox() : getShape())).intersects(pickArea))
@@ -397 +397 @@
             layout.layout(shape);
             
-            ArrayList list = layout.getMarkerList();
+            ArrayList<MarkerPos> list = layout.getMarkerList();
             for (int i = 0; i < list.size(); ++i)
             {
-                MarkerPos pos = (MarkerPos)list.get(i);
+                MarkerPos pos = list.get(i);
 
                 switch (pos.type)