Skip to content
Snippets Groups Projects
Commit 6ae87128 authored by LABOUREL Arnaud's avatar LABOUREL Arnaud
Browse files

Corrections mineures

parent 6e9d9bf6
Branches
No related tags found
No related merge requests found
Pipeline #2396 passed
......@@ -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
......
......@@ -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;
......
......@@ -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) {}
}
......@@ -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);
}
......@@ -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);
}
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)];
}
}
......@@ -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,7 +17,7 @@ public class GridTileCanvas extends Canvas {
private final Grid grid;
private final GraphicsContext graphicsContext;
public GridTileCanvas(@NamedArg("tileWidth") Double tileWidth,
public GridCanvas(@NamedArg("tileWidth") Double tileWidth,
@NamedArg("tileHeight") Double tileHeight,
@NamedArg("numberOfColumns") Integer numberOfColumns,
@NamedArg("numberOfRows") Integer numberOfRows) {
......@@ -27,6 +27,7 @@ public class GridTileCanvas extends Canvas {
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();
}
......
......@@ -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."
<GridCanvas AnchorPane.topAnchor="40."
xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:id="gridTileCanvas">
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
......@@ -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();
}
}
......@@ -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);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment