From 51c56a9dc5b118b4231e402b600826f7436be88a Mon Sep 17 00:00:00 2001
From: EL GAOUAL Zaid <zaid.el-gaoual@etu.univ-amu.fr>
Date: Tue, 15 Nov 2022 16:40:01 +0100
Subject: [PATCH] Cyclic
---
app/src/main/java/model/CyclicColorGenerator.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/model/CyclicColorGenerator.java b/app/src/main/java/model/CyclicColorGenerator.java
index c442030..d4f7dde 100644
--- a/app/src/main/java/model/CyclicColorGenerator.java
+++ b/app/src/main/java/model/CyclicColorGenerator.java
@@ -3,8 +3,9 @@ import javafx.scene.paint.Color;
import java.util.List;
public class CyclicColorGenerator implements ColorGenerator {
- public ArrayGrid grid;
- public List<Color> colors;
+ private ArrayGrid grid;
+ private List<Color> colors;
+ private int i=0;
public CyclicColorGenerator(List<Color> colors) {
this.colors=colors;
@@ -12,6 +13,13 @@ public class CyclicColorGenerator implements ColorGenerator {
@Override
public Color nextColor(Cell cell) {
- return null;
+ Color color = colors.get(i);
+ if (i<colors.size()-1) {
+ i += 1;
+ }
+ else {
+ i=0;
+ }
+ return color;
}
}
--
GitLab