RandomUtil

app/src/main/java/model/ArrayGrid.java

@@ -37,7 +37,7 @@ public class ArrayGrid implements Grid{
 
     @Override
     public void color(ColorGenerator colorGenerator) {
-        for(Cell[] column : cells ) {
+        for(Cell[] column : this.cells ) {
             for(Cell cell : column) {
                 cell.setColor(colorGenerator.nextColor(cell));
             }

app/src/main/java/model/CellGridIterator.java

@@ -15,8 +15,11 @@ public class CellGridIterator implements Iterator<Cell> {
 
     @Override
     public boolean hasNext() {
+        if(this.row==grid.getNumberOfRows() && this.column==grid.getNumberOfColumns()) {
             return false;
         }
+        return true;
+    }
 
     @Override
     public Cell next() {

app/src/main/java/util/RandomUtil.java

+package util;
+
+import java.util.Random;
+import java.util.List;
+
+public class RandomUtil {
+    private RandomUtil() {}
+
+    public static <T> T randomElement(T[] elements, Random random) {
+        int i = random.nextInt(elements.length);
+        return elements[i];
+    }
+
+    public static <T> T randomElement(List<T> elements, Random random) {
+        int i = random.nextInt(elements.size());
+        return elements.get(i);
+    }
+}