From 8c788a952f4e9635035b409c7f414bf46b698a84 Mon Sep 17 00:00:00 2001
From: MEHDI <mehdi.belhachemi@etu-univ.amu.fr>
Date: Sun, 24 Nov 2024 20:56:55 +0100
Subject: [PATCH] using packages

---
 src/main/java/model/Board.java                         |  3 ++-
 src/main/java/model/{ => Extinguisher}/Cloud.java      |  5 ++++-
 .../java/model/{ => Extinguisher}/Extinguisher.java    |  9 ++++++---
 .../java/model/{ => Extinguisher}/FireFighter.java     |  6 +++++-
 .../model/{ => Extinguisher}/MotorizedFireFighter.java |  7 ++++++-
 src/main/java/model/Fire.java                          |  3 +++
 src/main/java/model/FirefighterBoard.java              |  4 ++++
 src/main/java/model/ModelElement.java                  | 10 +++++++++-
 src/main/java/model/{ => Obstacle}/Montain.java        |  6 ++++--
 src/main/java/model/{ => Obstacle}/Obstacle.java       |  7 +++++--
 src/main/java/model/{ => Obstacle}/Road.java           |  9 ++++-----
 src/main/java/model/{ => Obstacle}/Rocaille.java       |  6 ++++--
 12 files changed, 56 insertions(+), 19 deletions(-)
 rename src/main/java/model/{ => Extinguisher}/Cloud.java (87%)
 rename src/main/java/model/{ => Extinguisher}/Extinguisher.java (81%)
 rename src/main/java/model/{ => Extinguisher}/FireFighter.java (90%)
 rename src/main/java/model/{ => Extinguisher}/MotorizedFireFighter.java (91%)
 rename src/main/java/model/{ => Obstacle}/Montain.java (53%)
 rename src/main/java/model/{ => Obstacle}/Obstacle.java (81%)
 rename src/main/java/model/{ => Obstacle}/Road.java (53%)
 rename src/main/java/model/{ => Obstacle}/Rocaille.java (53%)

diff --git a/src/main/java/model/Board.java b/src/main/java/model/Board.java
index 17d28ba..d81a2d8 100644
--- a/src/main/java/model/Board.java
+++ b/src/main/java/model/Board.java
@@ -1,6 +1,7 @@
 package model;
 
-import util.Neighbour;
+import model.Extinguisher.Extinguisher;
+import model.Obstacle.Obstacle;
 import util.Position;
 
 import java.util.List;
diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Extinguisher/Cloud.java
similarity index 87%
rename from src/main/java/model/Cloud.java
rename to src/main/java/model/Extinguisher/Cloud.java
index b61a5a4..b3cd7ef 100644
--- a/src/main/java/model/Cloud.java
+++ b/src/main/java/model/Extinguisher/Cloud.java
@@ -1,5 +1,8 @@
-package model;
+package model.Extinguisher;
 
+import model.Board;
+import model.Extinguisher.Extinguisher;
+import model.ModelElement;
 import util.Neighbour;
 import util.Position;
 
diff --git a/src/main/java/model/Extinguisher.java b/src/main/java/model/Extinguisher/Extinguisher.java
similarity index 81%
rename from src/main/java/model/Extinguisher.java
rename to src/main/java/model/Extinguisher/Extinguisher.java
index 1d7a630..9b865b1 100644
--- a/src/main/java/model/Extinguisher.java
+++ b/src/main/java/model/Extinguisher/Extinguisher.java
@@ -1,12 +1,15 @@
-package model;
+package model.Extinguisher;
 
