From fd598eeb07e8c8ebef944d9fcc8d5893b41fcef9 Mon Sep 17 00:00:00 2001
From: unknown <kayyissa.haissous@etu.u-pec.fr>
Date: Tue, 3 May 2022 15:32:40 +0200
Subject: [PATCH] =?UTF-8?q?Marquage=20finalis=C3=A9,=20cases=20non=20clica?=
 =?UTF-8?q?bles,=20probl=C3=A8me=20d'affichage=20fix=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Grille.java   | 11 -----------
 Listener.java | 20 +++++++++++++++++---
 Sus.java      | 18 ++++++++++++++++++
 Test.java     |  2 +-
 4 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 Sus.java

diff --git a/Grille.java b/Grille.java
index fe81e71..04441de 100644
--- a/Grille.java
+++ b/Grille.java
@@ -27,7 +27,6 @@ public class Grille extends JPanel  {
 		Random rand = new Random();
 		//	On initialise les emplacements des mines
 		caseMine[0] = rand.nextInt(lignes*colonnes);
-		System.out.println("mine 0 : "+ caseMine[0]);
 		for (int i=1;i<mines;i++){
 			caseMine[i] = rand.nextInt(lignes*colonnes);
 			//	On vérifie que la case n'a pas déjà été minée, auquel cas on change de case
@@ -35,19 +34,10 @@ public class Grille extends JPanel  {
 				if (caseMine[i]==caseMine[j]){
 					caseMine[i] = rand.nextInt(lignes*colonnes);
 					j=-1;
-					System.out.println("Nouvelle case qu'on essaye de miner :"+ caseMine[i]);
-				} else if (caseMine[i]!=caseMine[j]){
-					System.out.println(""+ caseMine[i]+" != "+ caseMine[j]);
 				}
 			}
-			System.out.println("Mine posee :"+ "("+i+")"+caseMine[i]);
 		}
 
-		/*	Affichage de l'mplacement des mines
-		for (int i=0;i<mines;i++){
-			System.out.println(""+ caseMine[i]);
-		}*/
-
 		//	On place maintenant les mines sur la plateau
 		boolean[] minee = new boolean[lignes*colonnes];
 		for (int i=0; i<lignes*colonnes;i++){
@@ -277,7 +267,6 @@ public class Grille extends JPanel  {
 	protected void AfficherPlateau(int taille, Dimension caseSize, int[] entourage, boolean[] minee){
 		for (int i=0;i<taille;i++){
 			this.plateau[i]= new Case(caseSize,minee[i],entourage[i]);
-			this.plateau[i].setVisible();
 			this.add(this.plateau[i].getCase());
   		}
 	}
diff --git a/Listener.java b/Listener.java
index 3007989..b697720 100644
--- a/Listener.java
+++ b/Listener.java
@@ -2,11 +2,12 @@ import java.awt.event.*;
 import java.awt.*;
 
 public class Listener implements MouseListener{
+	private int marquage=0;
 
     @Override
     public void mouseClicked(MouseEvent evenement){
 		Case panel = (Case)evenement.getSource();
-		if ((evenement.getButton() == MouseEvent.BUTTON1)&&(panel.getVisible()==false)){
+		if ((evenement.getButton() == MouseEvent.BUTTON1)&&(panel.getVisible()==false)&&(this.marquage==0)){
         	panel.setVisible();
 			panel.getCase();
 			if (panel.getMine()==true){
@@ -14,9 +15,22 @@ public class Listener implements MouseListener{
 			}
 		}
 		if (evenement.getButton() == MouseEvent.BUTTON3) {
-        	panel.add(new Etoile(panel.getSize()), BorderLayout.CENTER);
+        	if (this.marquage==0){
+				panel.add(new Etoile(panel.getSize()), BorderLayout.CENTER);
+				this.marquage=1;
+			}
+			else if (this.marquage==1){
+				panel.removeAll();
+				panel.add(new Sus(panel.getSize()), BorderLayout.CENTER);
+				this.marquage=2;
+			}
+			else if (this.marquage==2){
+				panel.removeAll();
+				this.marquage=0;
+			}
 			panel.updateUI();
-			System.out.println("Marquage");
+
+			System.out.println(""+this.marquage);
 		}
 	}        
 	public void mouseEntered(MouseEvent evenement){
diff --git a/Sus.java b/Sus.java
new file mode 100644
index 0000000..5ffdc04
--- /dev/null
+++ b/Sus.java
@@ -0,0 +1,18 @@
+import javax.swing.JComponent;
+import java.awt.*;
+ 
+public class Sus extends JComponent {
+  private Dimension caseSize;
+  public Sus(Dimension caseSize) {
+    super();
+    this.caseSize=caseSize;
+  }
+  @Override
+  protected void paintComponent(Graphics pinceau) {
+    Graphics chiffre = pinceau.create();
+    Font font = new Font("Arial", Font.BOLD, caseSize.width*3/5);
+    chiffre.setFont(font);
+    chiffre.setColor(new Color(236, 0, 140));
+    chiffre.drawString("?",caseSize.width*3/10,caseSize.height*4/5);
+  }
+}
diff --git a/Test.java b/Test.java
index a2519be..747ce80 100644
--- a/Test.java
+++ b/Test.java
@@ -1,6 +1,6 @@
 public class Test {
     public static void main(String[] args) {
-        Grille grille=new Grille(4,4,15);
+        Grille grille=new Grille(10,15,15);
         new FrameJeu(grille, 15);
     }  
 }