refactor(endTheGame) <- returns boolean

2 files changed, 8 insertions, 7 deletions

diff --git a/domain/src/main/java/mancala/domain/Bowl.java b/domain/src/main/java/mancala/domain/Bowl.java
index a29b806..fece393 100644
--- a/domain/src/main/java/mancala/domain/Bowl.java
+++ b/domain/src/main/java/mancala/domain/Bowl.java
@@ -32,12 +32,12 @@ abstract class Bowl {
     abstract boolean isEmpty();
     // abstract SmallBowl getNextSmallBowl();
 
-    void endTheGame() {
-        goToFirstBowlOfPlayerWithTurn().getNextBowl().endTheGame(goToFirstBowlOfPlayerWithTurn(), 0, 0);
+    boolean endTheGame() {
+        return goToFirstBowlOfPlayerWithTurn().getNextBowl().endTheGame(goToFirstBowlOfPlayerWithTurn(), 0, 0);
     }
 
-    protected void endTheGame(Bowl startOfLoop, int scorePlayer, int scoreOpponent) {
-        if (isEmpty() == false && getMyOwner().equals(startOfLoop.getMyOwner())) return;
+    protected boolean endTheGame(Bowl startOfLoop, int scorePlayer, int scoreOpponent) {
+        if (isEmpty() == false && getMyOwner().equals(startOfLoop.getMyOwner())) return false;
 
         if (this.equals(startOfLoop)) {
 
@@ -49,6 +49,7 @@ abstract class Bowl {
                 else if (scorePlayer > scoreOpponent) getMyOwner().isTheWinner();
                 else getMyOwner().getOpponent().isTheWinner();
 
+                return true;
             }
 
 
@@ -57,8 +58,9 @@ abstract class Bowl {
                 scorePlayer = scorePlayer + getMyStones();
             } else scoreOpponent = scoreOpponent + getMyStones();
 
-            getNextBowl().endTheGame(startOfLoop, scorePlayer, scoreOpponent);
+            return getNextBowl().endTheGame(startOfLoop, scorePlayer, scoreOpponent);
         }
+        return false;
     }
 
 
diff --git a/domain/src/main/java/mancala/domain/MancalaImpl.java b/domain/src/main/java/mancala/domain/MancalaImpl.java
index 81dbbe8..82f914f 100644
--- a/domain/src/main/java/mancala/domain/MancalaImpl.java
+++ b/domain/src/main/java/mancala/domain/MancalaImpl.java
@@ -77,8 +77,7 @@ public class MancalaImpl implements Mancala {
 
 	@Override
 	public boolean isEndOfGame() {
-        //domainReference.endTheGame();
-        return false;
+        return domainReference.endTheGame();
     }
 
 	@Override