From a6289bb16226016849d6376379fdc8cd93b440f2 Mon Sep 17 00:00:00 2001 From: Lenny FOULOU Date: Sat, 16 Nov 2024 18:58:01 +0100 Subject: [PATCH] =?UTF-8?q?Supression=20d'un=20repertoire=20en=20doublon?= =?UTF-8?q?=20suite=20=C3=A0=20migration=20windows/linux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/BoardView.java | 61 ------------------- .../View/GameController.java | 31 ---------- .../View/GameView.java | 52 ---------------- 3 files changed, 144 deletions(-) delete mode 100644 TestV1/TestEnAttendantResolutionBug/View/BoardView.java delete mode 100644 TestV1/TestEnAttendantResolutionBug/View/GameController.java delete mode 100644 TestV1/TestEnAttendantResolutionBug/View/GameView.java diff --git a/TestV1/TestEnAttendantResolutionBug/View/BoardView.java b/TestV1/TestEnAttendantResolutionBug/View/BoardView.java deleted file mode 100644 index 8757694..0000000 --- a/TestV1/TestEnAttendantResolutionBug/View/BoardView.java +++ /dev/null @@ -1,61 +0,0 @@ -package view; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import model.Board; -import model.Tile; -import controller.GameController; - -public class BoardView extends JPanel { - private GameController controller; - private int rows = 5; - private int cols = 5; - - public BoardView(Board board, GameController controller) { - this.controller = controller; - setLayout(new GridLayout(rows, cols, 5, 5)); - initializeBoard(); - } - - // Méthode pour assigner le contrôleur après création de l'instance - public void setController(GameController controller) { - this.controller = controller; - } - - private void initializeBoard() { - for (int i = 0; i < rows * cols; i++) { - JPanel tilePanel = new JPanel(); - tilePanel.setBackground(Color.LIGHT_GRAY); - tilePanel.setBorder(BorderFactory.createLineBorder(Color.BLACK)); - - tilePanel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - handleTilePlacement(tilePanel); - } - }); - - add(tilePanel); - } - } - - private void handleTilePlacement(JPanel tilePanel) { - if (controller != null) { // Assure que le contrôleur est bien assigné - Tile tile = controller.getNextTile(); - if (tile != null) { - tilePanel.setBackground(Color.GREEN); - tilePanel.add(new JLabel(tile.getType())); - revalidate(); - repaint(); - controller.placeTile(tile); - } - } - } - - public void refreshBoard() { - revalidate(); - repaint(); - } -} diff --git a/TestV1/TestEnAttendantResolutionBug/View/GameController.java b/TestV1/TestEnAttendantResolutionBug/View/GameController.java deleted file mode 100644 index 0b3fe7c..0000000 --- a/TestV1/TestEnAttendantResolutionBug/View/GameController.java +++ /dev/null @@ -1,31 +0,0 @@ -package controller; - -import model.Game; -import model.Tile; -import view.GameView; - -public class GameController { - private Game game; - private GameView gameView; - private Tile currentTile; - - public GameController(Game game, GameView gameView) { - this.game = game; - this.gameView = gameView; - this.currentTile = null; // Initialise sans tuile au début - } - - public void selectNextTile(Tile tile) { - this.currentTile = tile; - } - - public Tile getNextTile() { - return currentTile; // Retourne la tuile actuellement sélectionnée - } - - public void placeTile(Tile tile) { - game.placeTile(tile); - gameView.update(game); - currentTile = null; // Réinitialise après placement - } -} diff --git a/TestV1/TestEnAttendantResolutionBug/View/GameView.java b/TestV1/TestEnAttendantResolutionBug/View/GameView.java deleted file mode 100644 index 99c91e4..0000000 --- a/TestV1/TestEnAttendantResolutionBug/View/GameView.java +++ /dev/null @@ -1,52 +0,0 @@ -package view; - -import model.Game; -import model.Tile; -import controller.GameController; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -public class GameView extends JFrame { - private JLabel scoreLabel; - private BoardView boardView; - private GameController controller; // Ajoute le contrôleur ici - - public GameView(Game game) { // Constructeur sans le contrôleur en paramètre - setTitle("Dorfromantik en Java"); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setSize(500, 500); - setLayout(new BorderLayout()); - - scoreLabel = new JLabel("Score : " + game.getScore()); - boardView = new BoardView(game.getBoard(), null); // Initialise BoardView sans contrôleur - - JButton nextTileButton = new JButton("Sélectionner une tuile"); - nextTileButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - if (controller != null) { // Vérifie que le contrôleur est bien assigné - Tile tile = new Tile("forêt", new String[]{"terre", "terre", "eau", "terre", "eau", "terre"}); - controller.selectNextTile(tile); - } - } - }); - - add(scoreLabel, BorderLayout.NORTH); - add(boardView, BorderLayout.CENTER); - add(nextTileButton, BorderLayout.SOUTH); - } - - // Nouvelle méthode setController pour permettre d'assigner le contrôleur après création - public void setController(GameController controller) { - this.controller = controller; - boardView.setController(controller); // Passe le contrôleur à BoardView - } - - public void update(Game game) { - scoreLabel.setText("Score : " + game.getScore()); - boardView.refreshBoard(); - } -}