From 6fb5b806f061af8552985253e3cb776412aa0469 Mon Sep 17 00:00:00 2001
From: MEHDI <mehdi.belhachemi@etu-univ.amu.fr>
Date: Sun, 24 Nov 2024 21:20:48 +0100
Subject: [PATCH] organizing

---
 src/main/java/controller/Controller.java      |  6 ++---
 src/main/java/model/{ => Board}/Board.java    |  6 ++---
 .../model/{ => Board}/FirefighterBoard.java   | 13 +++++++----
 .../{ => Elements}/Extinguisher/Cloud.java    |  7 +++---
 .../Extinguisher/Extinguisher.java            | 10 ++++----
 .../Extinguisher/FireFighter.java             | 13 +++++++----
 .../Extinguisher/MotorizedFireFighter.java    | 10 ++++----
 src/main/java/model/{ => Elements}/Fire.java  | 12 ++++++----
 .../model/{ => Elements}/ModelElement.java    | 23 ++++++++++---------
 .../{ => Elements}/Obstacle/Mountain.java     |  5 ++--
 .../{ => Elements}/Obstacle/Obstacle.java     | 10 ++++----
 .../model/{ => Elements}/Obstacle/Road.java   |  5 ++--
 .../{ => Elements}/Obstacle/Rocaille.java     |  6 +++--
 .../{Element.java => Elements/element.java}   |  5 ++--
 src/main/java/util/Neighbour.java             |  2 +-
 src/main/java/util/Position.java              |  5 ----
 src/test/java/model/FirefighterBoardTest.java |  3 +++
 17 files changed, 76 insertions(+), 65 deletions(-)
 rename src/main/java/model/{ => Board}/Board.java (94%)
 rename src/main/java/model/{ => Board}/FirefighterBoard.java (93%)
 rename src/main/java/model/{ => Elements}/Extinguisher/Cloud.java (89%)
 rename src/main/java/model/{ => Elements}/Extinguisher/Extinguisher.java (83%)
 rename src/main/java/model/{ => Elements}/Extinguisher/FireFighter.java (87%)
 rename src/main/java/model/{ => Elements}/Extinguisher/MotorizedFireFighter.java (89%)
 rename src/main/java/model/{ => Elements}/Fire.java (91%)
 rename src/main/java/model/{ => Elements}/ModelElement.java (70%)
 rename src/main/java/model/{ => Elements}/Obstacle/Mountain.java (72%)
 rename src/main/java/model/{ => Elements}/Obstacle/Obstacle.java (75%)
 rename src/main/java/model/{ => Elements}/Obstacle/Road.java (71%)
 rename src/main/java/model/{ => Elements}/Obstacle/Rocaille.java (72%)
 rename src/main/java/model/{Element.java => Elements/element.java} (70%)

diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index f1fa004..d6b3a16 100644
--- a/src/main/java/controller/Controller.java
+++ b/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;
diff --git a/src/main/java/model/Board.java b/src/main/java/model/Board/Board.java
similarity index 94%
rename from src/main/java/model/Board.java
rename to src/main/java/model/Board/Board.java
index 9757c25..a0b89d8 100644
--- a/src/main/java/model/Board.java
+++ b/src/main/java/model/Board/Board.java
@@ -1,7 +1,7 @@
-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;
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/Board/FirefighterBoard.java
similarity index 93%
rename from src/main/java/model/FirefighterBoard.java
rename to src/main/java/model/Board/FirefighterBoard.java
index e5ba2ba..55fe8db 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/Board/FirefighterBoard.java
@@ -1,9 +1,12 @@
-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.*;
diff --git a/src/main/java/model/Extinguisher/Cloud.java b/src/main/java/model/Elements/Extinguisher/Cloud.java
similarity index 89%
rename from src/main/java/model/Extinguisher/Cloud.java
rename to src/main/java/model/Elements/Extinguisher/Cloud.java
index 51daffc..d097e0f 100644
--- a/src/main/java/model/Extinguisher/Cloud.java
+++ b/src/main/java/model/Elements/Extinguisher/Cloud.java
@@ -1,8 +1,7 @@
-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;
 
diff --git a/src/main/java/model/Extinguisher/Extinguisher.java b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
similarity index 83%
rename from src/main/java/model/Extinguisher/Extinguisher.java
rename to src/main/java/model/Elements/Extinguisher/Extinguisher.java
index 5326fa0..13fe6e5 100644
--- a/src/main/java/model/Extinguisher/Extinguisher.java
+++ b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
@@ -1,15 +1,15 @@
-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;
 
diff --git a/src/main/java/model/Extinguisher/FireFighter.java b/src/main/java/model/Elements/Extinguisher/FireFighter.java
similarity index 87%
rename from src/main/java/model/Extinguisher/FireFighter.java
rename to src/main/java/model/Elements/Extinguisher/FireFighter.java
index 50d329f..6c6080f 100644
--- a/src/main/java/model/Extinguisher/FireFighter.java
+++ b/src/main/java/model/Elements/Extinguisher/FireFighter.java
@@ -1,9 +1,12 @@
-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;
 
