From 239f9da32557200514d567ef0313039d171186c7 Mon Sep 17 00:00:00 2001
From: FARESSE Adam <adam.faresse@etu.univ-amu.fr>
Date: Mon, 19 Oct 2020 00:29:32 +0200
Subject: [PATCH] Update GameOfLifeGUI.java

---
 GameOfLifeGUI.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/GameOfLifeGUI.java b/GameOfLifeGUI.java
index c162ce0..4d15785 100644
--- a/GameOfLifeGUI.java
+++ b/GameOfLifeGUI.java
@@ -38,11 +38,15 @@ public class GameOfLifeGUI extends JFrame {
     public void update(Grid g){
         for (int x = 0; x < numberOfColumns; x++)
             for (int y = 0; y < numberOfRows; y++){
-		JLabel label = labelGrid[x][y];
-		if(g.getCell(x,y).isAlive())
-		    label.setForeground(Color.red);
-		else
-		    label.setForeground(Color.white);
+		    JLabel label = labelGrid[x][y];
+		    if(g.getCell(x,y).isAlive()) {
+         if ((g.getCell(x,y).getColor()).equals("Red")) {
+             label.setForeground(Color.red); }
+            else {
+		        label.setForeground(Color.blue);} }
+		        else {
+		            label.setForeground(Color.white);}
 	    }
     }
+
 }
-- 
GitLab