From c78a359e675f636a8223c5a53fc63219c2a61f83 Mon Sep 17 00:00:00 2001 From: c23025119 <sarah.cherchem@etu.univ-amu.fr> Date: Thu, 28 Nov 2024 14:42:23 +0100 Subject: [PATCH] Create the class ModelElement --- .../java/main/model/ModelElement.class | Bin 1033 -> 153 bytes src/main/java/model/BoardElement.java | 27 ++++++++++++++++++ src/main/java/model/ModelElement.java | 6 ++-- src/main/java/model/PositionGenerator.java | 7 +++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 src/main/java/model/BoardElement.java create mode 100644 src/main/java/model/PositionGenerator.java diff --git a/build/classes/java/main/model/ModelElement.class b/build/classes/java/main/model/ModelElement.class index 233ea071f11d658f111ffcfdd0d89e41d52ca544..155b653963166f37418e8bdaf6c396a855faacdd 100644 GIT binary patch delta 129 zcmeC=n8_G<>ff$?3=9lT44mu?OpFXdx%nxnIr_dJ(lsYFH#M(>oq>gsK_Dx!EKxrv zF)v-;KPf9UxrC8{J3X}|Aip@XBr`vckwH*H)2Fl~Ge;jLG&zPzNsf(?fsuik0R$LX V7#Ua@*cccX7#Y|Z7#NrsH~>Xw9xVU> literal 1033 zcmX^0Z`VEs1_mbvV|E56Mh2nW{FKxjeP0minv<HFnpeWfz{tSD!@$bG#>l|!<{9Mb z=IQPc;u^%rAmW3m+8U&sgNK0=q?`q$93;Ta!@$G9%gDg466WX=>Ke?*AR3KLGZzCt zg8(}NFAswtgAgMFYjRG0UMeGlh=!(5R$^JAeokUuy1su>R%&vIH5Y>jgD5+L7!QLu zg9IZ3A3}j^UTH2P1AAFwPHC!t8Y6?L29j>)oW$Z{Yb1f-lA_GKbZcZAKn8%#m*QcN zW{_cIV6(~0%Pg^DWDr9(3aZmnGmL|Qm5YIqL5hQc6GSWWFeou7gS-oNLop+RxP~TH z4>K~b!IZE#=clAHGVuFk=B4_T<|d^Ug(N2Bq%tySV6jsZTj((|2>IkEC+37D7G;98 zLiMxcCFZ7r<PaeQbvYx0fNyF^Mt({_Vo_plYDsEQF(U&@Nk(QdBLin}W_n&?Noi3k zBLlOBW*8#_hfQ)0G#J#7!VeT!HrSkFXU)jK6`WsMl$`383G#>_a<b9`xyHeefssLk zfq{Y9K@yb07#JKRK}m;!K|l(WVi*`0SQ$7OR2Y;Q7#UO<7#Nfo7#To-YZC+4HU_=} z4E!4y7#J8C)EF2T*uZkk44e$&4C)L_VD%;pOkhziAx5no48jK(7(wcpP}FNMFfi~y zR555WXfZG_XoKu!WMF7uU|<3z00w5TVTKIM49pA+4D4FkGTRv>H!^^vk!?np#Ll3@ zzy>vmlZk;rfB}qk!CLeLxIpOx>LpDE7Lbn^1X=eoFh(+OVqgxAWZA^P9t?6Rs?RtW z^cnP^+H9fP6n8T)MheL?Z)cF(%)kuh$g_Ys>^m3~HZyR6oCz_8i-C!Ofq{iVih-Gd Oi2>pk0|rB|n~VUS$;rL| diff --git a/src/main/java/model/BoardElement.java b/src/main/java/model/BoardElement.java new file mode 100644 index 0000000..9a403ac --- /dev/null +++ b/src/main/java/model/BoardElement.java @@ -0,0 +1,27 @@ +package model; + +import util.Position; + +public abstract class BoardElement implements ModelElement{ + protected Position position; + + public BoardElement(Position position) { + this.position = position; + } + + @Override + public Position getPosition() { + return position; + } + public void setPosition(Position position) { + this.position = position; + } + public boolean isAtPosition(Position position) { + return this.position.equals(position); + } + + public abstract String getType(); // Ajout de la méthode abstraite + + + public abstract String toString(); +} diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/ModelElement.java index 759eee5..ce3c924 100644 --- a/src/main/java/model/ModelElement.java +++ b/src/main/java/model/ModelElement.java @@ -1,5 +1,7 @@ package model; -public enum ModelElement { - FIREFIGHTER, FIRE +import util.Position; + +public interface ModelElement { + } diff --git a/src/main/java/model/PositionGenerator.java b/src/main/java/model/PositionGenerator.java new file mode 100644 index 0000000..55ef8ba --- /dev/null +++ b/src/main/java/model/PositionGenerator.java @@ -0,0 +1,7 @@ +package model; + +import util.Position; + +public interface PositionGenerator { + public Position generateRandomPosition(int rowCount, int columnCount); +} -- GitLab