diff --git a/app/src/main/java/model/ArrayGrid.java b/app/src/main/java/model/ArrayGrid.java index 7cfca479dfa7addb263556feb173ff83bdcc5290..e4b6bdc873f004983f487a1417a41e9cbd5858b8 100644 --- a/app/src/main/java/model/ArrayGrid.java +++ b/app/src/main/java/model/ArrayGrid.java @@ -7,15 +7,31 @@ public class ArrayGrid implements Grid{ private final int numberOfColumns ; - public ArrayGrid(int numberOfRows,int numberOfColumns){ + public ArrayGrid(int numberOfRows,int numberOfColumns) { this.numberOfRows = numberOfRows; this.numberOfColumns = numberOfColumns; - this.cells[numberOfRows][numberOfColumns]=new SquareCell(); - try { - System.out.println(numberOfColumns<0 || numberOfRows<0); - }catch (IllegalArgumentException e){ - System.out.println(e); + if (numberOfColumns > 0 || numberOfRows > 0) { + for (int j = 0; j < this.numberOfColumns; j++) { + for (int i = 0; i < this.numberOfRows; i++) { + cells[numberOfRows][numberOfColumns] = new SquareCell(); + } + } } + else { + throw new IllegalArgumentException() ; + } + } + + public Cell getCell(int row, int column) { + return this.cells[row][column]; } + public int getNumberOfRows(){ + return this.numberOfRows; + } + public int getNumberOfColumns(){ + return this.numberOfColumns; + } + + } diff --git a/app/src/main/java/model/SquareCell.java b/app/src/main/java/model/SquareCell.java index dd412e1e2f8b8e977e15711e0556ca84739aba97..bddd8bdfc018442d2e72fac2a96c049da865d99e 100644 --- a/app/src/main/java/model/SquareCell.java +++ b/app/src/main/java/model/SquareCell.java @@ -11,17 +11,19 @@ public class SquareCell extends AbstractCell { List<Cell> neighbours; - public SquareCell() { - AbstractCell cell = new SquareCell(); + Color cell = DEFAULT_CELL_COLOR; + this.neighbours = new ArrayList<>(); } public SquareCell(Color color){ - AbstractCell cell = new SquareCell(color); + Color cell = color; + this.neighbours = new ArrayList<>(); } public SquareCell(Color color,List<Cell>neighbours){ - AbstractCell cell = new SquareCell(color,neighbours); + Color cell = color; + this.neighbours = neighbours; } @Override