diff --git a/app/src/main/java/model/ArrayGrid.java b/app/src/main/java/model/ArrayGrid.java index 4558d91543209c421b69c3a929157232688714c3..7778885ba416d15e5bbd58704743bdddf87d85a2 100644 --- a/app/src/main/java/model/ArrayGrid.java +++ b/app/src/main/java/model/ArrayGrid.java @@ -2,6 +2,8 @@ package model; import javafx.scene.paint.Color; +import java.util.Iterator; + public class ArrayGrid implements Grid{ private Cell[][] cells; @@ -15,6 +17,9 @@ public class ArrayGrid implements Grid{ } } } + + + @Override public Cell getCell(int row, int column) { return this.cells[row][column]; @@ -38,4 +43,18 @@ public class ArrayGrid implements Grid{ } } } + + public Iterator<Cell> iterator() { + return null; + } + + @Override + public boolean hasNext() { + return false; + } + + @Override + public Cell next() { + return null; + } } diff --git a/app/src/main/java/model/CellGridIterator.java b/app/src/main/java/model/CellGridIterator.java new file mode 100644 index 0000000000000000000000000000000000000000..b99241307dc4b4b6efc85a1b3c0ae84e7e144af9 --- /dev/null +++ b/app/src/main/java/model/CellGridIterator.java @@ -0,0 +1,27 @@ +package model; + +import java.util.Iterator; + +public class CellGridIterator implements Iterator<Cell> { + public CellGridIterator(ArrayGrid grid) { + + + } + + @Override + public boolean hasNext() { + return false; + } + + @Override + public Cell next() { + ArrayGrid grid = new ArrayGrid(grid.getNumberOfRows(), grid.getNumberOfColumns()); + for(int i = 0; i < grid.getNumberOfRows() ; i++) { + for(int j = 0; j < grid.getNumberOfColumns(); j++) { + + } + } + return Cell; + } + +} diff --git a/app/src/main/java/model/Grid.java b/app/src/main/java/model/Grid.java index 6e90446cc7ba311ba0b0149a72b732a7e41d3b96..004f293ff3adc1211439e47de5321a27819e822b 100644 --- a/app/src/main/java/model/Grid.java +++ b/app/src/main/java/model/Grid.java @@ -1,6 +1,8 @@ package model; -public interface Grid { +import java.util.Iterator; + +public interface Grid extends Iterator<Cell> { /** * Return the cell located at the given coordinates in the grid.