mise en place d'icones

src/main/java/controller/Controller.java

@@ -94,12 +94,8 @@ public class Controller {
   private ViewElement getViewElement(Square square) {
     if (!square.getEntities().isEmpty()) {
       for (Entity entity : square.getEntities()) {
-        if (entity instanceof Cloud) {
-          return new ViewElement(((Cloud) entity).getImage());
-        }else{
 
-        }
-        // Ajoutez ici des cas similaires pour d'autres entités comme Fire, FireFighter, etc.
+          return new ViewElement(entity.getImage());
       }
     }
     return new ViewElement(square.getViewColor());

src/main/java/model/EmptySquare.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javafx.scene.paint.Color;
+import model.firefighterscenario.Cloud;
 import util.Position;
 
 public class EmptySquare implements Entity {
@@ -12,6 +13,15 @@ public class EmptySquare implements Entity {
     private final Color viewColor = Color.WHITE;
     private int age;
     private final int priotity = -1;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/img.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public EmptySquare(Position p) {
         this.position = p;
@@ -61,4 +71,9 @@ public class EmptySquare implements Entity {
     public int getPriority(){
         return this.priotity;
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
 }

src/main/java/model/Entity.java

 package model;
-
+import javafx.scene.image.Image;
 import java.util.List;
 
 import javafx.scene.paint.Color;
@@ -21,4 +21,5 @@ public interface Entity {
     public void incrementAge();
     public Color getViewColor();
     public int getPriority();
+    public Image getImage();
 }

src/main/java/model/Road.java

-package model;
+package model.firefighterscenario;
+
+import java.util.List;
 
 import javafx.scene.paint.Color;
+import model.Board;
+import model.Entity;
+import model.Square;
 import util.Position;
 
-import java.util.List;
-
 public class Road implements Entity{
     private int age;
+    private final int PRIORITY = 0;
+    private final Color VIEW_COLOR = Color.BLACK;
     private Position position;
-    private final Color viewColor = Color.GREY;
-    private final int priority = 0;
+    private static javafx.scene.image.Image cloudImage;
 
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/route.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
+    public Road(Position position){
+        this.position = position;
+    }
     @Override
     public List<Position> nextTurn(Board<Square> board) {
         return List.of();
@@ -19,36 +33,42 @@ public class Road implements Entity{
 
     @Override
     public Position getPosition() {
-        return null;
+        return this.position;
     }
 
     @Override
     public void setPosition(Position p) {
-
+        this.position = p;
     }
 
     @Override
     public int getAge() {
-        return 0;
+        return age;
     }
 
     @Override
     public void setAge(int age) {
-
+        this.age = age;
     }
 
     @Override
     public void incrementAge() {
-
+        this.age = age + 1;
     }
 
     @Override
     public Color getViewColor() {
-        return null;
+        return this.VIEW_COLOR;
     }
 
     @Override
     public int getPriority() {
-        return 0;
+        return this.PRIORITY;
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
+
 }

src/main/java/model/firefighterscenario/AirTanker.java

@@ -18,6 +18,15 @@ public class AirTanker implements Entity{
     private int age;
     private Position position;
     private int priority = 3;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/avion.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public AirTanker(Position position, Board<Square> b, int age) {
         this.age = age;
@@ -163,5 +172,8 @@ public class AirTanker implements Entity{
         return Objects.hash(position, age);
     }
 
-
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
 }

src/main/java/model/firefighterscenario/Cloud.java

@@ -21,7 +21,7 @@ public class Cloud implements Entity{
     
     static {
         try {
-            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/nuage.png").toExternalForm());
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/nuage.png").toExternalForm());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -115,7 +115,7 @@ public class Cloud implements Entity{
         return this.priority;
     }
 
-
+    @Override
     public javafx.scene.image.Image getImage() {
         return cloudImage;
     }

src/main/java/model/firefighterscenario/Fire.java

@@ -18,6 +18,15 @@ public class Fire implements Entity {
     private final Color viewColor = Color.RED;
     private int age;
     private final int priority = 1;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/flamme.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Fire(Position position) {
         this.position = position;
@@ -132,4 +141,9 @@ public class Fire implements Entity {
         return Objects.hash(position, age);
     }
 
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
+
 }

src/main/java/model/firefighterscenario/FireFighter.java

@@ -19,6 +19,15 @@ public class FireFighter implements Entity {
     private final Color viewColor = Color.BLUE;
     private final int priority = 1;
     protected List<Position> lastThreePosition;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/sapeur-pompier.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public FireFighter(Position position, Board<Square> b) {
         this.position = position;
@@ -220,4 +229,8 @@ public class FireFighter implements Entity {
     }
     public int getPriority(){ return this.priority;}
 
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
 }

src/main/java/model/firefighterscenario/FireFighterScenario.java

@@ -26,6 +26,7 @@ public class FireFighterScenario extends EntityScenario implements Board<Square>
 
   private Map<EntityFactory, Integer> initialMap;
 
+
   public FireFighterScenario(int columns, int rows) {
     this.matrix = new Matrix<Square>(columns, rows);
     initScenario(matrix);

src/main/java/model/firefighterscenario/MotorizedFireFighter.java

@@ -11,6 +11,16 @@ import util.PositionUtil;
 
 public class MotorizedFireFighter extends FireFighter {
     private final Color viewColor = Color.CYAN;
+    private static javafx.scene.image.Image cloudImage;
+
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/camion.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public MotorizedFireFighter(Position position, Board<Square> b) {
         super(position, b);
@@ -109,4 +119,8 @@ public class MotorizedFireFighter extends FireFighter {
         lastThreePosition.add(this.getPosition());
     }
 
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
 }
\ No newline at end of file

src/main/java/model/firefighterscenario/Mountain.java

@@ -13,6 +13,15 @@ public class Mountain implements Entity{
     Position position;
     private int age;
     private final Color viewColor = Color.CHOCOLATE;
+    private static javafx.scene.image.Image cloudImage;
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/montagne.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Mountain(Position p ){
         this.position = p;
@@ -64,4 +73,9 @@ public class Mountain implements Entity{
     public int getPriority() {
         return this.priority;
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
 }

src/main/java/model/firefighterscenario/Road.java

-package model.firefighterscenario;
-
-import java.util.List;
-
-import javafx.scene.paint.Color;
-import model.Board;
-import model.Entity;
-import model.Square;
-import util.Position;
-
-public class Road implements Entity{
-    private int age;
-    private final int PRIORITY = 0;
-    private final Color VIEW_COLOR = Color.BLACK;
-    private Position position;
-
-    public Road(Position position){
-        this.position = position;
-    }
-    @Override
-    public List<Position> nextTurn(Board<Square> board) {
-        return List.of();
-    }
-
-    @Override
-    public Position getPosition() {
-        return this.position;
-    }
-
-    @Override
-    public void setPosition(Position p) {
-        this.position = p;
-    }
-
-    @Override
-    public int getAge() {
-        return age;
-    }
-
-    @Override
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    @Override
-    public void incrementAge() {
-        this.age = age + 1;
-    }
-
-    @Override
-    public Color getViewColor() {
-        return this.VIEW_COLOR;
-    }
-
-    @Override
-    public int getPriority() {
-        return this.PRIORITY;
-    }
-    
-}

src/main/java/model/firefighterscenario/Rockery.java

@@ -14,6 +14,16 @@ public class Rockery implements Entity{
     private int age;
     private int burn;
     private final Color viewColor = Color.LIMEGREEN;
+    private static javafx.scene.image.Image cloudImage;
+
+
+    static {
+        try {
+            cloudImage = new javafx.scene.image.Image(Cloud.class.getResource("/view/icons/rochers.png").toExternalForm());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     public Rockery(Position p ){
         this.position = p;
@@ -78,4 +88,9 @@ public class Rockery implements Entity{
     public void resetBurn() {
         this.burn = 0;
     }
+
+    @Override
+    public javafx.scene.image.Image getImage() {
+        return cloudImage;
+    }
 }