From 428ae57fb278e35017c28db83f0ef1e195941610 Mon Sep 17 00:00:00 2001
From: dragapsy <elghaoutiayman20@gmail.com>
Date: Fri, 18 Nov 2022 21:49:45 +0100
Subject: [PATCH] Tache 5 (Ajout de la methode Iterator<Cell> iterator() dans
Cell + redefinition dans SquareCell).
---
app/src/main/java/model/Cell.java | 2 +-
.../main/java/model/ColoredCellIterator.java | 18 ++++++++++++++++++
app/src/main/java/model/SquareCell.java | 5 +++++
3 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 app/src/main/java/model/ColoredCellIterator.java
diff --git a/app/src/main/java/model/Cell.java b/app/src/main/java/model/Cell.java
index 4f09b41..d7d0b60 100644
--- a/app/src/main/java/model/Cell.java
+++ b/app/src/main/java/model/Cell.java
@@ -41,6 +41,6 @@ public interface Cell {
* @return this {@link Cell}'s property
*/
Property<Color> getColorProperty();
-
+ Iterator<Cell> iterator();
}
diff --git a/app/src/main/java/model/ColoredCellIterator.java b/app/src/main/java/model/ColoredCellIterator.java
new file mode 100644
index 0000000..e558814
--- /dev/null
+++ b/app/src/main/java/model/ColoredCellIterator.java
@@ -0,0 +1,18 @@
+package model;
+
+import java.util.Iterator;
+
+public class ColoredCellIterator implements Iterator<Cell> {
+ public ColoredCellIterator(SquareCell squareCell) {
+ }
+
+ @Override
+ public boolean hasNext() {
+ return false;
+ }
+
+ @Override
+ public Cell next() {
+ return null;
+ }
+}
diff --git a/app/src/main/java/model/SquareCell.java b/app/src/main/java/model/SquareCell.java
index 7869fe7..46c7dad 100644
--- a/app/src/main/java/model/SquareCell.java
+++ b/app/src/main/java/model/SquareCell.java
@@ -52,5 +52,10 @@ public class SquareCell extends AbstractCell{
}
+ @Override
+ public Iterator<Cell> iterator() {
+ return new ColoredCellIterator(SquareCell.this);
+ }
+
}
--
GitLab