diff --git a/app/src/main/java/chess/io/Command.java b/app/src/main/java/chess/io/Command.java index 717e3c0..38288b8 100644 --- a/app/src/main/java/chess/io/Command.java +++ b/app/src/main/java/chess/io/Command.java @@ -3,5 +3,10 @@ package chess.io; import chess.model.Game; public abstract class Command { + + public enum CommandResult { + Moved, NotMoved, NotAllowed; + } + public abstract CommandResult execute(Game game, OutputSystem outputSystem); } diff --git a/app/src/main/java/chess/io/CommandExecutor.java b/app/src/main/java/chess/io/CommandExecutor.java index a8f4f98..9db17c5 100644 --- a/app/src/main/java/chess/io/CommandExecutor.java +++ b/app/src/main/java/chess/io/CommandExecutor.java @@ -1,5 +1,6 @@ package chess.io; +import chess.io.Command.CommandResult; import chess.io.commands.MoveCommand; import chess.model.Game; import chess.model.Game.GameStatus; diff --git a/app/src/main/java/chess/io/CommandResult.java b/app/src/main/java/chess/io/CommandResult.java deleted file mode 100644 index 8eb6b85..0000000 --- a/app/src/main/java/chess/io/CommandResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package chess.io; - -public enum CommandResult { - Moved, NotMoved, NotAllowed; -} diff --git a/app/src/main/java/chess/io/commands/CastlingCommand.java b/app/src/main/java/chess/io/commands/CastlingCommand.java index 9dcfc71..132c76b 100644 --- a/app/src/main/java/chess/io/commands/CastlingCommand.java +++ b/app/src/main/java/chess/io/commands/CastlingCommand.java @@ -1,6 +1,5 @@ package chess.io.commands; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.io.PlayerCommand; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/GetAllowedMovesCommand.java b/app/src/main/java/chess/io/commands/GetAllowedMovesCommand.java index ec74723..8e308ea 100644 --- a/app/src/main/java/chess/io/commands/GetAllowedMovesCommand.java +++ b/app/src/main/java/chess/io/commands/GetAllowedMovesCommand.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import chess.io.Command; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.model.ChessBoard; import chess.model.Coordinate; diff --git a/app/src/main/java/chess/io/commands/GetPieceAtCommand.java b/app/src/main/java/chess/io/commands/GetPieceAtCommand.java index d248261..112e362 100644 --- a/app/src/main/java/chess/io/commands/GetPieceAtCommand.java +++ b/app/src/main/java/chess/io/commands/GetPieceAtCommand.java @@ -1,7 +1,6 @@ package chess.io.commands; import chess.io.Command; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.model.Coordinate; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/GrandCastlingCommand.java b/app/src/main/java/chess/io/commands/GrandCastlingCommand.java index 5953918..12e9a31 100644 --- a/app/src/main/java/chess/io/commands/GrandCastlingCommand.java +++ b/app/src/main/java/chess/io/commands/GrandCastlingCommand.java @@ -1,6 +1,5 @@ package chess.io.commands; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.io.PlayerCommand; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/MoveCommand.java b/app/src/main/java/chess/io/commands/MoveCommand.java index b914890..c8249e9 100644 --- a/app/src/main/java/chess/io/commands/MoveCommand.java +++ b/app/src/main/java/chess/io/commands/MoveCommand.java @@ -1,6 +1,5 @@ package chess.io.commands; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.io.PlayerCommand; import chess.model.ChessBoard; diff --git a/app/src/main/java/chess/io/commands/NewGameCommand.java b/app/src/main/java/chess/io/commands/NewGameCommand.java index f060212..166aa5b 100644 --- a/app/src/main/java/chess/io/commands/NewGameCommand.java +++ b/app/src/main/java/chess/io/commands/NewGameCommand.java @@ -1,7 +1,6 @@ package chess.io.commands; import chess.io.Command; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.model.ChessBoard; import chess.model.Color; diff --git a/app/src/main/java/chess/io/commands/PromoteCommand.java b/app/src/main/java/chess/io/commands/PromoteCommand.java index f19c5f9..47cd382 100644 --- a/app/src/main/java/chess/io/commands/PromoteCommand.java +++ b/app/src/main/java/chess/io/commands/PromoteCommand.java @@ -1,6 +1,5 @@ package chess.io.commands; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.io.PlayerCommand; import chess.model.ChessBoard; diff --git a/app/src/main/java/chess/io/commands/SurrenderCommand.java b/app/src/main/java/chess/io/commands/SurrenderCommand.java index 3aa73b4..b8a6761 100644 --- a/app/src/main/java/chess/io/commands/SurrenderCommand.java +++ b/app/src/main/java/chess/io/commands/SurrenderCommand.java @@ -1,7 +1,6 @@ package chess.io.commands; import chess.io.Command; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.model.Color; import chess.model.Game; diff --git a/app/src/main/java/chess/io/commands/UndoCommand.java b/app/src/main/java/chess/io/commands/UndoCommand.java index 6db33ad..e648e99 100644 --- a/app/src/main/java/chess/io/commands/UndoCommand.java +++ b/app/src/main/java/chess/io/commands/UndoCommand.java @@ -1,7 +1,6 @@ package chess.io.commands; import chess.io.Command; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.model.Game; diff --git a/app/src/main/java/chess/simplerender/Window.java b/app/src/main/java/chess/simplerender/Window.java index 0bd04be..0dac115 100644 --- a/app/src/main/java/chess/simplerender/Window.java +++ b/app/src/main/java/chess/simplerender/Window.java @@ -13,8 +13,8 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; import chess.io.Command; +import chess.io.Command.CommandResult; import chess.io.CommandExecutor; -import chess.io.CommandResult; import chess.io.OutputSystem; import chess.io.commands.GetAllowedMovesCommand; import chess.io.commands.GetPieceAtCommand;