From 6ae87128ef45faac6b1d60bf0ed04698648db56a Mon Sep 17 00:00:00 2001 From: arnaudlabourel <arnaud.labourel@univ-amu.fr> Date: Tue, 12 Oct 2021 11:29:37 +0200 Subject: [PATCH] Corrections mineures --- src/main/java/controller/GridController.java | 17 +++++++------- src/main/java/model/EmptySide.java | 10 -------- src/main/java/model/EmptySquare.java | 23 ------------------- src/main/java/model/Side.java | 2 -- src/main/java/model/Square.java | 5 ---- src/main/java/util/RandomUtil.java | 16 ------------- .../{GridTileCanvas.java => GridCanvas.java} | 11 +++++---- src/main/resources/view/GridCanvas.fxml | 12 +++++----- src/test/java/EmptySideTest.java | 11 --------- src/test/java/EmptySquareTest.java | 19 --------------- 10 files changed, 20 insertions(+), 106 deletions(-) delete mode 100644 src/main/java/util/RandomUtil.java rename src/main/java/view/{GridTileCanvas.java => GridCanvas.java} (85%) diff --git a/src/main/java/controller/GridController.java b/src/main/java/controller/GridController.java index 00c20db..e444465 100644 --- a/src/main/java/controller/GridController.java +++ b/src/main/java/controller/GridController.java @@ -2,9 +2,8 @@ package controller; import javafx.fxml.FXML; import javafx.scene.paint.Color; import model.*; -import view.GridTileCanvas; +import view.GridCanvas; -import java.util.List; import java.util.Random; public class GridController { @@ -14,18 +13,18 @@ public class GridController { public static final Color COLOR_LAST_NAME_TWO = Color.YELLOW; Random random = new Random(); @FXML - public GridTileCanvas gridTileCanvas; + public GridCanvas gridCanvas; public void initialize() { clearGrid(); } public void fillGrid(TileGenerator tileGenerator) { - gridTileCanvas.fillGrid(tileGenerator); + gridCanvas.fillGrid(tileGenerator); } public void drawGrid() { - gridTileCanvas.update(); + gridCanvas.update(); } public void clearGrid(){ @@ -46,25 +45,25 @@ public class GridController { @FXML public void updateFirstNameOneUniformTile(){ // TODO : uncomment the code to test UniformTileGenerator - // updateGrid(new UniformTileGenerator(new InternalSide(COLOR_FIRST_NAME_ONE))); + // updateGrid(new UniformTileGenerator(COLOR_FIRST_NAME_ONE)); } @FXML public void updateFirstNameTwoUniformTile() { // TODO : uncomment the code to test UniformTileGenerator - // updateGrid(new UniformTileGenerator(new InternalSide(COLOR_FIRST_NAME_TWO))); + // updateGrid(new UniformTileGenerator(COLOR_FIRST_NAME_TWO)); } @FXML public void updateLastNameOneUniformTile(){ // TODO : uncomment the code to test UniformTileGenerator - // updateGrid(new UniformTileGenerator(new InternalSide(COLOR_LAST_NAME_ONE))); + // updateGrid(new UniformTileGenerator(COLOR_LAST_NAME_ONE)); } @FXML public void updateLastNameTwoUniformTile() { // TODO : uncomment the code to test UniformTileGenerator - // updateGrid(new UniformTileGenerator(new InternalSide(COLOR_LAST_NAME_TWO))); + // updateGrid(new UniformTileGenerator(COLOR_LAST_NAME_TWO)); } @FXML diff --git a/src/main/java/model/EmptySide.java b/src/main/java/model/EmptySide.java index ec97721..41d3582 100644 --- a/src/main/java/model/EmptySide.java +++ b/src/main/java/model/EmptySide.java @@ -9,16 +9,6 @@ public class EmptySide implements Side { private EmptySide(){} - @Override - public boolean accept(Side side) { - return true; - } - - @Override - public List<Side> compatibleSides(List<Side> sides) { - return sides; - } - @Override public Color color() { return Color.WHITE; diff --git a/src/main/java/model/EmptySquare.java b/src/main/java/model/EmptySquare.java index 97b91b4..f1a34a2 100644 --- a/src/main/java/model/EmptySquare.java +++ b/src/main/java/model/EmptySquare.java @@ -7,11 +7,6 @@ public class EmptySquare implements Square{ private EmptySquare() {} - @Override - public boolean accept(Tile tile) { - return true; - } - @Override public void put(Tile tile) {} @@ -19,22 +14,4 @@ public class EmptySquare implements Square{ public Tile getTile() { return EmptyTile.EMPTY_TILE; } - - @Override - public List<Tile> compatibleTiles(List<Tile> tiles) { - return tiles; - } - - @Override - public List<Side> compatibleSides(List<Side> sides, CardinalDirection direction) { - return sides; - } - - @Override - public Square getNeighbor(CardinalDirection direction) { - return EMPTY_SQUARE; - } - - @Override - public void setNeighbor(Square neighbor, CardinalDirection direction) {} } diff --git a/src/main/java/model/Side.java b/src/main/java/model/Side.java index 4c66de4..3cd9711 100644 --- a/src/main/java/model/Side.java +++ b/src/main/java/model/Side.java @@ -5,7 +5,5 @@ import javafx.scene.paint.Color; import java.util.List; public interface Side { - List<Side> compatibleSides(List<Side> sides); Color color(); - boolean accept(Side side); } diff --git a/src/main/java/model/Square.java b/src/main/java/model/Square.java index 03b1798..fff4fb7 100644 --- a/src/main/java/model/Square.java +++ b/src/main/java/model/Square.java @@ -3,11 +3,6 @@ package model; import java.util.List; public interface Square { - boolean accept(Tile tile); void put(Tile tile); Tile getTile(); - List<Tile> compatibleTiles(List<Tile> tiles); - List<Side> compatibleSides(List<Side> sides, CardinalDirection direction); - Square getNeighbor(CardinalDirection direction); - void setNeighbor(Square neighbor, CardinalDirection direction); } diff --git a/src/main/java/util/RandomUtil.java b/src/main/java/util/RandomUtil.java deleted file mode 100644 index 8ccb36f..0000000 --- a/src/main/java/util/RandomUtil.java +++ /dev/null @@ -1,16 +0,0 @@ -package util; - -import java.util.List; -import java.util.Random; - -public final class RandomUtil { - private RandomUtil(){} - - public static <T> T randomElement(List<T> elements, Random random){ - return elements.get(random.nextInt(elements.size())); - } - - public static <T> T randomElement(T[] elements, Random random){ - return elements[random.nextInt(elements.length)]; - } -} diff --git a/src/main/java/view/GridTileCanvas.java b/src/main/java/view/GridCanvas.java similarity index 85% rename from src/main/java/view/GridTileCanvas.java rename to src/main/java/view/GridCanvas.java index d73f151..33c277a 100644 --- a/src/main/java/view/GridTileCanvas.java +++ b/src/main/java/view/GridCanvas.java @@ -8,7 +8,7 @@ import model.*; import java.util.List; -public class GridTileCanvas extends Canvas { +public class GridCanvas extends Canvas { public final double tileWidth; private final double tileHeight; @@ -17,16 +17,17 @@ public class GridTileCanvas extends Canvas { private final Grid grid; private final GraphicsContext graphicsContext; - public GridTileCanvas(@NamedArg("tileWidth") Double tileWidth, - @NamedArg("tileHeight") Double tileHeight, - @NamedArg("numberOfColumns") Integer numberOfColumns, - @NamedArg("numberOfRows") Integer numberOfRows) { + public GridCanvas(@NamedArg("tileWidth") Double tileWidth, + @NamedArg("tileHeight") Double tileHeight, + @NamedArg("numberOfColumns") Integer numberOfColumns, + @NamedArg("numberOfRows") Integer numberOfRows) { this.tileWidth = tileWidth; this.tileHeight = tileHeight; this.numberOfColumns = numberOfColumns; this.numberOfRows = numberOfRows; this.setWidth(tileWidth * numberOfColumns); this.setHeight(tileHeight * numberOfRows); + // TODO change the EmptyGrid for an ArrayGrid grid = new EmptyGrid(numberOfRows, numberOfColumns); graphicsContext = getGraphicsContext2D(); } diff --git a/src/main/resources/view/GridCanvas.fxml b/src/main/resources/view/GridCanvas.fxml index 464d03c..538f58c 100644 --- a/src/main/resources/view/GridCanvas.fxml +++ b/src/main/resources/view/GridCanvas.fxml @@ -3,7 +3,7 @@ <?import javafx.scene.layout.*?> -<?import view.GridTileCanvas?> +<?import view.GridCanvas?> <?import java.lang.Double?> <?import java.lang.Integer?> <?import javafx.scene.control.MenuBar?> @@ -43,10 +43,10 @@ </MenuItem> </Menu> </MenuBar> - <GridTileCanvas AnchorPane.topAnchor="40." - xmlns="http://javafx.com/javafx" - xmlns:fx="http://javafx.com/fxml" - fx:id="gridTileCanvas"> + <GridCanvas AnchorPane.topAnchor="40." + xmlns="http://javafx.com/javafx" + xmlns:fx="http://javafx.com/fxml" + fx:id="gridCanvas"> <tileWidth> <Double fx:value="20"/> </tileWidth> @@ -59,5 +59,5 @@ <numberOfRows> <Integer fx:value="50"/> </numberOfRows> - </GridTileCanvas> + </GridCanvas> </AnchorPane> \ No newline at end of file diff --git a/src/test/java/EmptySideTest.java b/src/test/java/EmptySideTest.java index c44f999..385985b 100644 --- a/src/test/java/EmptySideTest.java +++ b/src/test/java/EmptySideTest.java @@ -8,19 +8,8 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; public class EmptySideTest { - @Test - void testCompatibleSides(){ - List<Side> sides = List.of(EmptySide.EMPTY_SIDE); - assertThat(EmptySide.EMPTY_SIDE.compatibleSides(sides)).containsExactly(EmptySide.EMPTY_SIDE); - } - @Test void testColor(){ assertThat(EmptySide.EMPTY_SIDE.color()).isEqualTo(Color.WHITE); } - @Test - void testAccept(){ - assertThat(EmptySide.EMPTY_SIDE.accept(EmptySide.EMPTY_SIDE)).isTrue(); - } - } diff --git a/src/test/java/EmptySquareTest.java b/src/test/java/EmptySquareTest.java index cf872f4..7c84fea 100644 --- a/src/test/java/EmptySquareTest.java +++ b/src/test/java/EmptySquareTest.java @@ -9,29 +9,10 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; public class EmptySquareTest { - @Test - void testAccept(){ - assertThat(EmptySquare.EMPTY_SQUARE.accept(EmptyTile.EMPTY_TILE)).isTrue(); - } @Test void testGetTile(){ assertThat(EmptySquare.EMPTY_SQUARE.getTile()).isEqualTo(EmptyTile.EMPTY_TILE); } - @Test - void testCompatibleTiles(){ - assertThat(EmptySquare.EMPTY_SQUARE.compatibleTiles(List.of(EmptyTile.EMPTY_TILE))).containsExactly(EmptyTile.EMPTY_TILE); - } - - @Test - void testCompatibleSides(){ - assertThat(EmptySquare.EMPTY_SQUARE.compatibleSides(List.of(EmptySide.EMPTY_SIDE), CardinalDirection.NORTH)).containsExactly(EmptySide.EMPTY_SIDE); - } - - @Test - void testGetNeighbor(){ - assertThat(EmptySquare.EMPTY_SQUARE.getNeighbor(CardinalDirection.NORTH)).isEqualTo(EmptySquare.EMPTY_SQUARE); - } - } -- GitLab