From fe63ef3b2266b317ebd771d628669854c879b20c Mon Sep 17 00:00:00 2001
From: EL GAOUAL Zaid <zaid.el-gaoual@etu.univ-amu.fr>
Date: Tue, 15 Nov 2022 16:32:14 +0100
Subject: [PATCH] ColorGenerator
---
.../java/model/UniformColorGenerator.java | 2 +-
.../java/model/UniformExceptOneGenerator.java | 23 ++++++++++++++++---
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/model/UniformColorGenerator.java b/app/src/main/java/model/UniformColorGenerator.java
index 0289ee6..e729df3 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 0320414..be7c324 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;
+ }
}
}
--
GitLab