Controller : change of getViewElement method

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)){
+    for (ModelElement element : squareState) {
+      if (element instanceof FireFighter) {
         return ViewElement.FIREFIGHTER;
       }
-    if (squareState.contains(ModelElement.FIRE)){
+      if (element instanceof Fire) {
         return ViewElement.FIRE;
       }
+    }
     return ViewElement.EMPTY;
   }
 
+
   private void initializeTimeline() {
     Duration duration = new Duration(Controller.PERIOD_IN_MILLISECONDS);
     EventHandler<ActionEvent> eventHandler =