Skip to content
Snippets Groups Projects
Commit e298a24f authored by dragapsy's avatar dragapsy
Browse files

Tache 1 (testée)

parent 34dab129
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,7 @@ import javafx.scene.layout.GridPane; ...@@ -8,6 +8,7 @@ import javafx.scene.layout.GridPane;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.shape.Rectangle; import javafx.scene.shape.Rectangle;
import javafx.util.Duration; import javafx.util.Duration;
import model.ArrayGrid;
import model.Cell; import model.Cell;
import model.GrayGrid; import model.GrayGrid;
import model.Grid; import model.Grid;
...@@ -28,8 +29,7 @@ public class MatrixPane extends GridPane { ...@@ -28,8 +29,7 @@ public class MatrixPane extends GridPane {
this.tileHeight = tileHeight; this.tileHeight = tileHeight;
this.numberOfColumns = numberOfColumns; this.numberOfColumns = numberOfColumns;
this.numberOfRows = numberOfRows; this.numberOfRows = numberOfRows;
// TODO replace by new ArrayGrid(numberOfRows, numberOfColumns) cellGrid = new ArrayGrid(numberOfRows, numberOfColumns);
cellGrid = new GrayGrid(numberOfRows, numberOfColumns);
initMatrix(); initMatrix();
} }
......
...@@ -11,9 +11,6 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -11,9 +11,6 @@ import static org.assertj.core.api.Assertions.assertThat;
class SquareCellTest { class SquareCellTest {
// TODO
// uncomment
/*
private final Cell northCell = new SquareCell(Color.NAVY); private final Cell northCell = new SquareCell(Color.NAVY);
private final Cell southCell = new SquareCell(Color.SALMON); private final Cell southCell = new SquareCell(Color.SALMON);
private final Cell westCell = new SquareCell(Color.WHEAT); private final Cell westCell = new SquareCell(Color.WHEAT);
...@@ -51,5 +48,5 @@ class SquareCellTest { ...@@ -51,5 +48,5 @@ class SquareCellTest {
assertThat(centralCell.getNeighbours()).containsExactlyInAnyOrder(northCell,southCell); assertThat(centralCell.getNeighbours()).containsExactlyInAnyOrder(northCell,southCell);
} }
*/
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment