src/cards/maumau/model/ActionHandler.java

@@ -2,6 +2,7 @@ package cards.maumau.model;
 
 import cards.Card;
 import cards.Suit;
+import cards.maumau.model.gamestate.*;
 
 /**
  * Manages the actions and state transitions within a MauMau game.
@@ -20,7 +21,7 @@ class ActionHandler {
      */
     ActionHandler(MauMau game) {
         this.game = game;
-        gameState = new Initialized(this);
+        gameState = new Initialized();
     }
 
     /**
@@ -29,28 +30,28 @@ class ActionHandler {
      * @param player The player to be added to the game.
      */
     void addPlayer(Player player) {
-        gameState.addPlayer(player);
+        //TODO implement
     }
 
     /**
      * Starts the game.
      */
     void startGame() {
-        gameState.startGame();
+        //TODO implement
     }
 
     /**
      * Transitions the game state to GAME_OVER.
      */
     void finishGame() {
-        gameState.finishGame();
+        //TODO implement
     }
 
     /**
      * Transitions the game state to GAME_CANCELED.
      */
     void cancelGame() {
-        gameState.cancelGame();
+        //TODO implement
     }
 
     /**
@@ -59,7 +60,7 @@ class ActionHandler {
      * @param c The card chosen by the player.
      */
     void chooseCard(Card c) {
-        gameState.chooseCard(c);
+        //TODO implement
     }
 
     /**
@@ -68,21 +69,21 @@ class ActionHandler {
      * @param suit The suit chosen by the player.
      */
     void chooseSuit(Suit suit) {
-        gameState.chooseSuit(suit);
+        //TODO implement
     }
 
     /**
      * Lets the player skip a round.
      **/
     void skip() {
-        gameState.skip();
+        //TODO implement
     }
 
     /**
      * Handles the player saying "no 7" in the current state.
      */
     void no7() {
-        gameState.no7();
+        //TODO implement
     }
 
     /**
@@ -139,11 +140,8 @@ class ActionHandler {
      * Returns the current state of the game.
      */
     GameState getGameState() {
-        return gameState;
+        //TODO implement
-    }
+        return null;
-
-    void setGameState(GameState gameState) {
-        this.gameState = gameState;
     }
 
     /**

src/cards/maumau/model/Canceled.java

@@ -1,10 +0,0 @@
-package cards.maumau.model;
-
-public class Canceled implements GameState{
-
-    private final ActionHandler handler;
-
-    Canceled(ActionHandler handler) {
-        this.handler = handler;
-    }
-}

src/cards/maumau/model/Finished.java

@@ -1,9 +0,0 @@
-package cards.maumau.model;
-
-public class Finished implements GameState{
-    private final ActionHandler handler;
-
-    Finished(ActionHandler handler) {
-        this.handler = handler;
-    }
-}

src/cards/maumau/model/GameState.java

@@ -1,17 +0,0 @@
-package cards.maumau.model;
-
-import cards.Card;
-import cards.Suit;
-
-
-interface GameState {
-    void addPlayer(Player player);
-    void startGame();
-    void finishGame();
-    void cancelGame();
-    void chooseCard(Card c);
-    void chooseSuit(Suit suit);
-    void skip();
-    void no7();
-    // boolean canPlay(Card c);
-}

src/cards/maumau/model/Initialized.java

@@ -1,34 +0,0 @@
-package cards.maumau.model;
-
-import cards.Card;
-import cards.Suit;
-
-public class Initialized implements GameState {
-
-    private final ActionHandler handler;
-
-    Initialized(ActionHandler handler) {
-        this.handler = handler;
-    }
-    
-    public void addPlayer(Player player) {
-        handler.getGame().getPlayerHandler().addPlayer(player);
-    }
-
-    
-    public void startGame() {
-        try {
-            handler.getGame().getCardHandler().dealCards();
-            handler.setGameState(new Normal(handler));
-        } catch (Exception e) {
-            handler.setGameState(new Canceled(handler));
-        }
-    }
-
-    public void finishGame(){}
-    public void cancelGame(){}
-    public void chooseCard(Card c){}
-    public void chooseSuit(Suit suit){}
-    public void skip(){}
-    public void no7(){}
-}

src/cards/maumau/model/JackChosen.java

@@ -1,27 +0,0 @@
-package cards.maumau.model;
-
-import cards.Card;
-import cards.Suit;
-
-public class JackChosen implements GameState{
-    private final ActionHandler handler;
-
-    JackChosen(ActionHandler handler) {
-        this.handler = handler;
-    }
-
-
-
-    public void chooseSuit(Suit suit){
-        handler.setChosenSuit(suit);
-        handler.setGameState(new SuitChosen(handler));
-    }
-
-    public void startGame(){}
-    public void addPlayer(Player player){}
-    public void finishGame(){}
-    public void cancelGame(){}
-    public void chooseCard(Card c){}
-    public void skip(){}
-    public void no7(){}
-}

src/cards/maumau/model/MauMau.java

@@ -2,6 +2,7 @@ package cards.maumau.model;
 
 import cards.Card;
 import cards.Suit;
+import cards.maumau.model.gamestate.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +61,7 @@ public class MauMau {
      *
      * @return The player handler.
      */
