xcvxdfsdf

src/main/java/newmodel/Extinguisher.java

 package newmodel;
-
 import newmodel.Fboard;
 import util.Position;
-
 import java.util.List;
+public abstract class Extinguisher implements item {
 
-public interface Extinguisher {
-    public List<Position> updateExtinguisher();
-    public void extinguish(Position position);
-    public void setState();
-    public String getState();
+        public abstract List<Position> update();
+        public abstract void extinguish(Position position);
+        public abstract void setState();
+        public abstract String getState();
 
-    public void initialize();
-    public List<Position> getPositions();
+        public abstract void initialize();
+        public abstract List<Position> getPositions();
+
+    }
 
 }

src/main/java/newmodel/Fboard.java

@@ -10,15 +10,13 @@ public class Fboard {
     protected final int columnCount;
     protected final int rowCount;
     private int step = 0;
-    private FireManager fire;
-    private List<Extinguisher> extinguishers;
 
-    public Fboard(int columnCount, int rowCount, Fire fire ,List<Extinguisher> Extinguishers) {
+    private List<item> items;
+
+    public Fboard(int columnCount, int rowCount, Fire fire ,List<item> items) {
         this.columnCount = columnCount;
         this.rowCount = rowCount;
-        this.extinguishers=new ArrayList<>();
-        this.fire=fire;
-        extinguishers.addAll(Extinguishers);
+        this.items=items;
         }
 
     public int rowCount() {
@@ -31,10 +29,8 @@ public class Fboard {
 
     public List<Position> updateToNextGeneration() {
         List<Position> result = new ArrayList<>();
-           result.addAll(fire.updateFire());
-        for(Extinguisher e : extinguishers) {
-            result.addAll(e.updateExtinguisher());
-        }
+        for(item item : items)
+           result.addAll(item.update());
         step++;
         return result;
     }
@@ -48,7 +44,7 @@ public class Fboard {
     }
     public void initializeElements() {
         fire.initialize();
-        for(Extinguisher e: extinguishers) {
+        for(item e: extinguishers) {
             e.initialize();
         }
     }

src/main/java/newmodel/Fire.java

@@ -4,7 +4,7 @@ import util.Position;
 
 import java.util.*;
 
-public class Fire implements FireManager {
+public class Fire extends FireManager {
 
     private final int initialFireCount;
 
@@ -19,7 +19,7 @@ public class Fire implements FireManager {
     }
 
 
-    public List<Position> updateFire() {
+    public List<Position> update() {
         List<Position> result = new ArrayList<>();
         if (board.getStep() % 2 == 0) {
             List<Position> newFirePositions = new ArrayList<>();
@@ -37,12 +37,11 @@ public class Fire implements FireManager {
         state="Fire";
     }
 
-    @Override
+
     public String getState() {
         return state;
     }
 
-    @Override
     public void initialize() {
         firePositions = new HashSet<>();
         for (int index = 0; index < initialFireCount; index++)

src/main/java/newmodel/FireFighter.java

@@ -17,7 +17,7 @@ public class FireFighter implements Extinguisher {
     }
 
 
-    public List<Position> updateExtinguisher() {
+    public List<Position> update() {
             List<Position> result = new ArrayList<>();
             List<Position> firefighterNewPositions = new ArrayList<>();
             for (Position firefighterPosition : firefighterPositions) {

src/main/java/newmodel/FireManager.java

 package newmodel;
 
-import newmodel.Fboard;
 import util.Position;
 
 import java.util.List;
 import java.util.Set;
 
-public interface FireManager {
-    public List<Position> updateFire();
-    public void setState();
-    public String getState();
-    public void extinguish(Position position);
-    public void initialize();
-
-    public Set<Position> getFirepositions();
-
-    public boolean containsFire(Position position);
+public abstract class FireManager implements item{
+    public abstract List<Position> update();
+    public abstract void extinguish(Position position);
+    public abstract Set<Position> getFirepositions();
+    public abstract boolean containsFire(Position position);
+    public abstract void setState();
+    public abstract String getState();
 }

src/main/java/newmodel/MotoFireFighter.java

 package newmodel;
 
-public class MotoFireFighter {
+import util.Position;
+
+import java.util.List;
+
+public class MotoFireFighter extends Extinguisher {
+    @Override
+    public List<Position> update() {
+        return null;
+    }
+
+    @Override
+    public void extinguish(Position position) {
+
+    }
+
+    @Override
+    public void setState() {
+
+    }
+
+    @Override
+    public String getState() {
+        return null;
+    }
+
+    @Override
+    public void initialize() {
+
+    }
+
+    @Override
+    public List<Position> getPositions() {
+        return null;
+    }
 }

src/main/java/newmodel/Nuages.java

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-public class Nuages implements Extinguisher{
+public class Nuages extends Extinguisher{
     private String state;
     private final Fboard board;
     private List<Position> nuagesPositions;
@@ -19,8 +19,20 @@ public class Nuages implements Extinguisher{
         this.board=b;
     }
 
-    public List<Position> updateExtinguisher() {
+    public List<Position> update() {
+        List<Position> result = new ArrayList<>();
+        List<Position> NuagesNewPositions = new ArrayList<>();
+        for (Position NuageNewPosition: nuagesPositions) {
+            NuagesNewPositions.add(randomPosition());
+        }
+            for(Position nuage : NuagesNewPositions) {
+                extinguish(nuage);
+            }
+            result.addAll(nuagesPositions);
+            result.addAll(NuagesNewPositions);
 
+        nuagesPositions = NuagesNewPositions;
+        return result;
     }
 
 
@@ -48,7 +60,7 @@ public class Nuages implements Extinguisher{
 
 
     public List<Position> getPositions() {
-        return null;
+        return this.nuagesPositions;
     }
     private Position randomPosition() {
         return new Position(randomGenerator.nextInt(board.rowCount), randomGenerator.nextInt(board.columnCount));

src/main/java/newmodel/Pompiers.java

+package newmodel;
+
+import util.Position;
+
+import java.util.List;
+import java.util.Random;
+
+
+public class Pompiers extends Extinguisher{
+    private String state;
+    private final Fboard board;
+    private List<Position> Pompiers;
+    private final Random randomGenerator = new Random();
+
+    private final int initialPompiersCount;
+
+
+    public Pompiers(int count,Fboard b){
+        this.board=b;
+        this.initialPompiersCount=count;
+
+    }
+
+    public List<Position> updateExtinguisher() {
+        return null;
+    }
+
+
+    public void extinguish(Position position) {
+
+    }
+
+
+    public void setState() {
+        this.state="Pompiers";
+    }
+
+
+    public String getState() {
+        return state;
+    }
+
+
+    public void initialize() {
+
+    }
+
+
+    public List<Position> getPositions() {
+        return Pompiers;
+    }
+}

src/main/java/newmodel/item.java

+package newmodel;
+
+import util.Position;
+
+import java.util.List;
+
+public interface item {
+    public List<Position> update();
+    void setState();
+    String getState();
+}