From 80ffb187ba907d50546f4a9744918b61d229a78d Mon Sep 17 00:00:00 2001
From: dragapsy <elghaoutiayman20@gmail.com>
Date: Fri, 18 Nov 2022 02:07:35 +0100
Subject: [PATCH] Tache 3 (La methode Next())
---
app/src/main/java/model/CellGridIterator.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/model/CellGridIterator.java b/app/src/main/java/model/CellGridIterator.java
index 2ea7957..6bc3d5e 100644
--- a/app/src/main/java/model/CellGridIterator.java
+++ b/app/src/main/java/model/CellGridIterator.java
@@ -1,6 +1,8 @@
package model;
import java.util.Iterator;
+import java.util.NoSuchElementException;
+
public class CellGridIterator implements Iterator<Cell> {
ArrayGrid arrayGrid;
@@ -10,6 +12,8 @@ public class CellGridIterator implements Iterator<Cell> {
public CellGridIterator(ArrayGrid grid) {
arrayGrid=grid;
cells=grid.cells;
+ rowIndex =0;
+ columnIndex=0;
}
@@ -20,6 +24,15 @@ public class CellGridIterator implements Iterator<Cell> {
@Override
public Cell next() {
- return null;
+ if(columnIndex==cells[rowIndex].length)
+ {
+ columnIndex=0;
+ rowIndex++;
+ }
+ if(rowIndex== cells.length&& columnIndex==cells[rowIndex].length){
+ throw new NoSuchElementException();
+ }
+ return cells[rowIndex][columnIndex++];
}
}
+
--
GitLab