-    public PlayerHandler getPlayerHandler() {
+    PlayerHandler getPlayerHandler() {
         return playerHandler;
     }
 
@@ -69,7 +70,7 @@ public class MauMau {
      *
      * @return The card handler.
      */
-    public CardHandler getCardHandler() {
+    CardHandler getCardHandler() {
         return cardHandler;
     }
 

src/cards/maumau/model/Normal.java

@@ -1,9 +0,0 @@
-package cards.maumau.model;
-
-public class Normal implements GameState{
-    private final ActionHandler handler;
-
-    Normal(ActionHandler handler) {
-        this.handler = handler;
-    }
-}

src/cards/maumau/model/SevenChosen.java

@@ -1,9 +0,0 @@
-package cards.maumau.model;
-
-public class SevenChosen implements GameState{
-    private final ActionHandler handler;
-
-    SevenChosen(ActionHandler handler) {
-        this.handler = handler;
-    }
-}

src/cards/maumau/model/SuitChosen.java

@@ -1,47 +0,0 @@
-package cards.maumau.model;
-
-import cards.Card;
-import cards.Suit;
-import cards.Rank;
-
-public class SuitChosen implements GameState{
-    private final ActionHandler handler;
-
-    SuitChosen(ActionHandler handler) {
-        this.handler = handler;
-    }
-
-    public void addPlayer(Player player){}
-    public void startGame(){}
-    public void finishGame(){}
-    public void cancelGame(){}
-
-    public void chooseCard(Card c){
-        if (handler.canPlay(c)) {
-            handler.setChosenSuit(null);
-            handler.getGame().getPlayerHandler().getCurrentPlayer().playCard(c);
-
-            if(c.rank() == Rank.SEVEN) {
-                handler.increment7Counter();
-                handler.getGame().getPlayerHandler().nextTurn(1);
-                handler.setGameState(new SevenChosen(handler));
-            } else if (c.rank() == Rank.EIGHT) {
-                handler.getGame().getPlayerHandler().nextTurn(2);
-                handler.setGameState(new Normal(handler));
-            } else {
-                handler.getGame().getPlayerHandler().nextTurn(1);
-                handler.setGameState(new Normal(handler));
-            }
-
-        }
-    }
-
-    public void chooseSuit(Suit suit){}
-
-    public void skip(){
-        handler.getGame().getPlayerHandler().getCurrentPlayer().drawCards(1);
-        handler.getGame().getPlayerHandler().nextTurn(1);
-    }
-
-    public void no7(){}
-}

src/cards/maumau/model/gamestate/Canceled.java

@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class Canceled implements GameState{
+
+}

src/cards/maumau/model/gamestate/Finished.java

@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class Finished implements GameState{
+
+}

src/cards/maumau/model/gamestate/GameState.java

@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public interface GameState {
+
+}

src/cards/maumau/model/gamestate/Initialized.java

@@ -0,0 +1,6 @@
+package cards.maumau.model.gamestate;
+
+
+public class Initialized implements GameState {
+    
+}

src/cards/maumau/model/gamestate/JackChosen.java

@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class JackChosen implements GameState{
+
+}

src/cards/maumau/model/gamestate/Normal.java

@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class Normal implements GameState{
+
+}

src/cards/maumau/model/gamestate/SevenChosen.java

@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class SevenChosen implements GameState{
+
+}

src/cards/maumau/model/gamestate/SuitChosen.java

@@ -0,0 +1,5 @@
+package cards.maumau.model.gamestate;
+
+public class SuitChosen implements GameState{
+
+}