From 40252f8534f176be153fd6b7f85e080965077d95 Mon Sep 17 00:00:00 2001 From: m23022217 <ilyas.maazouz@etu.univ-amu.fr> Date: Mon, 13 Nov 2023 14:46:56 +0100 Subject: [PATCH] p^$p^$ --- src/main/java/newmodel/Extinguisher.java | 2 ++ src/main/java/newmodel/Fboard.java | 6 ++++-- src/main/java/newmodel/Fire.java | 7 +++++++ src/main/java/newmodel/FireFighter.java | 5 +++++ src/main/java/newmodel/FireManager.java | 2 ++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/newmodel/Extinguisher.java b/src/main/java/newmodel/Extinguisher.java index 41c9ca3..7901754 100644 --- a/src/main/java/newmodel/Extinguisher.java +++ b/src/main/java/newmodel/Extinguisher.java @@ -11,4 +11,6 @@ public interface Extinguisher { public void setState(); public String getState(); + public void initialize(); + } diff --git a/src/main/java/newmodel/Fboard.java b/src/main/java/newmodel/Fboard.java index 0376767..5401262 100644 --- a/src/main/java/newmodel/Fboard.java +++ b/src/main/java/newmodel/Fboard.java @@ -54,9 +54,11 @@ public class Fboard { } public void initializeElements() { for (FireManager f : fire) { - f.initialise + f.initialize(); + } + for(Extinguisher e: extinguishe) { + e.initialize(); } - diff --git a/src/main/java/newmodel/Fire.java b/src/main/java/newmodel/Fire.java index fc7504e..8326cb2 100644 --- a/src/main/java/newmodel/Fire.java +++ b/src/main/java/newmodel/Fire.java @@ -27,4 +27,11 @@ public class Fire implements FireManager { public String getState() { return null; } + + @Override + public void initialize() { + + } + + } diff --git a/src/main/java/newmodel/FireFighter.java b/src/main/java/newmodel/FireFighter.java index dbc746e..a73e3e4 100644 --- a/src/main/java/newmodel/FireFighter.java +++ b/src/main/java/newmodel/FireFighter.java @@ -26,4 +26,9 @@ public class FireFighter implements Extinguisher { public String getState() { return null; } + + @Override + public void initialize() { + + } } diff --git a/src/main/java/newmodel/FireManager.java b/src/main/java/newmodel/FireManager.java index 395b1b1..e7fc769 100644 --- a/src/main/java/newmodel/FireManager.java +++ b/src/main/java/newmodel/FireManager.java @@ -9,4 +9,6 @@ public interface FireManager { public List<Position> updateFire(Fboard board); public void setState(); public String getState(); + + public void initialize(); } -- GitLab