From cd27d013c29633f05d3db963b09c37c9397b684a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 9 Jan 2016 12:01:43 +0100 Subject: Board: use ArrayListIt: for animations too --- core/src/ch/asynk/rustanddust/engine/Board.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/engine/Board.java b/core/src/ch/asynk/rustanddust/engine/Board.java index 2e5a0b1..21ad9b7 100644 --- a/core/src/ch/asynk/rustanddust/engine/Board.java +++ b/core/src/ch/asynk/rustanddust/engine/Board.java @@ -2,7 +2,6 @@ package ch.asynk.rustanddust.engine; import java.util.Iterator; import java.util.Collection; -import java.util.ArrayList; import java.util.LinkedHashSet; import com.badlogic.gdx.Gdx; @@ -61,7 +60,7 @@ public abstract class Board implements Disposable, Animation private int tileCount = 0; private int pawnCount = 0; private int animationCount = 0; - private final ArrayList animations = new ArrayList(2); + private final ArrayListIt animations = new ArrayListIt(2); private final ArrayListIt nextAnimations = new ArrayListIt(10); private final LinkedHashSet tilesToDraw = new LinkedHashSet(); @@ -132,8 +131,8 @@ public abstract class Board implements Disposable, Animation for (Animation a : nextAnimations) a.dispose(); animations.clear(); - for (int i = 0, n = animations.size(); i < n; i++) - animations.get(i).dispose(); + for (Animation a : animations) + a.dispose(); animations.clear(); if (selectedTile != null) selectedTile.dispose(); @@ -286,9 +285,8 @@ public abstract class Board implements Disposable, Animation while (tileIter.hasNext()) tileIter.next().draw(batch); - Iterator animationIter = animations.iterator(); - while (animationIter.hasNext()) - animationIter.next().draw(batch); + for (Animation a : animations) + a.draw(batch); selectedTile.draw(batch); @@ -308,9 +306,8 @@ public abstract class Board implements Disposable, Animation while (iter.hasNext()) iter.next().drawDebug(debugShapes); - Iterator animationIter = animations.iterator(); - while (animationIter.hasNext()) - animationIter.next().drawDebug(debugShapes); + for (Animation a : animations) + a.drawDebug(debugShapes); if (transform) debugShapes.setTransformMatrix(prevTransform); -- cgit v1.1-2-g2b99