From 17c66e4b583d21e1cf0487a905dc1bbd9e6a35ef Mon Sep 17 00:00:00 2001
From: unknown <kayyissa.haissous@etu.u-pec.fr>
Date: Sun, 1 May 2022 13:41:44 +0200
Subject: [PATCH] =?UTF-8?q?r=C3=A9organisation=20du=20code=20:=20setVisibl?=
 =?UTF-8?q?e=20fonctionnel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Case.java     | 50 +++++++++++++++++++++++++++++++-------------------
 FrameJeu.java |  2 +-
 Grille.java   | 23 ++++++++++-------------
 Listener.java | 26 ++++++++++++++++++--------
 Test.java     |  2 +-
 5 files changed, 61 insertions(+), 42 deletions(-)

diff --git a/Case.java b/Case.java
index 873c043..3823f6d 100644
--- a/Case.java
+++ b/Case.java
@@ -2,42 +2,54 @@ import javax.swing.*;
 import java.awt.*;
 
 public class Case extends JPanel {
-	private JPanel panel = new JPanel();
+	private Dimension caseSize;
 	private int entourage;
 	private boolean visible;
 	private boolean minee;
 	private Listener listener;
 
-	public Case(Dimension caseSize, boolean visible, boolean minee, int entourage) {
+	public Case(Dimension caseSize, boolean minee, int entourage) {
 		super();
 		this.entourage=entourage;
-		this.visible=visible;
+		this.visible=false;
 		this.minee=minee;
-		this.panel.setSize(caseSize);
+		this.caseSize= caseSize;
+				
+		this.setSize(caseSize);
+		
 		this.listener = new Listener();
-		panel.addMouseListener(listener);
-
+		this.addMouseListener(this.listener);
+		
 		GridLayout unique = new GridLayout(1,1);
-		this.panel.setLayout(unique);
+		this.setLayout(unique);
+	}
 
+	public void setVisible(){
+		this.visible=true;
+		this.updateUI();
+	}
+
+	public boolean getVisible(){
+		return this.visible;
+	}
+
+	public Case getCase(){
 		if (this.visible == false) {
-			Color gray2 = new Color(70, 70, 70);
-			this.panel.setBackground(gray2);
+			this.setBackground(new Color(70, 70, 70));
 		} else if (this.visible == true) {
-			Color gray1 = new Color(80, 80, 80);
-			this.panel.setBackground(gray1);
 			if (this.minee == true) {
-				Color rose = new Color(236, 0, 140);
-				this.panel.setBackground(rose);
-			} else if (this.entourage>0){
-				this.panel.add(new Chiffre(entourage,caseSize));	
+				this.setBackground(new Color(236, 0, 140));	
+			} else {
+				this.setBackground(new Color(80, 80, 80));
+				if (this.entourage>0){
+					this.add(new Chiffre(entourage,caseSize));
+				}
 			}
 		}
-
+		return this;
 	}
 
-	public JPanel getCase() {
-		return this.panel;
+	public boolean getMine(){
+		return this.minee;
 	}
-
 }
diff --git a/FrameJeu.java b/FrameJeu.java
index 59f9eb1..48f2d36 100644
--- a/FrameJeu.java
+++ b/FrameJeu.java
@@ -42,7 +42,7 @@ public class FrameJeu{
 		miseEnPage.weightx =1;
 		miseEnPage.weighty  = 0.85;
 		miseEnPage.fill = GridBagConstraints.BOTH;
-		fenetre.add(grille.getGrille(), miseEnPage);
+		fenetre.add(grille, miseEnPage);
 
 		// Mise en place de la fenêtre et affichage
 		fenetre.pack();
diff --git a/Grille.java b/Grille.java
index 67f22c1..547be4b 100644
--- a/Grille.java
+++ b/Grille.java
@@ -4,7 +4,7 @@ import java.util.Random;
 
 public class Grille extends JPanel  {
     private Dimension grilleSize=new Dimension(0,0);
-    private JPanel grille= new JPanel();
+	private Case[] plateau;
 
     // On crée La grille de jeu
     public Grille(int lignes, int colonnes, int mines){
@@ -16,8 +16,9 @@ public class Grille extends JPanel  {
 	    GridLayout damier = new GridLayout(lignes,colonnes);
         System.out.println("Taille des cases : "+caseSize);
         System.out.println("Taille de la Grille : "+grilleSize);
-		this.grille.setLayout(damier);
-        this.grille.setSize(grilleSize);
+		this.setLayout(damier);
+        this.setSize(grilleSize);
+		this.plateau= new Case[lignes*colonnes];
 
 
 		//	Initialisation : les cases sont cachées
@@ -42,6 +43,7 @@ public class Grille extends JPanel  {
 				}
 			}
 		}
+
 		//	On place maintenant les mines sur la plateau
 		boolean[] minee = new boolean[lignes*colonnes];
 		for (int i=0; i<lignes*colonnes;i++){
@@ -264,14 +266,14 @@ public class Grille extends JPanel  {
 
 
 		//	On place les cases à leur état actuel dans la grille
-		AffichePlateau(lignes*colonnes, caseSize, entourage, visible, minee);
+		AfficherPlateau(lignes*colonnes, caseSize, entourage, minee);
     }
 
-	//	Méthode pour afficher l'état des cases
-	protected void AffichePlateau(int taille, Dimension caseSize, int[] entourage, boolean[] visible, boolean[] minee){
+	//	Méthode pour Afficher le plateau
+	protected void AfficherPlateau(int taille, Dimension caseSize, int[] entourage, boolean[] minee){
 		for (int i=0;i<taille;i++){
-			Case panel = new Case(caseSize,visible[i],minee[i],entourage[i]);
-			this.grille.add(panel.getCase());
+			this.plateau[i]= new Case(caseSize,minee[i],entourage[i]);
+			this.add(this.plateau[i].getCase());
   		}
 	}
 
@@ -279,9 +281,4 @@ public class Grille extends JPanel  {
     public Dimension getGrilleSize() {
         return grilleSize;
     }
-
-	//	Methode pour obtenir le panel pour l'affichage de la grille
-    public JPanel getGrille() {
-        return grille;
-    }
 }
diff --git a/Listener.java b/Listener.java
index aac9b64..f080ff8 100644
--- a/Listener.java
+++ b/Listener.java
@@ -5,22 +5,32 @@ import java.awt.*;
 public class Listener implements MouseListener{
 
     @Override
-    public void mouseClicked(MouseEvent evenement){ 
-		System.out.println("mouseClicked");
-        JPanel lb = (JPanel)evenement.getSource();
-        lb.setBackground(new Color(255, 255, 255));
+    public void mouseClicked(MouseEvent evenement){
+		Case panel = (Case)evenement.getSource();
+		if ((evenement.getButton() == MouseEvent.BUTTON1)&&(panel.getVisible()==false)){
+        	panel.setVisible();
+			panel.getCase();
+			if (panel.getMine()==true){
+				System.out.println("Perdu!");
+			}
+		}
+		if (evenement.getButton() == MouseEvent.BUTTON3) {
+        	panel.add(new Etoile(panel.getSize()), BorderLayout.CENTER);
+			panel.updateUI();
+			System.out.println("Marquage");
+		}
 	}        
 	public void mouseEntered(MouseEvent evenement){
-		System.out.println("mouseEntered");
+		//	System.out.println("mouseEntered");
 	}         
 	public void mouseExited(MouseEvent evenement){
-		System.out.println("mouseExited");
+		//	System.out.println("mouseExited");
 	}        
 	public void mousePressed(MouseEvent evenement){
-		System.out.println("mousePressed");
+		//	System.out.println("mousePressed");
 	}      
 	public void mouseReleased(MouseEvent evenement){
-		System.out.println("mouseReleased");
+		//	System.out.println("mouseReleased");
 	}
 
 }
diff --git a/Test.java b/Test.java
index dc11881..44db97a 100644
--- a/Test.java
+++ b/Test.java
@@ -1,6 +1,6 @@
 public class Test {
     public static void main(String[] args) {
-        Grille grille=new Grille(20,25,60);
+        Grille grille=new Grille(10,10,15);
         new FrameJeu(grille, 15);
     }  
 }