diff --git a/app/src/main/java/model/CyclicColorGenerator.java b/app/src/main/java/model/CyclicColorGenerator.java index c442030a1b9ade59c8de044322b02b7935900460..d4f7dde8d8814cc638d22dfbd2bc5fadc7d39236 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; } }