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

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

@@ -66 +66 @@
     }
 
+    @Override
     public String getTagName()
     {
@@ -75 +76 @@
      * each child tag that has been processed
      */
+    @Override
     public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException
     {
@@ -98 +100 @@
     }
 
-    void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException
+    @Override
+    void pick(Point2D point, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
     {
         Point2D xPoint = new Point2D.Double(point.getX(), point.getY());
@@ -113 +116 @@
 
 
-        for (Iterator it = children.iterator(); it.hasNext();)
-        {
-            SVGElement ele = (SVGElement) it.next();
+        for (SVGElement ele : children) {
             if (ele instanceof RenderableElement)
             {
@@ -125 +126 @@
     }
 
-    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException
+    @Override
+    void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List<List<SVGElement>> retVec) throws SVGException
     {
         if (xform != null)
@@ -134 +136 @@
 
 
-        for (Iterator it = children.iterator(); it.hasNext();)
-        {
-            SVGElement ele = (SVGElement) it.next();
+        for (SVGElement ele : children) {
             if (ele instanceof RenderableElement)
             {
@@ -146 +146 @@
     }
 
+    @Override
     public void render(Graphics2D g) throws SVGException
     {
@@ -169 +170 @@
         beginLayer(g);
 
-        Iterator it = children.iterator();
+        Iterator<SVGElement> it = children.iterator();
 
 //        try
@@ -185 +186 @@
         while (it.hasNext())
         {
-            SVGElement ele = (SVGElement) it.next();
+            SVGElement ele = it.next();
             if (ele instanceof RenderableElement)
             {
@@ -212 +213 @@
      * Retrieves the cached bounding box of this group
      */
+    @Override
     public Shape getShape()
     {
@@ -225 +227 @@
         Area retShape = new Area();
 
-        for (Iterator it = children.iterator(); it.hasNext();)
-        {
-            SVGElement ele = (SVGElement) it.next();
-
+        for (SVGElement ele : children) {
             if (ele instanceof ShapeElement)
             {
@@ -246 +245 @@
      * Retrieves the cached bounding box of this group
      */
+    @Override
     public Rectangle2D getBoundingBox() throws SVGException
     {
@@ -262 +262 @@
     public void calcBoundingBox() throws SVGException
     {
-//        Rectangle2D retRect = new Rectangle2D.Float();
         Rectangle2D retRect = null;
 
-        for (Iterator it = children.iterator(); it.hasNext();)
-        {
-            SVGElement ele = (SVGElement) it.next();
-
+        for (SVGElement ele : children) {
             if (ele instanceof RenderableElement)
             {
@@ -304 +300 @@
     }
 
+    @Override
     public boolean updateTime(double curTime) throws SVGException
     {
         boolean changeState = super.updateTime(curTime);
-        Iterator it = children.iterator();
+        Iterator<SVGElement> it = children.iterator();
 
         //Distribute message to all members of this group
         while (it.hasNext())
         {
-            SVGElement ele = (SVGElement) it.next();
+            SVGElement ele = it.next();
             boolean updateVal = ele.updateTime(curTime);