refactored the GameStates

src/cards/maumau/model/ActionHandler.java

@@ -21,7 +21,7 @@ class ActionHandler {
      */
     ActionHandler(MauMau game) {
         this.game = game;
-        gameState = new Initialized();
+        gameState = new Initialized(this);
     }
 
     /**

src/cards/maumau/model/Canceled.java

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

src/cards/maumau/model/Finished.java

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

src/cards/maumau/model/GameState.java

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

src/cards/maumau/model/Initialized.java

@@ -0,0 +1,16 @@
+package cards.maumau.model;
+
+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);
+    }
+
+
+}

src/cards/maumau/model/JackChosen.java

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

src/cards/maumau/model/MauMau.java

@@ -61,7 +61,7 @@ public class MauMau {
      *
      * @return The player handler.
      */
-    PlayerHandler getPlayerHandler() {
+    public PlayerHandler getPlayerHandler() {
         return playerHandler;
     }
 
@@ -70,7 +70,7 @@ public class MauMau {
      *
      * @return The card handler.
      */
-    CardHandler getCardHandler() {
+    public CardHandler getCardHandler() {
         return cardHandler;
     }
 

src/cards/maumau/model/Normal.java

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

src/cards/maumau/model/SevenChosen.java

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

src/cards/maumau/model/SuitChosen.java

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

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

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

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

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