From bddb013f02b644b136abcc6a40d0a8fe09eeb519 Mon Sep 17 00:00:00 2001 From: Vincent <vincent.teissier@etu.u-pec.fr> Date: Thu, 24 Oct 2024 18:57:28 +0200 Subject: [PATCH] Gestions de petits problemes de code --- bin/controller/HexagonMouseListener.class | Bin 957 -> 982 bytes bin/view/GameView.class | Bin 5186 -> 5186 bytes .../java/controller/HexagonMouseListener.java | 15 ++++++++------- src/main/java/view/GameView.java | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/controller/HexagonMouseListener.class b/bin/controller/HexagonMouseListener.class index f6471d36ba7962d6d2722c90193eaf18dc5d2db8..25b9a14f8a8d16a118371df9cbcc6f702e7cb12e 100644 GIT binary patch delta 226 zcmW-byG{a86h+s)gC3c=Ktf{TgF)pX4+lma6AL<e6MCyDwU7b=A40_s*b@y2B>Dk< z06(K49BkG(YiAexOE!}HY}enwBM&}V!YoIW_qf>O(&vgwK$V(Look^XG#AOpctUIT zZaU4j!zXY!a*jL&;l>fs5xS0;Tj9=ePcr*8{X+gVouqL(9mj*=%iH*)XCw1Gz~bqI ya{Cjz<lsqfCR%Z5nG>jZ(Gpo`!*Z-Fl2M-Myi@fvLQ49fZvF^G6T|s`yR-vJw;zoF delta 201 zcmXZSOAY}+6ouixs!_VS5D|$t?X79gfw`%XiH%r_ktG-kk&v(e3$UDyB64%T<eZ$h zdZ@)Kx<7#>bB#;IB}w&5?Mq$L!1rj<(zNL)x{BUuu@n2F2>X45#xodFhBO()zz{H0 zj0_=T#l$dWwvWW>ype&}u95bj8C;0jmsjF95|RU18=Zf3MV;(QlDDRDtOaru@hMxe LjqnkaexvdSZ<HC1 diff --git a/bin/view/GameView.class b/bin/view/GameView.class index 3d0e8f8b98dc310238081b57c0f1365c53d62234..821b2326d5601bccb2e4785ce2aefb993811ab63 100644 GIT binary patch delta 217 zcmWNL%Sr-q9EHDGC@l&m#}UE`L<osyRw=dXvgtyiC6zAJ43vS$N(yGt%AmYZ+7DA) zjIZFrCzzFQ(pyCT-8pbBpP%p(Q%kpwS>%K@&e$N$E?EvaS1QL1m)vv3GuOD}d8Hr) zy%{UAM2RS6)u>=|%MMlcsBwxzhCBJw-IY2)9$4j(O`b^6;6V8!UZl4?*IdbmEbUF+ zLyq~O2wJSuW}A-MX)A)R1dPwv7Yp<-=@aLhBm?&O;esJWM(S@YGs6yeDm9T`!`3{B Hgtz_y?qV;E delta 217 zcmWNL%Sr+P7=^!C7%d7WCxb`@5k#Vyl|}ASH<FN|NNLc81S=@=Mkurjku+uMhc2|x zM{v;-%&Ir(Euw#UIEU|iUfhe%ZPVUoi5wvgh><5rkqjkGWzIR|mLob;=u+i@W2u^t zkyDmAV?+BG7dX_|rOqCg%DJY%jr^J2^*a`55TwZ_Ep}*=)|};D+?5}rCl$YK^kv|` z3OuR7kT4?>JS%6U24nGAlZeYAF9dicim=TaDc;rYgA+dW^Gm)h$2Zm0OnxoLn9ADf F);|LAFTDT& diff --git a/src/main/java/controller/HexagonMouseListener.java b/src/main/java/controller/HexagonMouseListener.java index 976944d..254c1de 100644 --- a/src/main/java/controller/HexagonMouseListener.java +++ b/src/main/java/controller/HexagonMouseListener.java @@ -1,14 +1,14 @@ package controller; -import java.awt.Point; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.Set; - import view.HexagonTile; import view.GameView; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.Point; +import java.util.Set; public class HexagonMouseListener extends MouseAdapter { + private final HexagonTile hexTile; private final GameView gameView; private final Set<Point> availablePositions; @@ -21,8 +21,9 @@ public class HexagonMouseListener extends MouseAdapter { @Override public void mouseClicked(MouseEvent e) { - if (availablePositions.contains(hexTile.getPosition())) { - gameView.placeTile(hexTile.getPosition()); + Point position = hexTile.getPosition(); + if (availablePositions.contains(position)) { + gameView.placeTile(position); } } } diff --git a/src/main/java/view/GameView.java b/src/main/java/view/GameView.java index 77c7a46..0db1374 100644 --- a/src/main/java/view/GameView.java +++ b/src/main/java/view/GameView.java @@ -67,7 +67,6 @@ public class GameView extends JFrame { private JPanel createHexagonGrid() { return new HexagonGridPanel(); } - // Ajouter un hexagone à une position donnée private void addHexagonTile(Point position, JPanel panel, int hexSize) {