Crabs/3DChess
2
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

refactor OutputSystem

Browse Source
This commit is contained in:
Simon Pribylski
2025-04-12 11:12:36 +02:00
parent 0d3d77781f
commit 8190090adc
19 changed files with 176 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/chess/App.java → app/src/main/java/chess/ConsoleMain.java
View File

@@ -9,7 +9,7 @@ import chess.model.ChessBoard;
import chess.model.Game;
import chess.view.consolerender.Console;
public class App {
public class ConsoleMain {
public static void main(String[] args) {
CommandExecutor commandExecutor = new CommandExecutor();
@@ -17,7 +17,7 @@ public class App {
Console console = new Console(commandExecutor);
commandExecutor.setGame(game);
commandExecutor.setOutputSystem(console);
commandExecutor.addListener(console);
commandExecutor.executeCommand(new NewGameCommand());
}

21
app/src/main/java/chess/SwingMain.java Normal file
View File

@@ -0,0 +1,21 @@
package chess;
import chess.controller.CommandExecutor;
import chess.controller.commands.NewGameCommand;
import chess.model.ChessBoard;
import chess.model.Game;
import chess.view.simplerender.Window;
public class SwingMain {
public static void main(String[] args) {
CommandExecutor commandExecutor = new CommandExecutor();
Game game = new Game(new ChessBoard());
Window window = new Window(commandExecutor);
commandExecutor.setGame(game);
commandExecutor.addListener(window);
commandExecutor.executeCommand(new NewGameCommand());
}
}

5
app/src/main/java/chess/controller/Command.java
View File

@@ -1,5 +1,6 @@
package chess.controller;
import chess.controller.event.GameListener;
import chess.model.Game;
public abstract class Command {
@@ -15,7 +16,7 @@ public abstract class Command {
NotAllowed;
}
public abstract CommandResult execute(Game game, OutputSystem outputSystem);
public abstract CommandResult execute(Game game, GameListener outputSystem);
public void postExec(Game game, OutputSystem outputSystem) {}
public void postExec(Game game, GameListener outputSystem) {}
}

29
app/src/main/java/chess/controller/CommandExecutor.java
View File

@@ -2,24 +2,25 @@ package chess.controller;
import chess.controller.Command.CommandResult;
import chess.controller.commands.UndoCommand;
import chess.controller.event.GameDispatcher;
import chess.controller.event.GameListener;
import chess.model.Game;
import chess.model.Game.GameStatus;
public class CommandExecutor {
private Game game;
private OutputSystem outputSystem;
private final GameDispatcher dispatcher;
public CommandExecutor() {
this.game = null;
this.outputSystem = null;
this.dispatcher = new GameDispatcher();
}
public synchronized CommandResult executeCommand(Command command) {
assert this.game != null : "No input game specified !";
assert this.outputSystem != null : "No output system specified !";
CommandResult result = command.execute(this.game, this.outputSystem);
CommandResult result = command.execute(this.game, this.dispatcher);
// non player commands are not supposed to return move result
assert result != CommandResult.Moved || command instanceof PlayerCommand || command instanceof UndoCommand;
@@ -29,7 +30,7 @@ public class CommandExecutor {
if (command instanceof PlayerCommand playerCommand && result != CommandResult.NotAllowed)
this.game.addAction(playerCommand);
command.postExec(game, outputSystem);
command.postExec(game, dispatcher);
return result;
}
@@ -40,21 +41,21 @@ public class CommandExecutor {
return;
case ActionNeeded:
this.outputSystem.updateDisplay();
this.dispatcher.updateDisplay();
return;
case Moved:
if (checkGameStatus())
return;
switchPlayerTurn();
this.outputSystem.updateDisplay();
this.dispatcher.updateDisplay();
return;
}
}
private void switchPlayerTurn() {
this.game.switchPlayerTurn();
this.outputSystem.playerTurn(this.game.getPlayerTurn());
this.dispatcher.playerTurn(this.game.getPlayerTurn());
}
/**
@@ -66,27 +67,27 @@ public class CommandExecutor {
switch (gameStatus) {
case Check:
this.outputSystem.kingIsInCheck();
this.dispatcher.kingIsInCheck();
return false;
case CheckMate:
this.outputSystem.kingIsInMat();
this.outputSystem.winnerIs(this.game.getPlayerTurn());
this.dispatcher.kingIsInMat();
this.dispatcher.winnerIs(this.game.getPlayerTurn());
return true;
case OnGoing:
return false;
case Pat:
this.outputSystem.patSituation();
this.dispatcher.patSituation();
return true;
}
return false;
}
public void setOutputSystem(OutputSystem outputSystem) {
this.outputSystem = outputSystem;
public void addListener(GameListener listener) {
this.dispatcher.addListener(listener);
}
public void setGame(Game game) {

5
app/src/main/java/chess/controller/PlayerCommand.java
View File

@@ -1,14 +1,15 @@
package chess.controller;
import chess.controller.event.GameListener;
import chess.model.Game;
public abstract class PlayerCommand extends Command{
public CommandResult undo(Game game, OutputSystem outputSystem) {
public CommandResult undo(Game game, GameListener outputSystem) {
CommandResult result = undoImpl(game, outputSystem);
game.updateLastMove();
return result;
}
protected abstract CommandResult undoImpl(Game game, OutputSystem outputSystem);
protected abstract CommandResult undoImpl(Game game, GameListener outputSystem);
}

6
app/src/main/java/chess/controller/commands/CastlingCommand.java
View File

@@ -1,7 +1,7 @@
package chess.controller.commands;
import chess.controller.OutputSystem;
import chess.controller.PlayerCommand;
import chess.controller.event.GameListener;
import chess.model.ChessBoard;
import chess.model.Color;
import chess.model.Coordinate;
@@ -19,7 +19,7 @@ public class CastlingCommand extends PlayerCommand {
}
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard();
// we must promote the pending pawn before
@@ -53,7 +53,7 @@ public class CastlingCommand extends PlayerCommand {
}
@Override
protected CommandResult undoImpl(Game game, OutputSystem outputSystem) {
protected CommandResult undoImpl(Game game, GameListener outputSystem) {
game.getBoard().undoMove(this.kingMove, null);
game.getBoard().undoMove(this.rookMove, null);

4
app/src/main/java/chess/controller/commands/GetAllowedMovesPieceCommand.java
View File

@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import chess.controller.Command;
import chess.controller.OutputSystem;
import chess.controller.event.GameListener;
import chess.model.ChessBoard;
import chess.model.Coordinate;
import chess.model.Game;
@@ -21,7 +21,7 @@ public class GetAllowedMovesPieceCommand extends Command {
}
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard();
Piece piece = board.pieceAt(start);

4
app/src/main/java/chess/controller/commands/GetPieceAtCommand.java
View File

@@ -1,7 +1,7 @@
package chess.controller.commands;
import chess.controller.Command;
import chess.controller.OutputSystem;
import chess.controller.event.GameListener;
import chess.model.Coordinate;
import chess.model.Game;
import chess.model.Piece;
@@ -17,7 +17,7 @@ public class GetPieceAtCommand extends Command{
}
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
if (!pieceCoords.isValid())
return CommandResult.NotAllowed;

4
app/src/main/java/chess/controller/commands/GetPlayerMovesCommand.java
View File

@@ -3,7 +3,7 @@ package chess.controller.commands;
import java.util.List;
import chess.controller.Command;
import chess.controller.OutputSystem;
import chess.controller.event.GameListener;
import chess.model.Game;
import chess.model.Move;
@@ -12,7 +12,7 @@ public class GetPlayerMovesCommand extends Command {
private List<Move> moves;
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
this.moves = game.getBoard().getAllowedMoves(game.getPlayerTurn());
return CommandResult.NotMoved;
}

10
app/src/main/java/chess/controller/commands/MoveCommand.java
View File

@@ -1,7 +1,7 @@
package chess.controller.commands;
import chess.controller.OutputSystem;
import chess.controller.PlayerCommand;
import chess.controller.event.GameListener;
import chess.model.ChessBoard;
import chess.model.Coordinate;
import chess.model.Game;
@@ -24,7 +24,7 @@ public class MoveCommand extends PlayerCommand {
}
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard();
// we must promote the pending pawn before
@@ -58,7 +58,7 @@ public class MoveCommand extends PlayerCommand {
}
@Override
protected CommandResult undoImpl(Game game, OutputSystem outputSystem) {
protected CommandResult undoImpl(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard();
board.undoMove(move, deadPiece);
@@ -66,11 +66,11 @@ public class MoveCommand extends PlayerCommand {
}
@Override
public void postExec(Game game, OutputSystem outputSystem) {
public void postExec(Game game, GameListener outputSystem) {
tryPromote(game, outputSystem);
}
private void tryPromote(Game game, OutputSystem outputSystem) {
private void tryPromote(Game game, GameListener outputSystem) {
Coordinate pawnPos = game.getBoard().pawnPromotePosition();
if (pawnPos == null)

4
app/src/main/java/chess/controller/commands/NewGameCommand.java
View File

@@ -1,7 +1,7 @@
package chess.controller.commands;
import chess.controller.Command;
import chess.controller.OutputSystem;
import chess.controller.event.GameListener;
import chess.model.ChessBoard;
import chess.model.Color;
import chess.model.Coordinate;
@@ -14,7 +14,7 @@ import chess.model.pieces.Queen;
import chess.model.pieces.Rook;
public class NewGameCommand extends Command {
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard();
board.clearBoard();

6
app/src/main/java/chess/controller/commands/PromoteCommand.java
View File

@@ -1,7 +1,7 @@
package chess.controller.commands;
import chess.controller.OutputSystem;
import chess.controller.PlayerCommand;
import chess.controller.event.GameListener;
import chess.model.ChessBoard;
import chess.model.Color;
import chess.model.Coordinate;
@@ -33,7 +33,7 @@ public class PromoteCommand extends PlayerCommand {
}
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard();
this.pieceCoords = board.pawnPromotePosition();
@@ -78,7 +78,7 @@ public class PromoteCommand extends PlayerCommand {
}
@Override
protected CommandResult undoImpl(Game game, OutputSystem outputSystem) {
protected CommandResult undoImpl(Game game, GameListener outputSystem) {
final ChessBoard board = game.getBoard();
Piece promoted = board.pieceAt(this.pieceCoords);

4
app/src/main/java/chess/controller/commands/SurrenderCommand.java
View File

@@ -1,7 +1,7 @@
package chess.controller.commands;
import chess.controller.Command;
import chess.controller.OutputSystem;
import chess.controller.event.GameListener;
import chess.model.Color;
import chess.model.Game;
@@ -14,7 +14,7 @@ public class SurrenderCommand extends Command {
}
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
outputSystem.hasSurrendered(player);
outputSystem.winnerIs(Color.getEnemy(player));
return CommandResult.NotMoved;

4
app/src/main/java/chess/controller/commands/UndoCommand.java
View File

@@ -1,14 +1,14 @@
package chess.controller.commands;
import chess.controller.Command;
import chess.controller.OutputSystem;
import chess.controller.PlayerCommand;
import chess.controller.event.GameListener;
import chess.model.Game;
public class UndoCommand extends Command{
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
public CommandResult execute(Game game, GameListener outputSystem) {
PlayerCommand lastAction = game.getLastAction();
if (lastAction == null)
return CommandResult.NotAllowed;

35
app/src/main/java/chess/controller/event/GameAdaptator.java Normal file
View File

@@ -0,0 +1,35 @@
package chess.controller.event;
import chess.model.Color;
import chess.model.Coordinate;
public class GameAdaptator implements GameListener {
@Override
public void playerTurn(Color color) {}
@Override
public void winnerIs(Color color) {}
@Override
public void kingIsInCheck() {}
@Override
public void kingIsInMat() {}
@Override
public void patSituation() {}
@Override
public void hasSurrendered(Color color) {}
@Override
public void gameStarted() {}
@Override
public void promotePawn(Coordinate pieceCoords) {}
@Override
public void updateDisplay() {}
}

68
app/src/main/java/chess/controller/event/GameDispatcher.java Normal file
View File

@@ -0,0 +1,68 @@
package chess.controller.event;
import java.util.ArrayList;
import java.util.List;
import chess.model.Color;
import chess.model.Coordinate;
public class GameDispatcher implements GameListener{
private final List<GameListener> listeners;
public GameDispatcher() {
this.listeners = new ArrayList<>();
}
public void addListener(GameListener listener) {
this.listeners.add(listener);
}
@Override
public void playerTurn(Color color) {
this.listeners.forEach((l) -> l.playerTurn(color));
}
@Override
public void winnerIs(Color color) {
this.listeners.forEach((l) -> l.winnerIs(color));
}
@Override
public void kingIsInCheck() {
this.listeners.forEach((l) -> l.kingIsInCheck());
}
@Override
public void kingIsInMat() {
this.listeners.forEach((l) -> l.kingIsInMat());
}
@Override
public void patSituation() {
this.listeners.forEach((l) -> l.patSituation());
}
@Override
public void hasSurrendered(Color color) {
this.listeners.forEach((l) -> l.hasSurrendered(color));
}
@Override
public void gameStarted() {
this.listeners.forEach((l) -> l.gameStarted());
}
@Override
public void promotePawn(Coordinate pieceCoords) {
this.listeners.forEach((l) -> l.promotePawn(pieceCoords));
}
@Override
public void updateDisplay() {
this.listeners.forEach((l) -> l.updateDisplay());
}
}

4
app/src/main/java/chess/controller/OutputSystem.java → app/src/main/java/chess/controller/event/GameListener.java
View File

@@ -1,9 +1,9 @@
package chess.controller;
package chess.controller.event;
import chess.model.Color;
import chess.model.Coordinate;
public interface OutputSystem {
public interface GameListener {
void playerTurn(Color color);

4
app/src/main/java/chess/view/consolerender/Console.java
View File

@@ -2,11 +2,11 @@ package chess.view.consolerender;
import chess.controller.Command;
import chess.controller.CommandExecutor;
import chess.controller.OutputSystem;
import chess.controller.commands.GetPieceAtCommand;
import chess.controller.commands.MoveCommand;
import chess.controller.commands.PromoteCommand;
import chess.controller.commands.SurrenderCommand;
import chess.controller.event.GameListener;
import chess.model.Color;
import chess.model.Coordinate;
import chess.model.Move;
@@ -14,7 +14,7 @@ import chess.model.Piece;
import java.util.Scanner;
public class Console implements OutputSystem {
public class Console implements GameListener {
private final Scanner scanner = new Scanner(System.in);
private final CommandExecutor commandExecutor;
private final ConsolePieceName consolePieceName = new ConsolePieceName();

4
app/src/main/java/chess/view/simplerender/Window.java
View File

@@ -19,7 +19,6 @@ import javax.swing.SwingUtilities;
import chess.controller.Command;
import chess.controller.Command.CommandResult;
import chess.controller.CommandExecutor;
import chess.controller.OutputSystem;
import chess.controller.commands.CastlingCommand;
import chess.controller.commands.GetAllowedMovesPieceCommand;
import chess.controller.commands.GetPieceAtCommand;
@@ -27,12 +26,13 @@ import chess.controller.commands.GetPlayerMovesCommand;
import chess.controller.commands.MoveCommand;
import chess.controller.commands.PromoteCommand;
import chess.controller.commands.PromoteCommand.PromoteType;
import chess.controller.event.GameListener;
import chess.controller.commands.UndoCommand;
import chess.model.Coordinate;
import chess.model.Move;
import chess.model.Piece;
public class Window extends JFrame implements OutputSystem {
public class Window extends JFrame implements GameListener {
private final CommandExecutor commandExecutor;