From 0e50159336f836c631cdd32debb468ed336c4c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 23 Jan 2020 17:19:12 +0100 Subject: TileStorage -> tilestorages/TileStorage --- core/src/ch/asynk/gdx/boardgame/TileStorage.java | 29 -------------------- core/src/ch/asynk/gdx/boardgame/boards/Board.java | 4 +-- .../ch/asynk/gdx/boardgame/boards/HexBoard.java | 2 +- .../ch/asynk/gdx/boardgame/boards/SquareBoard.java | 2 +- .../asynk/gdx/boardgame/boards/TriangleBoard.java | 2 +- .../boardgame/tilestorages/ArrayTileStorage.java | 2 -- .../boardgame/tilestorages/HashTileStorage.java | 2 -- .../gdx/boardgame/tilestorages/TileStorage.java | 31 ++++++++++++++++++++++ .../ch/asynk/gdx/boardgame/test/BoardScreen.java | 2 +- 9 files changed, 37 insertions(+), 39 deletions(-) delete mode 100644 core/src/ch/asynk/gdx/boardgame/TileStorage.java create mode 100644 core/src/ch/asynk/gdx/boardgame/tilestorages/TileStorage.java diff --git a/core/src/ch/asynk/gdx/boardgame/TileStorage.java b/core/src/ch/asynk/gdx/boardgame/TileStorage.java deleted file mode 100644 index 63840d2..0000000 --- a/core/src/ch/asynk/gdx/boardgame/TileStorage.java +++ /dev/null @@ -1,29 +0,0 @@ -package ch.asynk.gdx.boardgame; - -public interface TileStorage -{ - @FunctionalInterface - public interface TileFactory - { - public Tile buildTile(int x, int y); - } - - @FunctionalInterface - public interface TileKeyGenerator - { - public int genKey(int x, int y); - } - - @FunctionalInterface - public interface TileProvider - { - public Tile getTile(int x, int y); - } - - Tile getTile(int x, int y, int k, TileFactory tileFactory); - - default Tile getTile(int x, int y, TileKeyGenerator tileKeyGenerator, TileFactory tileFactory) - { - return getTile(x, y, tileKeyGenerator.genKey(x, y), tileFactory); - } -} diff --git a/core/src/ch/asynk/gdx/boardgame/boards/Board.java b/core/src/ch/asynk/gdx/boardgame/boards/Board.java index 38deac7..6cabcee 100644 --- a/core/src/ch/asynk/gdx/boardgame/boards/Board.java +++ b/core/src/ch/asynk/gdx/boardgame/boards/Board.java @@ -3,8 +3,8 @@ package ch.asynk.gdx.boardgame.boards; import com.badlogic.gdx.math.Vector2; import ch.asynk.gdx.boardgame.Tile; -import ch.asynk.gdx.boardgame.TileStorage.TileProvider; -import ch.asynk.gdx.boardgame.TileStorage.TileKeyGenerator; +import ch.asynk.gdx.boardgame.tilestorages.TileStorage.TileProvider; +import ch.asynk.gdx.boardgame.tilestorages.TileStorage.TileKeyGenerator; public interface Board extends TileKeyGenerator { diff --git a/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java b/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java index 8aba831..362efdf 100644 --- a/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java +++ b/core/src/ch/asynk/gdx/boardgame/boards/HexBoard.java @@ -3,7 +3,7 @@ package ch.asynk.gdx.boardgame.boards; import com.badlogic.gdx.math.Vector2; import ch.asynk.gdx.boardgame.Tile; -import ch.asynk.gdx.boardgame.TileStorage.TileProvider; +import ch.asynk.gdx.boardgame.tilestorages.TileStorage.TileProvider; public class HexBoard implements Board { diff --git a/core/src/ch/asynk/gdx/boardgame/boards/SquareBoard.java b/core/src/ch/asynk/gdx/boardgame/boards/SquareBoard.java index 2481530..d09a39d 100644 --- a/core/src/ch/asynk/gdx/boardgame/boards/SquareBoard.java +++ b/core/src/ch/asynk/gdx/boardgame/boards/SquareBoard.java @@ -3,7 +3,7 @@ package ch.asynk.gdx.boardgame.boards; import com.badlogic.gdx.math.Vector2; import ch.asynk.gdx.boardgame.Tile; -import ch.asynk.gdx.boardgame.TileStorage.TileProvider; +import ch.asynk.gdx.boardgame.tilestorages.TileStorage.TileProvider; public class SquareBoard implements Board { diff --git a/core/src/ch/asynk/gdx/boardgame/boards/TriangleBoard.java b/core/src/ch/asynk/gdx/boardgame/boards/TriangleBoard.java index eec16ce..9b7c4bc 100644 --- a/core/src/ch/asynk/gdx/boardgame/boards/TriangleBoard.java +++ b/core/src/ch/asynk/gdx/boardgame/boards/TriangleBoard.java @@ -3,7 +3,7 @@ package ch.asynk.gdx.boardgame.boards; import com.badlogic.gdx.math.Vector2; import ch.asynk.gdx.boardgame.Tile; -import ch.asynk.gdx.boardgame.TileStorage.TileProvider; +import ch.asynk.gdx.boardgame.tilestorages.TileStorage.TileProvider; public class TriangleBoard implements Board { diff --git a/core/src/ch/asynk/gdx/boardgame/tilestorages/ArrayTileStorage.java b/core/src/ch/asynk/gdx/boardgame/tilestorages/ArrayTileStorage.java index 135d833..db88ab7 100644 --- a/core/src/ch/asynk/gdx/boardgame/tilestorages/ArrayTileStorage.java +++ b/core/src/ch/asynk/gdx/boardgame/tilestorages/ArrayTileStorage.java @@ -1,8 +1,6 @@ package ch.asynk.gdx.boardgame.tilestorages; import ch.asynk.gdx.boardgame.Tile; -import ch.asynk.gdx.boardgame.TileStorage; -import ch.asynk.gdx.boardgame.TileStorage.TileFactory; public class ArrayTileStorage implements TileStorage { diff --git a/core/src/ch/asynk/gdx/boardgame/tilestorages/HashTileStorage.java b/core/src/ch/asynk/gdx/boardgame/tilestorages/HashTileStorage.java index cf8a386..85b5538 100644 --- a/core/src/ch/asynk/gdx/boardgame/tilestorages/HashTileStorage.java +++ b/core/src/ch/asynk/gdx/boardgame/tilestorages/HashTileStorage.java @@ -4,8 +4,6 @@ import java.util.Map; import java.util.HashMap; import ch.asynk.gdx.boardgame.Tile; -import ch.asynk.gdx.boardgame.TileStorage; -import ch.asynk.gdx.boardgame.TileStorage.TileFactory; public class HashTileStorage implements TileStorage { diff --git a/core/src/ch/asynk/gdx/boardgame/tilestorages/TileStorage.java b/core/src/ch/asynk/gdx/boardgame/tilestorages/TileStorage.java new file mode 100644 index 0000000..405ef2f --- /dev/null +++ b/core/src/ch/asynk/gdx/boardgame/tilestorages/TileStorage.java @@ -0,0 +1,31 @@ +package ch.asynk.gdx.boardgame.tilestorages; + +import ch.asynk.gdx.boardgame.Tile; + +public interface TileStorage +{ + @FunctionalInterface + public interface TileFactory + { + public Tile buildTile(int x, int y); + } + + @FunctionalInterface + public interface TileKeyGenerator + { + public int genKey(int x, int y); + } + + @FunctionalInterface + public interface TileProvider + { + public Tile getTile(int x, int y); + } + + Tile getTile(int x, int y, int k, TileFactory tileFactory); + + default Tile getTile(int x, int y, TileKeyGenerator tileKeyGenerator, TileFactory tileFactory) + { + return getTile(x, y, tileKeyGenerator.genKey(x, y), tileFactory); + } +} diff --git a/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java b/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java index c74ff40..46b9d82 100644 --- a/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java +++ b/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java @@ -11,7 +11,7 @@ import ch.asynk.gdx.boardgame.Camera; import ch.asynk.gdx.boardgame.Orientation; import ch.asynk.gdx.boardgame.Piece; import ch.asynk.gdx.boardgame.Tile; -import ch.asynk.gdx.boardgame.TileStorage; +import ch.asynk.gdx.boardgame.tilestorages.TileStorage; import ch.asynk.gdx.boardgame.tilestorages.ArrayTileStorage; import ch.asynk.gdx.boardgame.boards.Board; import ch.asynk.gdx.boardgame.boards.BoardFactory; -- cgit v1.1-2-g2b99