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

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

@@ -41 +41 @@
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -62 +61 @@
     //Either this gradient contains a list of stops, or it will take it's
     // stops from the referenced gradient
-    ArrayList stops = new ArrayList();
+    ArrayList<Stop> stops = new ArrayList<>();
     URI stopRef = null;
     protected AffineTransform gradientTransform = null;
@@ -77 +76 @@
     }
 
+    @Override
     public String getTagName()
     {
@@ -86 +86 @@
      * each child tag that has been processed
      */
+    @Override
     public void loaderAddChild(SVGLoaderHelper helper, SVGElement child) throws SVGElementException
     {
@@ -97 +98 @@
     }
 
+    @Override
     protected void build() throws SVGException
     {
@@ -173 +175 @@
         stopFractions = new float[stops.size()];
         int idx = 0;
-        for (Iterator it = stops.iterator(); it.hasNext();)
-        {
-            Stop stop = (Stop) it.next();
+        for (Stop stop : stops) {
             float val = stop.offset;
             if (idx != 0 && val < stopFractions[idx - 1])
@@ -202 +202 @@
         stopColors = new Color[stops.size()];
         int idx = 0;
-        for (Iterator it = stops.iterator(); it.hasNext();)
-        {
-            Stop stop = (Stop) it.next();
+        for (Stop stop : stops) {
             int stopColorVal = stop.color.getRGB();
             Color stopColor = new Color((stopColorVal >> 16) & 0xff, (stopColorVal >> 8) & 0xff, stopColorVal & 0xff, clamp((int) (stop.opacity * 255), 0, 255));
@@ -255 +253 @@
      * update
      */
+    @Override
     public boolean updateTime(double curTime) throws SVGException
     {
@@ -262 +261 @@
         //Get current values for parameters
         StyleAttribute sty = new StyleAttribute();
-        boolean shapeChange = false;
         String strn;
 
@@ -335 +333 @@
 
         //Check stops, if any
-        for (Iterator it = stops.iterator(); it.hasNext();)
-        {
-            Stop stop = (Stop) it.next();
+        for (Stop stop : stops) {
             if (stop.updateTime(curTime))
             {