organizing

src/main/java/controller/Controller.java

@@ -12,9 +12,9 @@ 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.Board.Board;
+import model.Elements.ModelElement;
+import model.Board.FirefighterBoard;
 import util.Position;
 import view.Grid;
 import view.ViewElement;

src/main/java/model/Board.java → src/main/java/model/Board/Board.java

-package model;
+package model.Board;
 
-
-import model.Obstacle.Obstacle;
+import model.Elements.Fire;
+import model.Elements.Obstacle.Obstacle;
 import util.Position;
 
 import java.util.List;

src/main/java/model/FirefighterBoard.java → src/main/java/model/Board/FirefighterBoard.java

-package model;
+package model.Board;
 
-import model.Extinguisher.Cloud;
-import model.Extinguisher.Extinguisher;
-import model.Extinguisher.FireFighter;
-import model.Obstacle.Obstacle;
+
+import model.Elements.Extinguisher.Cloud;
+import model.Elements.Extinguisher.Extinguisher;
+import model.Elements.Extinguisher.FireFighter;
+import model.Elements.Fire;
+import model.Elements.ModelElement;
+import model.Elements.Obstacle.Obstacle;
 import util.Position;
 
 import java.util.*;

src/main/java/model/Extinguisher/Cloud.java → src/main/java/model/Elements/Extinguisher/Cloud.java

-package model.Extinguisher;
+package model.Elements.Extinguisher;
 
-import model.Board;
-
-import model.ModelElement;
+import model.Board.Board;
+import model.Elements.ModelElement;
 import util.Neighbour;
 import util.Position;
 

src/main/java/model/Extinguisher/Extinguisher.java → src/main/java/model/Elements/Extinguisher/Extinguisher.java

-package model.Extinguisher;
+package model.Elements.Extinguisher;
 
-import model.Board;
-import model.Element;
-import model.ModelElement;
+
+import model.Board.Board;
+import model.Elements.ModelElement;
 import util.Neighbour;
 import util.Position;
 import util.TargetStrategy;
 
 import java.util.List;
 
-public abstract class Extinguisher implements Element {
+public abstract class Extinguisher implements model.Elements.element {
     protected final TargetStrategy targetStrategy = new TargetStrategy();
     protected Neighbour neighbour;
 

src/main/java/model/Extinguisher/FireFighter.java → src/main/java/model/Elements/Extinguisher/FireFighter.java

-package model.Extinguisher;
+package model.Elements.Extinguisher;
 
-import model.Board;
-import model.ModelElement;
-import model.Obstacle.Mountain;
-import model.Obstacle.Obstacle;
+
+
+
+import model.Board.Board;
+import model.Elements.ModelElement;
+import model.Elements.Obstacle.Mountain;
+import model.Elements.Obstacle.Obstacle;
 import util.Neighbour;
 import util.Position;
 

src/main/java/model/Extinguisher/MotorizedFireFighter.java → src/main/java/model/Elements/Extinguisher/MotorizedFireFighter.java

-package model.Extinguisher;
+package model.Elements.Extinguisher;
 
-import model.Board;
 
-import model.ModelElement;
-import model.Obstacle.Mountain;
-import model.Obstacle.Obstacle;
+import model.Board.Board;
+import model.Elements.ModelElement;
+import model.Elements.Obstacle.Mountain;
+import model.Elements.Obstacle.Obstacle;
 import util.Neighbour;
 import util.Position;
 

src/main/java/model/Fire.java → src/main/java/model/Elements/Fire.java

-package model;
+package model.Elements;
 
-import model.Obstacle.Mountain;
-import model.Obstacle.Obstacle;
-import model.Obstacle.Road;
+
+import model.Board.Board;
+import model.Elements.Obstacle.Mountain;
+import model.Elements.Obstacle.Obstacle;
+import model.Elements.Obstacle.Road;
 import util.Neighbour;
 import util.Position;
 
 import java.util.*;
 
 
-public class Fire implements Element {
+public class Fire implements element {
 
     private Position position;
 

src/main/java/model/ModelElement.java → src/main/java/model/Elements/ModelElement.java

-package model;
-
-import model.Extinguisher.Cloud;
-import model.Extinguisher.Extinguisher;
-import model.Extinguisher.FireFighter;
-import model.Extinguisher.MotorizedFireFighter;
-import model.Obstacle.Mountain;
-import model.Obstacle.Obstacle;
-import model.Obstacle.Road;
-import model.Obstacle.Rocaille;
+package model.Elements;
+
+
+import model.Elements.Extinguisher.Cloud;
+import model.Elements.Extinguisher.Extinguisher;
+import model.Elements.Extinguisher.FireFighter;
+import model.Elements.Extinguisher.MotorizedFireFighter;
+import model.Elements.Obstacle.Mountain;
+import model.Elements.Obstacle.Obstacle;
+import model.Elements.Obstacle.Road;
+import model.Elements.Obstacle.Rocaille;
 import util.Position;
 
 
@@ -32,7 +33,7 @@ public enum ModelElement {
     return this.initialNumber;
   }
 
-  public Element getModelElementClass(Position position){
+  public element getModelElementClass(Position position){
 
     return switch (this){
       case FIRE -> new Fire(position);

src/main/java/model/Obstacle/Mountain.java → src/main/java/model/Elements/Obstacle/Mountain.java

-package model.Obstacle;
+package model.Elements.Obstacle;
 
-import model.ModelElement;
+
+import model.Elements.ModelElement;
 
 import util.Position;
 

src/main/java/model/Obstacle/Obstacle.java → src/main/java/model/Elements/Obstacle/Obstacle.java

-package model.Obstacle;
+package model.Elements.Obstacle;
 
-import model.Board;
-import model.Element;
-import model.ModelElement;
+
+import model.Board.Board;
+import model.Elements.ModelElement;
 import util.Position;
 
 import java.util.List;
 
-public abstract class Obstacle implements Element {
+public abstract class Obstacle implements model.Elements.element {
     protected ModelElement element;
     protected final Position position;
     public Obstacle(Position position){

src/main/java/model/Obstacle/Road.java → src/main/java/model/Elements/Obstacle/Road.java

-package model.Obstacle;
+package model.Elements.Obstacle;
 
-import model.ModelElement;
+
+import model.Elements.ModelElement;
 
 import util.Position;
 

src/main/java/model/Obstacle/Rocaille.java → src/main/java/model/Elements/Obstacle/Rocaille.java

-package model.Obstacle;
+package model.Elements.Obstacle;
 
-import model.ModelElement;
+
+
+import model.Elements.ModelElement;
 
 import util.Position;
 

src/main/java/model/Element.java → src/main/java/model/Elements/element.java

-package model;
+package model.Elements;
 
+import model.Board.Board;
 import util.Position;
 
 import java.util.List;
 
-public interface Element {
+public interface element {
 
 
 

src/main/java/util/Neighbour.java

 package util;
 
-import model.Board;
+import model.Board.Board;
 
 import java.util.*;
 

src/main/java/util/Position.java

 package util;
 
-import model.Board;
-import model.FirefighterBoard;
-
-import java.util.Random;
-
 public record Position(int row, int column) {
 
 

src/test/java/model/FirefighterBoardTest.java

 package model;
 
+import model.Board.Board;
+import model.Board.FirefighterBoard;
+import model.Elements.ModelElement;
 import org.junit.jupiter.api.Test;
 import util.Position;