From 6cab93efd4c12e5c00010e70f4e9d753cebf8f44 Mon Sep 17 00:00:00 2001
From: Hatim Saidi <hatim.saidi@etu.univ-amu.fr>
Date: Thu, 10 Nov 2022 19:40:38 +0100
Subject: [PATCH] test
---
app/src/main/java/model/ArrayGrid.java | 13 ++++++++++++-
app/src/main/java/model/GrayGrid.java | 4 ++++
app/src/main/java/model/Grid.java | 1 +
app/src/main/java/model/UniformColorGenerator.java | 14 ++++++++++++++
app/src/test/java/model/ArrayGridTest.java | 2 --
5 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 app/src/main/java/model/UniformColorGenerator.java
diff --git a/app/src/main/java/model/ArrayGrid.java b/app/src/main/java/model/ArrayGrid.java
index aeb5070..0ed5056 100644
--- a/app/src/main/java/model/ArrayGrid.java
+++ b/app/src/main/java/model/ArrayGrid.java
@@ -16,7 +16,7 @@ public class ArrayGrid implements Grid{
else {
for (int j = 0; j < this.numberOfColumns; j++) {
for (int i = 0; i < this.numberOfRows; i++) {
- cells[numberOfRows][numberOfColumns] = new SquareCell();
+ cells[i][j] = new SquareCell();
}
}
}
@@ -33,5 +33,16 @@ public class ArrayGrid implements Grid{
return this.numberOfColumns;
}
+ public void color(ColorGenerator colorGenerator){
+ for (int j = 0; j < this.numberOfColumns; j++) {
+ for (int i = 0; i < this.numberOfRows; i++) {
+ SquareCell cell = new SquareCell();
+ cells[i][j].setColor(colorGenerator.nextColor(cell));
+ }
+ }
+
+
+ }
+
}
diff --git a/app/src/main/java/model/GrayGrid.java b/app/src/main/java/model/GrayGrid.java
index 02cb8ee..18e7f4d 100644
--- a/app/src/main/java/model/GrayGrid.java
+++ b/app/src/main/java/model/GrayGrid.java
@@ -40,4 +40,8 @@ public class GrayGrid implements Grid{
public int getNumberOfColumns() {
return numnberOfColumns;
}
+
+ public void color(ColorGenerator colorGenerator){
+
+ }
}
diff --git a/app/src/main/java/model/Grid.java b/app/src/main/java/model/Grid.java
index 64341b4..a387ca3 100644
--- a/app/src/main/java/model/Grid.java
+++ b/app/src/main/java/model/Grid.java
@@ -28,4 +28,5 @@ public interface Grid {
* The new color of {@code cell} is obtained by calling the method {@code nextColor}
*/
+ void color(ColorGenerator colorGenerator);
}
diff --git a/app/src/main/java/model/UniformColorGenerator.java b/app/src/main/java/model/UniformColorGenerator.java
new file mode 100644
index 0000000..ec65896
--- /dev/null
+++ b/app/src/main/java/model/UniformColorGenerator.java
@@ -0,0 +1,14 @@
+package model;
+
+import javafx.scene.paint.Color;
+
+public class UniformColorGenerator implements ColorGenerator{
+
+
+
+
+ public Color nextColor(Cell cell){
+ return cell.getColor();
+ }
+
+}
diff --git a/app/src/test/java/model/ArrayGridTest.java b/app/src/test/java/model/ArrayGridTest.java
index b63b2e3..139943b 100644
--- a/app/src/test/java/model/ArrayGridTest.java
+++ b/app/src/test/java/model/ArrayGridTest.java
@@ -11,8 +11,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
class ArrayGridTest {
- // TODO
- // uncomment
/*
private ArrayGrid arrayGridThreeFour;
private final ArrayGrid arrayGridTwoTwo = new ArrayGrid(2,2);
--
GitLab