diff --git a/src/main/java/model/Extinguisher/MotorizedFireFighter.java b/src/main/java/model/Elements/Extinguisher/MotorizedFireFighter.java
similarity index 89%
rename from src/main/java/model/Extinguisher/MotorizedFireFighter.java
rename to src/main/java/model/Elements/Extinguisher/MotorizedFireFighter.java
index 12df7c9..18c1fd2 100644
--- a/src/main/java/model/Extinguisher/MotorizedFireFighter.java
+++ b/src/main/java/model/Elements/Extinguisher/MotorizedFireFighter.java
@@ -1,10 +1,10 @@
-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;
 
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Elements/Fire.java
similarity index 91%
rename from src/main/java/model/Fire.java
rename to src/main/java/model/Elements/Fire.java
index 95ba714..7de2d84 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Elements/Fire.java
@@ -1,15 +1,17 @@
-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;
 
diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/Elements/ModelElement.java
similarity index 70%
rename from src/main/java/model/ModelElement.java
rename to src/main/java/model/Elements/ModelElement.java
index 8d3aee5..0d7d50e 100644
--- a/src/main/java/model/ModelElement.java
+++ b/src/main/java/model/Elements/ModelElement.java
@@ -1,13 +1,14 @@
-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);
diff --git a/src/main/java/model/Obstacle/Mountain.java b/src/main/java/model/Elements/Obstacle/Mountain.java
similarity index 72%
rename from src/main/java/model/Obstacle/Mountain.java
rename to src/main/java/model/Elements/Obstacle/Mountain.java
index cd9db1d..301c9ea 100644
--- a/src/main/java/model/Obstacle/Mountain.java
+++ b/src/main/java/model/Elements/Obstacle/Mountain.java
@@ -1,6 +1,7 @@
-package model.Obstacle;
+package model.Elements.Obstacle;
 
-import model.ModelElement;
+
+import model.Elements.ModelElement;
 
 import util.Position;
 
diff --git a/src/main/java/model/Obstacle/Obstacle.java b/src/main/java/model/Elements/Obstacle/Obstacle.java
similarity index 75%
rename from src/main/java/model/Obstacle/Obstacle.java
rename to src/main/java/model/Elements/Obstacle/Obstacle.java
index 0000e54..5ad4b2f 100644
--- a/src/main/java/model/Obstacle/Obstacle.java
+++ b/src/main/java/model/Elements/Obstacle/Obstacle.java
@@ -1,13 +1,13 @@
-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){
diff --git a/src/main/java/model/Obstacle/Road.java b/src/main/java/model/Elements/Obstacle/Road.java
similarity index 71%
rename from src/main/java/model/Obstacle/Road.java
rename to src/main/java/model/Elements/Obstacle/Road.java
index 939581d..121cb96 100644
--- a/src/main/java/model/Obstacle/Road.java
+++ b/src/main/java/model/Elements/Obstacle/Road.java
@@ -1,6 +1,7 @@
-package model.Obstacle;
+package model.Elements.Obstacle;
 
-import model.ModelElement;
+
+import model.Elements.ModelElement;
 
 import util.Position;
 
diff --git a/src/main/java/model/Obstacle/Rocaille.java b/src/main/java/model/Elements/Obstacle/Rocaille.java
similarity index 72%
rename from src/main/java/model/Obstacle/Rocaille.java
rename to src/main/java/model/Elements/Obstacle/Rocaille.java
index 0ce657e..c7fe41f 100644
--- a/src/main/java/model/Obstacle/Rocaille.java
+++ b/src/main/java/model/Elements/Obstacle/Rocaille.java
@@ -1,6 +1,8 @@
-package model.Obstacle;
+package model.Elements.Obstacle;
 
-import model.ModelElement;
+
+
+import model.Elements.ModelElement;
 
 import util.Position;
 
diff --git a/src/main/java/model/Element.java b/src/main/java/model/Elements/element.java
similarity index 70%
rename from src/main/java/model/Element.java
rename to src/main/java/model/Elements/element.java
index 7b3aeb3..f6219fb 100644
--- a/src/main/java/model/Element.java
+++ b/src/main/java/model/Elements/element.java
@@ -1,10 +1,11 @@
-package model;
+package model.Elements;
 
+import model.Board.Board;
 import util.Position;
 
 import java.util.List;
 
-public interface Element {
+public interface element {
 
 
 
diff --git a/src/main/java/util/Neighbour.java b/src/main/java/util/Neighbour.java
index 1e591d3..6ae1236 100644
--- a/src/main/java/util/Neighbour.java
+++ b/src/main/java/util/Neighbour.java
@@ -1,6 +1,6 @@
 package util;
 
-import model.Board;
+import model.Board.Board;
 
 import java.util.*;
 
diff --git a/src/main/java/util/Position.java b/src/main/java/util/Position.java
index c25f20d..f297536 100644
--- a/src/main/java/util/Position.java
+++ b/src/main/java/util/Position.java
@@ -1,10 +1,5 @@
 package util;
 
-import model.Board;
-import model.FirefighterBoard;
-
-import java.util.Random;
-
 public record Position(int row, int column) {
 
 
diff --git a/src/test/java/model/FirefighterBoardTest.java b/src/test/java/model/FirefighterBoardTest.java
index e091ac2..7f6d825 100644
--- a/src/test/java/model/FirefighterBoardTest.java
+++ b/src/test/java/model/FirefighterBoardTest.java
@@ -1,5 +1,8 @@
 package model;
 
+import model.Board.Board;
+import model.Board.FirefighterBoard;
+import model.Elements.ModelElement;
 import org.junit.jupiter.api.Test;
 import util.Position;
 
-- 
GitLab