From 0b7648955978727967a99ed5f067abdf0b15e8c5 Mon Sep 17 00:00:00 2001
From: b21221851 <mohamed-amine.BEL-KHALIFA@etu.univ-amu.fr>
Date: Wed, 9 Nov 2022 10:03:57 +0100
Subject: [PATCH] 9111
---
app/src/main/java/model/ArrayGrid.java | 19 +++++++++++++
app/src/main/java/model/CellGridIterator.java | 27 +++++++++++++++++++
app/src/main/java/model/Grid.java | 4 ++-
3 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 app/src/main/java/model/CellGridIterator.java
diff --git a/app/src/main/java/model/ArrayGrid.java b/app/src/main/java/model/ArrayGrid.java
index 4558d91..7778885 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 0000000..b992413
--- /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 6e90446..004f293 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.
--
GitLab