From 9bf3b6b6450479b36779cd483e68053e2740c5f2 Mon Sep 17 00:00:00 2001
From: b22015516 <mehdi.belhachemi@etu.univ-amu.fr>
Date: Fri, 29 Nov 2024 11:55:09 +0100
Subject: [PATCH] mehdi and mohamed: making diagram
---
src/main/java/model/Elements/{element.java => Element.java} | 2 +-
src/main/java/model/Elements/Extinguisher/Extinguisher.java | 3 ++-
src/main/java/model/Elements/Fire.java | 2 +-
src/main/java/model/Elements/ModelElement.java | 2 +-
src/main/java/model/Elements/Obstacle/Obstacle.java | 3 ++-
5 files changed, 7 insertions(+), 5 deletions(-)
rename src/main/java/model/Elements/{element.java => Element.java} (89%)
diff --git a/src/main/java/model/Elements/element.java b/src/main/java/model/Elements/Element.java
similarity index 89%
rename from src/main/java/model/Elements/element.java
rename to src/main/java/model/Elements/Element.java
index f6219fb..553ea84 100644
--- a/src/main/java/model/Elements/element.java
+++ b/src/main/java/model/Elements/Element.java
@@ -5,7 +5,7 @@ import util.Position;
import java.util.List;
-public interface element {
+public interface Element {
diff --git a/src/main/java/model/Elements/Extinguisher/Extinguisher.java b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
index fe39516..31dca48 100644
--- a/src/main/java/model/Elements/Extinguisher/Extinguisher.java
+++ b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
@@ -2,6 +2,7 @@ package model.Elements.Extinguisher;
import model.Board.Board;
+import model.Elements.Element;
import model.Elements.ModelElement;
import util.Neighbour;
import util.Position;
@@ -9,7 +10,7 @@ import util.TargetStrategy;
import java.util.List;
-public abstract class Extinguisher implements model.Elements.element {
+public abstract class Extinguisher implements Element {
protected final TargetStrategy targetStrategy = new TargetStrategy();
protected Neighbour neighbour;
diff --git a/src/main/java/model/Elements/Fire.java b/src/main/java/model/Elements/Fire.java
index a552a62..1f0ae07 100644
--- a/src/main/java/model/Elements/Fire.java
+++ b/src/main/java/model/Elements/Fire.java
@@ -11,7 +11,7 @@ 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/Elements/ModelElement.java b/src/main/java/model/Elements/ModelElement.java
index d133bb1..2803fa5 100644
--- a/src/main/java/model/Elements/ModelElement.java
+++ b/src/main/java/model/Elements/ModelElement.java
@@ -35,7 +35,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);
case ROAD -> new Road(position);
diff --git a/src/main/java/model/Elements/Obstacle/Obstacle.java b/src/main/java/model/Elements/Obstacle/Obstacle.java
index 5ad4b2f..7ee70b3 100644
--- a/src/main/java/model/Elements/Obstacle/Obstacle.java
+++ b/src/main/java/model/Elements/Obstacle/Obstacle.java
@@ -2,12 +2,13 @@ package model.Elements.Obstacle;
import model.Board.Board;
+import model.Elements.Element;
import model.Elements.ModelElement;
import util.Position;
import java.util.List;
-public abstract class Obstacle implements model.Elements.element {
+public abstract class Obstacle implements Element {
protected ModelElement element;
protected final Position position;
public Obstacle(Position position){
--
GitLab