From 1abc5c20facf65e49e17e94cc894252c577db93d Mon Sep 17 00:00:00 2001
From: dragapsy <elghaoutiayman20@gmail.com>
Date: Fri, 18 Nov 2022 00:23:13 +0100
Subject: [PATCH] Corection de la methode Color nextColor(Cell cell).
---
app/src/main/java/model/SquareCell.java | 2 +-
.../java/model/UniformColorGenerator.java | 22 +++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/model/SquareCell.java b/app/src/main/java/model/SquareCell.java
index f8ddaff..87656a1 100644
--- a/app/src/main/java/model/SquareCell.java
+++ b/app/src/main/java/model/SquareCell.java
@@ -23,7 +23,7 @@ public class SquareCell extends AbstractCell{
}
public SquareCell(Color color,List<Cell>neighbours){
SquareCell Cell=new SquareCell(color);
- setNeighbours( neighbours);
+ setNeighbours(neighbours);
}
diff --git a/app/src/main/java/model/UniformColorGenerator.java b/app/src/main/java/model/UniformColorGenerator.java
index 8f407e5..096ba3b 100644
--- a/app/src/main/java/model/UniformColorGenerator.java
+++ b/app/src/main/java/model/UniformColorGenerator.java
@@ -6,20 +6,24 @@ import java.util.Random;
public class UniformColorGenerator implements ColorGenerator{
+ private Color color;
+
//code of color generator found on stackOverFlow;
// link : https://stackoverflow.com/questions/4246351/creating-random-colour-in-java
// but the color constructor with 3 parameter is not public, so I checked in the documentation of Color, and
// I found that there is a constructor with 4 parameter that is public since java 8;
// Link of the doc : https://docs.oracle.com/javase/8/javafx/api/javafx/scene/paint/Color.html
@Override
- public Color nextColor(Cell cell) {
- Random rand = new Random();
- double red = rand.nextFloat();
- double green = rand.nextFloat();
- double blue = rand.nextFloat();
- double opacity=rand.nextFloat();
- Color randomColor = new Color(red, green, blue,opacity);
- cell.setColor(randomColor);
- return randomColor;
+ public Color nextColor(Cell cell) {
+// Random rand = new Random();
+// double red = rand.nextFloat();
+// double green = rand.nextFloat();
+// double blue = rand.nextFloat();
+// double opacity=rand.nextFloat();
+// Color randomColor = new Color(red, green, blue,opacity);
+// cell.setColor(randomColor);
+// return randomColor;
+ return this.color;
}
+
}
--
GitLab