From a1929313d01bf124529feda68d12de7ee6dd2279 Mon Sep 17 00:00:00 2001
From: Hatim Saidi <hatim.saidi@etu.univ-amu.fr>
Date: Sun, 13 Nov 2022 22:50:07 +0100
Subject: [PATCH] test
---
app/src/main/java/model/ArrayGrid.java | 14 +++++++-------
app/src/main/java/model/Grid.java | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/model/ArrayGrid.java b/app/src/main/java/model/ArrayGrid.java
index 0ed5056..78c88c8 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 Grid{
private Cell[][] cells;
@@ -34,14 +36,12 @@ public class ArrayGrid implements Grid{
}
public void color(ColorGenerator colorGenerator){
- for (int j = 0; j < this.numberOfColumns; j++) {
- for (int i = 0; i < this.numberOfRows; i++) {
- SquareCell cell = new SquareCell();
- cells[i][j].setColor(colorGenerator.nextColor(cell));
- }
- }
-
+ for(Cell cell : this)
+ cell.setColor(colorGenerator.nextColor(new SquareCell()));
+ }
+ public Iterator<Cell> iterator(){
+ return null ;
}
diff --git a/app/src/main/java/model/Grid.java b/app/src/main/java/model/Grid.java
index a387ca3..96e23b9 100644
--- a/app/src/main/java/model/Grid.java
+++ b/app/src/main/java/model/Grid.java
@@ -1,6 +1,6 @@
package model;
-public interface Grid {
+public interface Grid extends Iterable<Cell>{
/**
* Return the cell located at the given coordinates in the grid.
--
GitLab