remove board from constructor

app/src/main/java/chess/ConsoleMain.java

@@ -5,14 +5,13 @@ package chess;
 
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
-import chess.model.ChessBoard;
 import chess.model.Game;
 import chess.simulator.PromoteTest;
 import chess.view.consolerender.Console;
 
 public class ConsoleMain {
     public static void main(String[] args) {
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         PromoteTest promoteTest = new PromoteTest(commandExecutor);

app/src/main/java/chess/SwingMain.java

@@ -4,7 +4,6 @@ import chess.ai.DumbAI;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.event.GameAdaptator;
-import chess.model.ChessBoard;
 import chess.model.Color;
 import chess.model.Game;
 import chess.pgn.PgnExport;
@@ -12,7 +11,7 @@ import chess.view.simplerender.Window;
 
 public class SwingMain {
 	public static void main(String[] args) {
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         Window window = new Window(commandExecutor, false);

app/src/main/java/chess/ai/AI.java

@@ -0,0 +1,68 @@
+package chess.ai;
+
+import java.util.List;
+
+import chess.controller.Command;
+import chess.controller.CommandExecutor;
+import chess.controller.commands.GetPieceAtCommand;
+import chess.controller.commands.GetPlayerMovesCommand;
+import chess.controller.commands.GetAllowedCastlingsCommand;
+import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
+import chess.controller.event.GameAdaptator;
+import chess.model.Color;
+import chess.model.Coordinate;
+import chess.model.Move;
+import chess.model.Piece;
+
+public abstract class AI extends GameAdaptator{
+
+	protected final CommandExecutor commandExecutor;
+	protected final Color color;
+
+	public AI(CommandExecutor commandExecutor, Color color) {
+		this.commandExecutor = commandExecutor;
+		this.color = color;
+	}
+
+	protected abstract void play();
+	protected abstract void promote(Coordinate pawnCoords);
+
+	@Override
+	public void onPlayerTurn(Color color, boolean undone) {
+		if (this.color != color || undone)
+			return;
+
+		play();
+	}
+
+	@Override
+	public void onPromotePawn(Coordinate pieceCoords) {
+		Piece pawn = pieceAt(pieceCoords);
+		if (pawn.getColor() != this.color)
+			return;
+		promote(pieceCoords);
+	}
+
+	protected Piece pieceAt(Coordinate coordinate) {
+		GetPieceAtCommand command = new GetPieceAtCommand(coordinate);
+		sendCommand(command);
+		return command.getPiece();
+	}
+
+	protected List<Move> getAllowedMoves() {
+		GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
+		sendCommand(cmd);
+		return cmd.getMoves();
+	}
+
+	protected CastlingResult getAllowedCastlings() {
+		GetAllowedCastlingsCommand cmd2 = new GetAllowedCastlingsCommand();
+		sendCommand(cmd2);
+		return cmd2.getCastlingResult();
+	}
+
+	protected void sendCommand(Command command) {
+		this.commandExecutor.executeCommand(command);
+	}
+	
+}

app/src/main/java/chess/ai/DumbAI.java

@@ -3,46 +3,28 @@ package chess.ai;
 import java.util.List;
 import java.util.Random;
 
-import chess.controller.Command;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.CastlingCommand;
-import chess.controller.commands.GetAllowedCastlingsCommand;
+import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
-import chess.controller.commands.GetPieceAtCommand;
-import chess.controller.commands.GetPlayerMovesCommand;
 import chess.controller.commands.MoveCommand;
 import chess.controller.commands.PromoteCommand;
-import chess.controller.commands.GetAllowedCastlingsCommand.CastlingResult;
 import chess.controller.commands.PromoteCommand.PromoteType;
-import chess.controller.event.GameAdaptator;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Move;
-import chess.model.Piece;
 
-public class DumbAI extends GameAdaptator {
+public class DumbAI extends AI {
 
-	private final Color player;
-	private final CommandExecutor commandExecutor;
 	private final Random random = new Random();
 
 	public DumbAI(CommandExecutor commandExecutor, Color color) {
-		this.player = color;
+		super(commandExecutor, color);
-		this.commandExecutor = commandExecutor;
 	}
 
 	@Override
-	public void onPlayerTurn(Color color) {
+	protected void play() {
-		if (color != player)
+		CastlingResult castlings = getAllowedCastlings();
-			return;
+		List<Move> moves = getAllowedMoves();
-
-		GetPlayerMovesCommand cmd = new GetPlayerMovesCommand();
-		sendCommand(cmd);
-
-		GetAllowedCastlingsCommand cmd2 = new GetAllowedCastlingsCommand();
-		sendCommand(cmd2);
-
-		CastlingResult castlings = cmd2.getCastlingResult();
-		List<Move> moves = cmd.getMoves();
 
 		switch (castlings) {
 			case Both: {
@@ -53,20 +35,12 @@ public class DumbAI extends GameAdaptator {
 				return;
 			}
 
-			case Small: {
+			case Small:
-				int randomMove = this.random.nextInt(moves.size() + 1);
-				if (randomMove != moves.size())
-					break;
-				this.commandExecutor.executeCommand(new CastlingCommand(false));
-				return;
-
-			}
-
 			case Big: {
 				int randomMove = this.random.nextInt(moves.size() + 1);
 				if (randomMove != moves.size())
 					break;
-				this.commandExecutor.executeCommand(new CastlingCommand(true));
+				this.commandExecutor.executeCommand(new CastlingCommand(castlings == CastlingResult.Big));
 				return;
 			}
 
@@ -76,27 +50,12 @@ public class DumbAI extends GameAdaptator {
 
 		int randomMove = this.random.nextInt(moves.size());
 		this.commandExecutor.executeCommand(new MoveCommand(moves.get(randomMove)));
-
 	}
 
 	@Override
-	public void onPromotePawn(Coordinate pieceCoords) {
+	protected void promote(Coordinate pawnCoords) {
-		Piece pawn = pieceAt(pieceCoords);
-		if (pawn.getColor() != this.player)
-			return;
-
 		int promote = this.random.nextInt(PromoteType.values().length);
 		this.commandExecutor.executeCommand(new PromoteCommand(PromoteType.values()[promote]));
 	}
 
-	private Piece pieceAt(Coordinate coordinate) {
-		GetPieceAtCommand command = new GetPieceAtCommand(coordinate);
-		sendCommand(command);
-		return command.getPiece();
-	}
-
-	private void sendCommand(Command command) {
-		this.commandExecutor.executeCommand(command);
-	}
-
 }

app/src/main/java/chess/controller/CommandExecutor.java

@@ -57,14 +57,14 @@ public class CommandExecutor {
 					this.dispatcher.onGameEnd();
 					return;
 				}
-				switchPlayerTurn();
+				switchPlayerTurn(command instanceof UndoCommand);
 				return;
 		}
 	}
 
-	private void switchPlayerTurn() {
+	private void switchPlayerTurn(boolean undone) {
 		this.game.switchPlayerTurn();
-		this.dispatcher.onPlayerTurn(this.game.getPlayerTurn());
+		this.dispatcher.onPlayerTurn(this.game.getPlayerTurn(), undone);
 	}
 
 	/**

app/src/main/java/chess/controller/commands/NewGameCommand.java

@@ -51,7 +51,7 @@ public class NewGameCommand extends Command {
 		game.reset();
 
 		outputSystem.onGameStart();
-		outputSystem.onPlayerTurn(game.getPlayerTurn());
+		outputSystem.onPlayerTurn(game.getPlayerTurn(), false);
 
 		return CommandResult.NotMoved;
 	}

app/src/main/java/chess/controller/event/EmptyGameDispatcher.java

@@ -43,7 +43,7 @@ public class EmptyGameDispatcher extends GameDispatcher {
 	}
 
 	@Override
-	public void onPlayerTurn(Color color) {
+	public void onPlayerTurn(Color color, boolean undone) {
 	}
 
 	@Override

app/src/main/java/chess/controller/event/GameAdaptator.java

@@ -7,7 +7,7 @@ import chess.model.Move;
 public abstract class GameAdaptator implements GameListener {
 
 	@Override
-	public void onPlayerTurn(Color color) {}
+	public void onPlayerTurn(Color color, boolean undone) {}
 
 	@Override
 	public void onWin(Color color) {}

app/src/main/java/chess/controller/event/GameDispatcher.java

@@ -29,8 +29,8 @@ public class GameDispatcher implements GameListener {
 	}
 
 	@Override
-	public void onPlayerTurn(Color color) {
+	public void onPlayerTurn(Color color, boolean undone) {
-		asyncForEachCall((l) -> l.onPlayerTurn(color));
+		asyncForEachCall((l) -> l.onPlayerTurn(color, undone));
 	}
 
 	@Override

app/src/main/java/chess/controller/event/GameListener.java

@@ -56,8 +56,9 @@ public interface GameListener {
 	/**
 	 * Invoked when it's the player turn
 	 * @param color the color of the player who should play
+	 * @param undone true if it's a result of an undo command
 	 */
-	void onPlayerTurn(Color color);
+	void onPlayerTurn(Color color, boolean undone);
 	
 	/**
 	 * Invoked when a pawn should be promoted

app/src/main/java/chess/model/Game.java

@@ -20,8 +20,8 @@ public class Game {
 		Draw, Check, CheckMate, OnGoing, Pat;
 	}
 
-	public Game(ChessBoard board) {
+	public Game() {
-		this.board = board;
+		this.board = new ChessBoard();
 		this.movesHistory = new Stack<>();
 		this.traitsPos = new HashMap<>();
 	}

app/src/main/java/chess/pgn/PgnExport.java

@@ -11,7 +11,6 @@ import chess.controller.commands.MoveCommand;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.commands.PromoteCommand;
 import chess.controller.event.EmptyGameDispatcher;
-import chess.model.ChessBoard;
 import chess.model.Color;
 import chess.model.Coordinate;
 import chess.model.Game;
@@ -22,7 +21,7 @@ import chess.model.pieces.Pawn;
 public class PgnExport {
 
 	// public static void main(String[] args) {
-	// 	final Game game = new Game(new ChessBoard());
+	// 	final Game game = new Game();
 	// 	final CommandExecutor commandExecutor = new CommandExecutor(game);
 
 	// 	DumbAI ai1 = new DumbAI(commandExecutor, Color.White);
@@ -190,8 +189,7 @@ public class PgnExport {
 
 	public static String exportGame(Game game) {
 
-		ChessBoard board = new ChessBoard();
+		Game virtualGame = new Game();
-		Game virtualGame = new Game(board);
 
 		CommandExecutor executor = new CommandExecutor(virtualGame, new EmptyGameDispatcher());
 		executor.executeCommand(new NewGameCommand());

app/src/main/java/chess/view/consolerender/Console.java

@@ -61,7 +61,7 @@ public class Console implements GameListener {
     }
 
     @Override
-    public void onPlayerTurn(Color color) {
+    public void onPlayerTurn(Color color, boolean undone) {
         if (!captureInput)
             return;
         System.out.println(Colors.RED + "Player turn: " + color + Colors.RESET);

app/src/main/java/chess/view/simplerender/Window.java

@@ -213,7 +213,7 @@ public class Window extends JFrame implements GameListener {
 	}
 
 	@Override
-	public void onPlayerTurn(chess.model.Color color) {
+	public void onPlayerTurn(chess.model.Color color, boolean undone) {
 		this.displayText.setText("Current turn: " + color);
 		updateButtons();
 	}

app/src/test/java/chess/AppTest.java

@@ -3,24 +3,20 @@
  */
 package chess;
 
+import org.junit.jupiter.api.Test;
+
 import chess.ai.DumbAI;
 import chess.controller.Command;
 import chess.controller.CommandExecutor;
 import chess.controller.commands.NewGameCommand;
 import chess.controller.commands.UndoCommand;
 import chess.controller.event.GameAdaptator;
-import chess.model.*;
+import chess.model.Color;
-import chess.model.pieces.*;
+import chess.model.Game;
-import chess.simulator.Simulator;
-import chess.view.simplerender.Window;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Objects;
 
 class AppTest {
     @Test void functionalRollback(){
-        Game game = new Game(new ChessBoard());
+        Game game = new Game();
         CommandExecutor commandExecutor = new CommandExecutor(game);
 
         DumbAI ai = new DumbAI(commandExecutor, Color.Black);
@@ -38,9 +34,9 @@ class AppTest {
                     result = commandExecutor.executeCommand(new UndoCommand());
                 } while (result != Command.CommandResult.NotAllowed);
 
-                Game initialGame = new Game(new ChessBoard());
+                Game initialGame = new Game();
                 CommandExecutor initialCommandExecutor = new CommandExecutor(initialGame);
-                commandExecutor.executeCommand(new NewGameCommand());
+                initialCommandExecutor.executeCommand(new NewGameCommand());
 
                 assert(game.getBoard().equals(initialGame.getBoard()));