State: done() -> execute()

13 files changed, 15 insertions, 15 deletions

diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index d32c81e..58b2856 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -164,7 +164,7 @@ public class Ctrl implements Disposable
 
     private StateType actionDone()
     {
-        StateType nextState = this.state.done();
+        StateType nextState = this.state.execute();
 
         if (nextState == StateType.DONE) {
             map.actionDone();
@@ -185,7 +185,7 @@ public class Ctrl implements Disposable
 
     private StateType deploymentDone()
     {
-        return this.state.done();
+        return this.state.execute();
     }
 
     public void setState(StateType nextState)
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index c6da11b..bc3bd43 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -435,7 +435,7 @@ public abstract class Map extends Board
         return success;
     }
 
-    public void addEngagementAnimation(Unit target)
+    private void addEngagementAnimation(Unit target)
     {
         FireAnimation.reset();
         Hex to = target.getHex();
diff --git a/core/src/ch/asynk/tankontank/game/State.java b/core/src/ch/asynk/tankontank/game/State.java
index 2c19955..76f5b99 100644
--- a/core/src/ch/asynk/tankontank/game/State.java
+++ b/core/src/ch/asynk/tankontank/game/State.java
@@ -23,7 +23,7 @@ public interface State
 
     public StateType abort();
 
-    public StateType done();
+    public StateType execute();
 
     public void touchDown();
 
diff --git a/core/src/ch/asynk/tankontank/game/states/StateAnimation.java b/core/src/ch/asynk/tankontank/game/states/StateAnimation.java
index 86bf61c..2e115a9 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateAnimation.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateAnimation.java
@@ -20,7 +20,7 @@ public class StateAnimation extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         return StateType.DONE;
     }
diff --git a/core/src/ch/asynk/tankontank/game/states/StateBreak.java b/core/src/ch/asynk/tankontank/game/states/StateBreak.java
index 2274e82..91fae11 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateBreak.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateBreak.java
@@ -36,7 +36,7 @@ public class StateBreak extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         return StateType.DONE;
     }
diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index baa15ca..1358372 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -48,7 +48,7 @@ public class StateDeployment extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         deployedUnits.clear();
         return StateType.DONE;
diff --git a/core/src/ch/asynk/tankontank/game/states/StateEngage.java b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
index 5facbce..c1903bd 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateEngage.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
@@ -50,7 +50,7 @@ public class StateEngage extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         StateType nextState = StateType.DONE;
         if (map.engageUnit(selectedUnit, activeUnit)) {
diff --git a/core/src/ch/asynk/tankontank/game/states/StateEscape.java b/core/src/ch/asynk/tankontank/game/states/StateEscape.java
index cc31007..a10e0b6 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateEscape.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEscape.java
@@ -23,7 +23,7 @@ public class StateEscape extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         if (activeUnit == null)
             activeUnit = selectedUnit;
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java
index 009a877..7ab8be8 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateMove.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java
@@ -83,7 +83,7 @@ public class StateMove extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         hideAssists();
         // be sure that the hq is activated
diff --git a/core/src/ch/asynk/tankontank/game/states/StatePromote.java b/core/src/ch/asynk/tankontank/game/states/StatePromote.java
index caf781b..340cb7b 100644
--- a/core/src/ch/asynk/tankontank/game/states/StatePromote.java
+++ b/core/src/ch/asynk/tankontank/game/states/StatePromote.java
@@ -26,7 +26,7 @@ public class StatePromote extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         return StateType.DONE;
     }
diff --git a/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java b/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java
index e254491..792c159 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java
@@ -37,7 +37,7 @@ public class StateReinforcement extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         return StateType.DONE;
     }
diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
index 8cf9689..2e1e822 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
@@ -67,7 +67,7 @@ public class StateRotate extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         StateType whenDone = StateType.DONE;
 
@@ -106,7 +106,7 @@ public class StateRotate extends StateCommon
             map.showOrientation(to, o);
             ctrl.hud.actionButtons.show(Buttons.DONE.b | ((ctrl.cfg.canCancel) ? Buttons.ABORT.b : 0));
         } else {
-            done();
+            execute();
             ctrl.setState(StateType.ANIMATION);
         }
     }
diff --git a/core/src/ch/asynk/tankontank/game/states/StateSelect.java b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
index 9d7b84c..0937620 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateSelect.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
@@ -43,7 +43,7 @@ public class StateSelect extends StateCommon
     }
 
     @Override
-    public StateType done()
+    public StateType execute()
     {
         return StateType.DONE;
     }