From bb6a234d6631ad5bdf6f43b9ba101d133d3b2ee2 Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Sat, 9 Jan 2016 11:51:51 +0100
Subject: use ArrayListIt

---
 core/src/ch/asynk/rustanddust/game/UnitList.java             | 4 ++--
 core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'core/src/ch/asynk/rustanddust/game')

diff --git a/core/src/ch/asynk/rustanddust/game/UnitList.java b/core/src/ch/asynk/rustanddust/game/UnitList.java
index 96370364..834dd989 100644
--- a/core/src/ch/asynk/rustanddust/game/UnitList.java
+++ b/core/src/ch/asynk/rustanddust/game/UnitList.java
@@ -1,11 +1,11 @@
 package ch.asynk.rustanddust.game;
 
 import java.util.Collection;
-import java.util.ArrayList;
+import ch.asynk.rustanddust.engine.util.ArrayListIt;
 
 import ch.asynk.rustanddust.engine.Pawn;
 
-public class UnitList extends ArrayList<Unit>
+public class UnitList extends ArrayListIt<Unit>
 {
     public UnitList(int n)
     {
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index a5c9b3d0..7b7904df 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -2,7 +2,6 @@ package ch.asynk.rustanddust.game.battles;
 
 import java.util.Random;
 import java.util.HashMap;
-import java.util.ArrayList;
 
 import ch.asynk.rustanddust.game.Army;
 import ch.asynk.rustanddust.game.Battle;
@@ -15,6 +14,7 @@ import ch.asynk.rustanddust.game.Unit.UnitId;
 import ch.asynk.rustanddust.game.Factory;
 import ch.asynk.rustanddust.game.State.StateType;
 import ch.asynk.rustanddust.engine.Orientation;
+import ch.asynk.rustanddust.engine.util.ArrayListIt;
 
 public abstract class BattleCommon implements Battle
 {
@@ -28,8 +28,8 @@ public abstract class BattleCommon implements Battle
     protected Player currentPlayer;
     protected Player usPlayer;
     protected Player gePlayer;
-    protected ArrayList<Zone> entryZone = new ArrayList<Zone>();
-    protected ArrayList<Zone> exitZone = new ArrayList<Zone>();
+    protected ArrayListIt<Zone> entryZone = new ArrayListIt<Zone>();
+    protected ArrayListIt<Zone> exitZone = new ArrayListIt<Zone>();
     protected HashMap<Unit, Zone> unitEntry = new HashMap<Unit, Zone>();
     protected HashMap<Unit, Zone> unitExit = new HashMap<Unit, Zone>();
 
-- 
cgit v1.2.3