diff --git a/app/src/main/java/model/UniformColorGenerator.java b/app/src/main/java/model/UniformColorGenerator.java index 0289ee60ba53d308eda12f24a5390db2108071de..e729df30c2966983fddebbeeba33cd532bf3c1cb 100644 --- a/app/src/main/java/model/UniformColorGenerator.java +++ b/app/src/main/java/model/UniformColorGenerator.java @@ -5,7 +5,7 @@ import javafx.scene.paint.Color; public class UniformColorGenerator implements ColorGenerator{ private Color color; public UniformColorGenerator(Color color){ - this.color=color; + this.color=color; } public Color nextColor(Cell cell) { return this.color; diff --git a/app/src/main/java/model/UniformExceptOneGenerator.java b/app/src/main/java/model/UniformExceptOneGenerator.java index 0320414c72721150d1dc83c2dc97f748fad57efa..be7c32466188e3c2b3365c34bcff961b51f04303 100644 --- a/app/src/main/java/model/UniformExceptOneGenerator.java +++ b/app/src/main/java/model/UniformExceptOneGenerator.java @@ -2,14 +2,31 @@ package model; import javafx.scene.paint.Color; +import java.util.Arrays; +import java.util.List; +import java.util.Random; + public class UniformExceptOneGenerator implements ColorGenerator { + public Color uniformColor; + public Color exceptionColor; + public int chosen=0; public UniformExceptOneGenerator(Color uniformColor, Color exceptionColor) { - - + this.uniformColor=uniformColor; + this.exceptionColor=exceptionColor; } @Override public Color nextColor(Cell cell) { - return null; + if (chosen == 0) { + List<Color> colors = Arrays.asList(uniformColor, exceptionColor); + Random rand = new Random(); + Color randomColor = colors.get(rand.nextInt(colors.size())); + if (randomColor == exceptionColor) { + chosen += 1; + } + return randomColor; + } else { + return uniformColor; + } } }