Slay some cyclopian variables.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@927 ed5b42cb-e716-0410-a449-f6a68f950b19

src/java/com/threerings/media/image/ColorPository.java

@@ -275,8 +275,8 @@ public class ColorPository implements Serializable
         // create the array
         ColorRecord[] crecs = new ColorRecord[record.colors.size()];
         Iterator<ColorRecord> iter = record.colors.values().iterator();
-        for (int i = 0; iter.hasNext(); i++) {
-            crecs[i] = iter.next();
+        for (int ii = 0; iter.hasNext(); ii++) {
+            crecs[ii] = iter.next();
         }
         return crecs;
     }
@@ -295,8 +295,8 @@ public class ColorPository implements Serializable
 
         int[] cids = new int[record.colors.size()];
         Iterator<ColorRecord> crecs = record.colors.values().iterator();
-        for (int i = 0; crecs.hasNext(); i++) {
-            cids[i] = crecs.next().colorId;
+        for (int ii = 0; crecs.hasNext(); ii++) {
+            cids[ii] = crecs.next().colorId;
         }
         return cids;
     }

src/java/com/threerings/media/image/Colorization.java

@@ -165,9 +165,9 @@ public class Colorization
         if (fhsv == null) {
             fhsv = new int[hsv.length];
         }
-        for (int i = 0; i < hsv.length; i++) {
+        for (int ii = 0; ii < hsv.length; ii++) {
             // fhsv[i] = (int)(hsv[i]*Integer.MAX_VALUE);
-            fhsv[i] = (int)(hsv[i]*Short.MAX_VALUE);
+            fhsv[ii] = (int)(hsv[ii]*Short.MAX_VALUE);
         }
         return fhsv;
     }

src/java/com/threerings/media/image/ImageUtil.java

@@ -133,8 +133,8 @@ public class ImageUtil
         // convert the colors to HSV
         float[] hsv = new float[3];
         int[] fhsv = new int[3];
-        for (int i = 0; i < size; i++) {
-            int value = rgbs[i];
+        for (int ii = 0; ii < size; ii++) {
+            int value = rgbs[ii];
 
             // don't fiddle with alpha pixels
             if ((value & 0xFF000000) == 0) {
@@ -154,7 +154,7 @@ public class ImageUtil
                 Colorization cz = zations[z];
                 if (cz != null && cz.matches(hsv, fhsv)) {
                     // massage the HSV bands and update the RGBs array
-                    rgbs[i] = cz.recolorColor(hsv);
+                    rgbs[ii] = cz.recolorColor(hsv);
                     break;
                 }
             }

src/java/com/threerings/media/image/Quantize.java

@@ -296,13 +296,13 @@ public class Quantize {
 
     static {
         SQUARES = new int[MAX_RGB + MAX_RGB + 1];
-        for (int i= -MAX_RGB; i <= MAX_RGB; i++) {
-            SQUARES[i + MAX_RGB] = i * i;
+        for (int ii = -MAX_RGB; ii <= MAX_RGB; ii++) {
+            SQUARES[ii + MAX_RGB] = ii * ii;
         }
 
         SHIFT = new int[MAX_TREE_DEPTH + 1];
-        for (int i = 0; i < MAX_TREE_DEPTH + 1; ++i) {
-            SHIFT[i] = 1 << (15 - i);
+        for (int ii = 0; ii < MAX_TREE_DEPTH + 1; ++ii) {
+            SHIFT[ii] = 1 << (15 - ii);
         }
     }
 
@@ -344,11 +344,11 @@ public class Quantize {
             this.pixels = pixels;
             this.max_colors = max_colors;
 
-            int i = max_colors;
+            int ii = max_colors;
             // tree_depth = log max_colors
             //                 4
-            for (depth = 1; i != 0; depth++) {
-                i /= 4;
+            for (depth = 1; ii != 0; depth++) {
+                ii /= 4;
             }
             if (depth > 1) {
                 --depth;

src/java/com/threerings/media/tile/bundle/TileSetBundle.java

@@ -115,7 +115,7 @@ public class TileSetBundle extends HashIntMap<TileSet>
     {
         int count = in.readInt();
 
-        for (int i = 0; i < count; i++) {
+        for (int ii = 0; ii < count; ii++) {
             int tileSetId = in.readInt();
             TileSet set = (TileSet)in.readObject();
             put(tileSetId, set);

src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java

@@ -165,8 +165,8 @@ public class TileSetBundler
 
         // use the mappings we parsed to configure our actual digester
         int msize = mappings.size();
-        for (int i = 0; i < msize; i++) {
-            Mapping map = mappings.get(i);
+        for (int ii = 0; ii < msize; ii++) {
+            Mapping map = mappings.get(ii);
             try {
                 TileSetRuleSet ruleset = (TileSetRuleSet)Class.forName(map.ruleset).newInstance();
 
@@ -256,8 +256,8 @@ public class TileSetBundler
 
         // add all of the parsed tilesets to the tileset bundle
         try {
-            for (int i = 0; i < sets.size(); i++) {
-                TileSet set = sets.get(i);
+            for (int ii = 0; ii < sets.size(); ii++) {
+                TileSet set = sets.get(ii);
                 String name = set.getName();
 
                 // let's be robust

src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java

@@ -88,8 +88,8 @@ public class TileSetBundlerTask extends Task
                 new MapFileTileSetIDBroker(_mapfile);
 
             // deal with the filesets
-            for (int i = 0; i < _filesets.size(); i++) {
-                FileSet fs = _filesets.get(i);
+            for (int ii = 0; ii < _filesets.size(); ii++) {
+                FileSet fs = _filesets.get(ii);
                 DirectoryScanner ds = fs.getDirectoryScanner(getProject());
                 File fromDir = fs.getDir(getProject());
                 String[] srcFiles = ds.getIncludedFiles();

src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java

@@ -156,8 +156,8 @@ public class XMLTileSetParser
         }
 
         // stick the tilesets from the list into the hashtable
-        for (int i = 0; i < setlist.size(); i++) {
-            TileSet set = setlist.get(i);
+        for (int ii = 0; ii < setlist.size(); ii++) {
+            TileSet set = setlist.get(ii);
             if (set.getName() == null) {
                 log.warning("Tileset did not receive name during " +
                             "parsing process [set=" + set + "].");

src/java/com/threerings/media/util/BackgroundTiler.java

@@ -64,11 +64,11 @@ public class BackgroundTiler
         _tiles = new BufferedImage[9];
         int[] sy = { 0, _h3, _h3+_ch3 };
         int[] thei = { _h3, _ch3, _h3 };
-        for (int i = 0; i < 3; i++) {
-            _tiles[3*i] = src.getSubimage(0, sy[i], _w3, thei[i]);
-            _tiles[3*i+1] = src.getSubimage(_w3, sy[i], _cw3, thei[i]);
-            _tiles[3*i+2] =
-                src.getSubimage(width-_w3, sy[i], _w3, thei[i]);
+        for (int ii = 0; ii < 3; ii++) {
+            _tiles[3*ii] = src.getSubimage(0, sy[ii], _w3, thei[ii]);
+            _tiles[3*ii+1] = src.getSubimage(_w3, sy[ii], _cw3, thei[ii]);
+            _tiles[3*ii+2] =
+                src.getSubimage(width-_w3, sy[ii], _w3, thei[ii]);
         }
     }