From cecd27902916bd74eabff177bfe0bb94034967bc Mon Sep 17 00:00:00 2001
From: unknown <kayyissa.haissous@etu.u-pec.fr>
Date: Mon, 2 May 2022 09:26:36 +0200
Subject: [PATCH] =?UTF-8?q?minage=20r=C3=A9par=C3=A9=20(doublon=20premi?=
 =?UTF-8?q?=C3=A8re=20case)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Grille.java        | 25 +++++++++++++++----------
 Listener.java      |  1 -
 SwitchVisible.java | 25 -------------------------
 Test.java          |  2 +-
 4 files changed, 16 insertions(+), 37 deletions(-)
 delete mode 100644 SwitchVisible.java

diff --git a/Grille.java b/Grille.java
index 547be4b..fe81e71 100644
--- a/Grille.java
+++ b/Grille.java
@@ -21,29 +21,33 @@ public class Grille extends JPanel  {
 		this.plateau= new Case[lignes*colonnes];
 
 
-		//	Initialisation : les cases sont cachées
-		boolean[] visible = new boolean[lignes*colonnes];
-		for (int i=0; i<lignes*colonnes;i++){
-			visible[i]=false;
-		}
-
-
 		//	Instalation des mines
 		//	Création d'un tableau de nombres aléatoires pour savoir où les placer
 		int[] caseMine = new int[mines];
 		Random rand = new Random();
 		//	On initialise les emplacements des mines
-		for (int i=0;i<mines;i++){
+		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
-			for (int j=0;j<i;j++){
+			for (int j=0;j<=(i-1);j++){
 				if (caseMine[i]==caseMine[j]){
 					caseMine[i] = rand.nextInt(lignes*colonnes);
-					j=0;
+					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++){
@@ -273,6 +277,7 @@ 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 f080ff8..3007989 100644
--- a/Listener.java
+++ b/Listener.java
@@ -1,5 +1,4 @@
 import java.awt.event.*;
-import javax.swing.*;
 import java.awt.*;
 
 public class Listener implements MouseListener{
diff --git a/SwitchVisible.java b/SwitchVisible.java
deleted file mode 100644
index b68cfa0..0000000
--- a/SwitchVisible.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import javax.swing.*;
-import java.awt.event.*;
-import java.awt.*;
-public class SwitchVisible extends JComponent implements MouseListener {
-    public SwitchVisible()  {
-    
-}
-
-
-public void mouseClicked(MouseEvent evenement){ 
-	
-}        
-public void mouseEntered(MouseEvent evenement){
-
-}         
-public void mouseExited(MouseEvent evenement){
-
-}        
-public void mousePressed(MouseEvent evenement){
-
-}      
-public void mouseReleased(MouseEvent evenement){
-
-}
-}
\ No newline at end of file
diff --git a/Test.java b/Test.java
index 44db97a..a2519be 100644
--- a/Test.java
+++ b/Test.java
@@ -1,6 +1,6 @@
 public class Test {
     public static void main(String[] args) {
-        Grille grille=new Grille(10,10,15);
+        Grille grille=new Grille(4,4,15);
         new FrameJeu(grille, 15);
     }  
 }