+import model.Board;
+import model.Element;
+import model.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 Element {
     protected final TargetStrategy targetStrategy = new TargetStrategy();
     protected Neighbour neighbour;
 
@@ -34,7 +37,7 @@ public abstract class Extinguisher implements Element{
     public ModelElement getElement(){
         return this.element;
     }
-    public void extinguish(Board board,Position position) {
+    public void extinguish(Board board, Position position) {
         if (board.getFires().containsKey(position)) {
             board.getFires().remove(position);
         }
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/Extinguisher/FireFighter.java
similarity index 90%
rename from src/main/java/model/FireFighter.java
rename to src/main/java/model/Extinguisher/FireFighter.java
index 9e1233e..fd21fed 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/Extinguisher/FireFighter.java
@@ -1,5 +1,9 @@
-package model;
+package model.Extinguisher;
 
+import model.Board;
+import model.ModelElement;
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
 import util.Neighbour;
 import util.Position;
 
diff --git a/src/main/java/model/MotorizedFireFighter.java b/src/main/java/model/Extinguisher/MotorizedFireFighter.java
similarity index 91%
rename from src/main/java/model/MotorizedFireFighter.java
rename to src/main/java/model/Extinguisher/MotorizedFireFighter.java
index 0873c07..05d4f1c 100644
--- a/src/main/java/model/MotorizedFireFighter.java
+++ b/src/main/java/model/Extinguisher/MotorizedFireFighter.java
@@ -1,5 +1,10 @@
-package model;
+package model.Extinguisher;
 
+import model.Board;
+
+import model.ModelElement;
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
 import util.Neighbour;
 import util.Position;
 
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 798f4c4..73ee024 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -1,5 +1,8 @@
 package model;
 
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
+import model.Obstacle.Road;
 import util.Neighbour;
 import util.Position;
 
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 74c4338..108e4ab 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -1,5 +1,9 @@
 package model;
 
+import model.Extinguisher.Cloud;
+import model.Extinguisher.Extinguisher;
+import model.Extinguisher.FireFighter;
+import model.Obstacle.Obstacle;
 import util.Position;
 
 import java.util.*;
diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/ModelElement.java
index 64c839a..643632a 100644
--- a/src/main/java/model/ModelElement.java
+++ b/src/main/java/model/ModelElement.java
@@ -1,5 +1,13 @@
 package model;
 
+import model.Extinguisher.Cloud;
+import model.Extinguisher.Extinguisher;
+import model.Extinguisher.FireFighter;
+import model.Extinguisher.MotorizedFireFighter;
+import model.Obstacle.Montain;
+import model.Obstacle.Obstacle;
+import model.Obstacle.Road;
+import model.Obstacle.Rocaille;
 import util.Position;
 
 import java.util.ArrayList;
@@ -8,7 +16,7 @@ import java.util.List;
 public enum ModelElement {
 
   FIREFIGHTER(5),
-  FIRE(10),
+  FIRE(20),
   CLOUD(10),
   ROAD(5),
   MOUNTAIN(5),
diff --git a/src/main/java/model/Montain.java b/src/main/java/model/Obstacle/Montain.java
similarity index 53%
rename from src/main/java/model/Montain.java
rename to src/main/java/model/Obstacle/Montain.java
index af69b26..a86782b 100644
--- a/src/main/java/model/Montain.java
+++ b/src/main/java/model/Obstacle/Montain.java
@@ -1,8 +1,10 @@
-package model;
+package model.Obstacle;
 
+import model.ModelElement;
+import model.Obstacle.Obstacle;
 import util.Position;
 
-public class Montain extends Obstacle{
+public class Montain extends Obstacle {
     public Montain(Position position) {
         super(position);
         element = ModelElement.MOUNTAIN;
diff --git a/src/main/java/model/Obstacle.java b/src/main/java/model/Obstacle/Obstacle.java
similarity index 81%
rename from src/main/java/model/Obstacle.java
rename to src/main/java/model/Obstacle/Obstacle.java
index f4e8cf3..e5688b2 100644
--- a/src/main/java/model/Obstacle.java
+++ b/src/main/java/model/Obstacle/Obstacle.java
@@ -1,11 +1,14 @@
-package model;
+package model.Obstacle;
 
+import model.Board;
+import model.Element;
+import model.ModelElement;
 import util.Position;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class Obstacle implements Element{
+public abstract class Obstacle implements Element {
     protected ModelElement element;
     protected final Position position;
     public Obstacle(Position position){
diff --git a/src/main/java/model/Road.java b/src/main/java/model/Obstacle/Road.java
similarity index 53%
rename from src/main/java/model/Road.java
rename to src/main/java/model/Obstacle/Road.java
index 41f0d28..b7e2120 100644
--- a/src/main/java/model/Road.java
+++ b/src/main/java/model/Obstacle/Road.java
@@ -1,11 +1,10 @@
-package model;
+package model.Obstacle;
 
+import model.ModelElement;
+import model.Obstacle.Obstacle;
 import util.Position;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class Road extends Obstacle{
+public class Road extends Obstacle {
 
 
 
diff --git a/src/main/java/model/Rocaille.java b/src/main/java/model/Obstacle/Rocaille.java
similarity index 53%
rename from src/main/java/model/Rocaille.java
rename to src/main/java/model/Obstacle/Rocaille.java
index f321e34..426b7b1 100644
--- a/src/main/java/model/Rocaille.java
+++ b/src/main/java/model/Obstacle/Rocaille.java
@@ -1,8 +1,10 @@
-package model;
+package model.Obstacle;
 
+import model.ModelElement;
+import model.Obstacle.Obstacle;
 import util.Position;
 
-public class Rocaille extends Obstacle{
+public class Rocaille extends Obstacle {
     public Rocaille(Position position) {
         super(position);
         this.element = ModelElement.ROCAILLE;
-- 
GitLab