From 752a4d48f94040363f6b715b400d734c88867afd Mon Sep 17 00:00:00 2001 From: gpuget Date: Sun, 7 Feb 2021 22:38:30 +0100 Subject: [PATCH 1/2] Refactoring --- src/main/java/game/GameFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/game/GameFactory.java b/src/main/java/game/GameFactory.java index 18ba1b4..fe38524 100644 --- a/src/main/java/game/GameFactory.java +++ b/src/main/java/game/GameFactory.java @@ -5,13 +5,13 @@ public enum GameFactory { ; - public final Supplier gameSupplier; + public final Supplier gameSupplier; - GameFactory(Supplier gameSupplier) { + GameFactory(Supplier gameSupplier) { this.gameSupplier = gameSupplier; } - public Game create() { + public GenericGame create() { return this.gameSupplier.get(); } } From 75cfd222faa0b451c614237d9a8674951f42f7b1 Mon Sep 17 00:00:00 2001 From: gpuget Date: Sun, 7 Feb 2021 17:27:44 +0100 Subject: [PATCH 2/2] Tetris --- src/main/java/Application.java | 5 +++++ src/main/java/game/GameFactory.java | 9 ++++---- src/main/java/game/tetris/Tetris.java | 30 +++++++++++++++++++++++++ src/test/java/game/GameFactoryTest.java | 4 ---- 4 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 src/main/java/game/tetris/Tetris.java delete mode 100644 src/test/java/game/GameFactoryTest.java diff --git a/src/main/java/Application.java b/src/main/java/Application.java index 1e032a1..f31360e 100644 --- a/src/main/java/Application.java +++ b/src/main/java/Application.java @@ -1,4 +1,9 @@ +import game.Game; +import game.GameFactory; + public class Application { public static void main(String[] args) { + Game game = GameFactory.TETRIS.create(); + game.init(); } } diff --git a/src/main/java/game/GameFactory.java b/src/main/java/game/GameFactory.java index fe38524..dbf1790 100644 --- a/src/main/java/game/GameFactory.java +++ b/src/main/java/game/GameFactory.java @@ -1,17 +1,18 @@ package game; +import game.tetris.Tetris; import java.util.function.Supplier; public enum GameFactory { - ; + TETRIS(Tetris::new); - public final Supplier gameSupplier; + private final Supplier gameSupplier; - GameFactory(Supplier gameSupplier) { + GameFactory(Supplier gameSupplier) { this.gameSupplier = gameSupplier; } - public GenericGame create() { + public Game create() { return this.gameSupplier.get(); } } diff --git a/src/main/java/game/tetris/Tetris.java b/src/main/java/game/tetris/Tetris.java new file mode 100644 index 0000000..8e2841c --- /dev/null +++ b/src/main/java/game/tetris/Tetris.java @@ -0,0 +1,30 @@ +package game.tetris; + +import game.GenericGame; + +public class Tetris extends GenericGame { + public Tetris() { + super("TETRIS"); + } + + @Override + protected boolean doInit() { + displayTitle(); + return true; + } + + private String displayTitle() { + String title = + " [#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#] " + '\n' + + " " + '\n' + + " [#][#][#] [#][#][#] [#][#][#] [#][#] [#][#][#] [#][#][#] " + '\n' + + " [#] [#] [#] [#] [#] [#] [#] " + '\n' + + " [#] [#][#] [#] [#][#] [#] [#][#][#] " + '\n' + + " [#] [#] [#] [#] [#] [#] [#] " + '\n' + + " [#] [#][#][#] [#] [#] [#] [#][#][#] [#][#][#] " + '\n' + + " " + '\n' + + " [#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#][#] " + '\n'; + System.out.println(title); + return title; + } +} diff --git a/src/test/java/game/GameFactoryTest.java b/src/test/java/game/GameFactoryTest.java deleted file mode 100644 index 9417146..0000000 --- a/src/test/java/game/GameFactoryTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package game; - -class GameFactoryTest { -} \ No newline at end of file