From 72a49489cdc061a4f8ec437631a608f39fc15a51 Mon Sep 17 00:00:00 2001
From: CHERCHEM Sarah <sarah.cherchem@etu.univ-amu.fr>
Date: Thu, 28 Nov 2024 15:11:16 +0100
Subject: [PATCH] Controller : change of getViewElement method

---
 .../java/main/controller/Controller.class     | Bin 6838 -> 6899 bytes
 src/main/java/controller/Controller.java      |  18 +++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/classes/java/main/controller/Controller.class b/build/classes/java/main/controller/Controller.class
index 54935a9eb3026ff1122cd50fbbcce457729b381e..d804fd9ea7c85c723b33fd680353024a4e86a2c5 100644
GIT binary patch
delta 2526
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

delta 2453
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

diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index e3e7518..25585b4 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -12,9 +12,7 @@ import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
 import javafx.util.Duration;
 import javafx.util.Pair;
-import model.Board;
-import model.ModelElement;
-import model.FirefighterBoard;
+import model.*;
 import util.Position;
 import view.Grid;
 import view.ViewElement;
@@ -80,17 +78,19 @@ public class Controller {
     grid.repaint(viewElements);
     updateGenerationLabel(board.getBehavior().stepNumber());
   }
-
   private ViewElement getViewElement(List<ModelElement> squareState) {
-    if(squareState.contains(ModelElement.FIREFIGHTER)){
-      return ViewElement.FIREFIGHTER;
-    }
-    if (squareState.contains(ModelElement.FIRE)){
-      return ViewElement.FIRE;
+    for (ModelElement element : squareState) {
+      if (element instanceof FireFighter) {
+        return ViewElement.FIREFIGHTER;
+      }
+      if (element instanceof Fire) {
+        return ViewElement.FIRE;
+      }
     }
     return ViewElement.EMPTY;
   }
 
+
   private void initializeTimeline() {
     Duration duration = new Duration(Controller.PERIOD_IN_MILLISECONDS);
     EventHandler<ActionEvent> eventHandler =
-- 
GitLab