From 836cc7cd4391e3e1462aa44c29f2d0d38f85082c Mon Sep 17 00:00:00 2001
From: r20004714 <andrianinarisaina-cy.RAKOTOARISOA@etu.univ-amu.fr>
Date: Mon, 14 Nov 2022 23:01:03 +0100
Subject: [PATCH] =?UTF-8?q?T=C3=A2che=204=20(7.5)=20:=20Cr=C3=A9ation=20de?=
=?UTF-8?q?=20la=20classe=20RandomColorGenerator,=20avec=20son=20cosntruct?=
=?UTF-8?q?eur=20et=20la=20m=C3=A9thode=20"Color=20nextcolor(Cell=20cell)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/model/RandomColorGenerator.java | 26 +++++++++++++++++++
app/src/main/java/util/RandomUtil.java | 5 ++--
2 files changed, 29 insertions(+), 2 deletions(-)
create mode 100644 app/src/main/java/model/RandomColorGenerator.java
diff --git a/app/src/main/java/model/RandomColorGenerator.java b/app/src/main/java/model/RandomColorGenerator.java
new file mode 100644
index 0000000..1f6ee36
--- /dev/null
+++ b/app/src/main/java/model/RandomColorGenerator.java
@@ -0,0 +1,26 @@
+package model;
+import javafx.scene.paint.Color;
+import util.RandomUtil;
+
+import java.util.List;
+import java.util.Random;
+
+public class RandomColorGenerator implements ColorGenerator {
+
+ List<Color> colors ;
+ Random randomGenerator ;
+
+ //Constructeur de la classe
+ public void RandcomColorGenerator(List<Color> colors, Random randomGenerator) {
+ this.colors = colors ;
+ this.randomGenerator = randomGenerator ;
+ }
+
+ //Renvoie une couleur tirée au hasard dans la liste "colors"
+ @Override
+ public Color nextColor(Cell cell) {
+ RandomUtil RandomColor = new RandomUtil();
+ return RandomColor.randomElement(this.colors, this.randomGenerator);
+ }
+
+}
diff --git a/app/src/main/java/util/RandomUtil.java b/app/src/main/java/util/RandomUtil.java
index 078341c..c8a3333 100644
--- a/app/src/main/java/util/RandomUtil.java
+++ b/app/src/main/java/util/RandomUtil.java
@@ -1,4 +1,6 @@
package util;
+import javafx.scene.paint.Color;
+
import java.util.List;
import java.util.Random;
public class RandomUtil {
@@ -9,7 +11,7 @@ public class RandomUtil {
public void RandomUtil() {}
//Constructeur
- private RandomUtil() {};
+ public RandomUtil() {};
//Méthode demandée par l'exercice : concerne un tableau
public static <T> T randomElement(T[] elements, Random random) {
@@ -22,6 +24,5 @@ public class RandomUtil {
}
-
}
--
GitLab