From e07b17bac45b183cc166002d9bd23e0e3463412a Mon Sep 17 00:00:00 2001
From: r20004714 <andrianinarisaina-cy.RAKOTOARISOA@etu.univ-amu.fr>
Date: Mon, 14 Nov 2022 18:07:49 +0100
Subject: [PATCH] =?UTF-8?q?T=C3=A2che=203=20(6.2)=20:=20Cr=C3=A9ation=20de?=
=?UTF-8?q?=20la=20classe=20CellGridIterator=20et=20mise=20en=20place=20de?=
=?UTF-8?q?=20son=20constructeur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/java/model/ArrayGrid.java | 7 ++++++
app/src/main/java/model/CellGridIterator.java | 24 +++++++++++++++++++
app/src/main/java/model/ColorGenerator.java | 1 -
app/src/main/java/model/GrayGrid.java | 7 ++++++
4 files changed, 38 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 30ec1d0..f3da3b7 100644
--- a/app/src/main/java/model/ArrayGrid.java
+++ b/app/src/main/java/model/ArrayGrid.java
@@ -1,5 +1,7 @@
package model;
+import java.util.Iterator;
+
public class ArrayGrid implements model.Grid {
//Tableau pour stocker les cellules
@@ -42,6 +44,11 @@ public class ArrayGrid implements model.Grid {
return null;
}
+ @Override
+ public Iterator<Cell> iterator() {
+ return null;
+ }
+
@Override
public int getNumberOfRows() {
return 0;
diff --git a/app/src/main/java/model/CellGridIterator.java b/app/src/main/java/model/CellGridIterator.java
new file mode 100644
index 0000000..f601e04
--- /dev/null
+++ b/app/src/main/java/model/CellGridIterator.java
@@ -0,0 +1,24 @@
+package model;
+import java.util.Iterator;
+
+public class CellGridIterator implements Iterator<Cell> {
+
+ ArrayGrid[] grid ;
+
+ //Constructeur de la classe
+ public void CellGridIterator(ArrayGrid[] grid) {
+ grid = new ArrayGrid[]{} ;
+ }
+
+ //Méthode à implémenter
+ @Override
+ public boolean hasNext() {
+ return false;
+ }
+
+ //Méthode à implémenter
+ @Override
+ public Cell next() {
+ return null;
+ }
+}
diff --git a/app/src/main/java/model/ColorGenerator.java b/app/src/main/java/model/ColorGenerator.java
index afb49c2..d057db3 100644
--- a/app/src/main/java/model/ColorGenerator.java
+++ b/app/src/main/java/model/ColorGenerator.java
@@ -1,5 +1,4 @@
package model;
-
import javafx.scene.paint.Color;
public interface ColorGenerator {
diff --git a/app/src/main/java/model/GrayGrid.java b/app/src/main/java/model/GrayGrid.java
index b3078cc..5e73e42 100644
--- a/app/src/main/java/model/GrayGrid.java
+++ b/app/src/main/java/model/GrayGrid.java
@@ -1,5 +1,7 @@
package model;
+import java.util.Iterator;
+
public class GrayGrid implements Grid{
private final int numberOfRows;
@@ -27,6 +29,11 @@ public class GrayGrid implements Grid{
return GrayCell.GRAY_CELL;
}
+ @Override
+ public Iterator<Cell> iterator() {
+ return null;
+ }
+
/**
* Return the number of rows of this {@code Grid}
*
--
GitLab