added all the ActionHandler states

src/cards/maumau/model/ActionHandler.java

@@ -14,8 +14,6 @@ class ActionHandler {
 
     private GameState gameState;
 
-    private GamePlay gameplay;
-
     /**
      * Constructs an ActionHandler for the specified MauMau game.
      *
@@ -23,8 +21,7 @@ class ActionHandler {
      */
     ActionHandler(MauMau game) {
         this.game = game;
-        gameState = GameState.GAME_PLAY;
+        gameState = new Initialized();
-        gameplay = new Initialized();
     }
 
     /**

src/cards/maumau/model/GameState.java

@@ -1,20 +0,0 @@
-package cards.maumau.model;
-
-/**
- * Represents the state of the Mau-Mau game.
- */
-public enum GameState {
-    /**
-     * The game has been initialized, but has not yet started.
-     */
-    GAME_PLAY,
-    /**
-     * The game is over. The final ranking of players can be
-     * obtained using {@link MauMau#getRanking()}.
-     */
-    GAME_FINISHED,
-    /**
-     * The game has been canceled due to insufficient cards.
-     */
-    GAME_CANCELED,
-}

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;

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

@@ -1,5 +1,5 @@
 package cards.maumau.model.gamestate;
 
-public interface GamePlay<T> {
+public interface GameState {
 
 }

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

@@ -1,7 +1,6 @@
 package cards.maumau.model.gamestate;
 
-import cards.maumau.model.GameState;
 
-public class Initialized implements GamePlay <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{
+
+}