From 0667cec233abad0a1a05fb076d46bb5601370318 Mon Sep 17 00:00:00 2001
From: martins <clement.martins@etu.u-pec.fr>
Date: Thu, 21 Apr 2022 22:17:57 +0200
Subject: [PATCH] ok

---
 main_ex.class                     | Bin 1216 -> 950 bytes
 main_ex.java                      |  30 +++++---------
 nombreCollonnesLigneEtBombe.class | Bin 0 -> 1476 bytes
 nombreCollonnesLigneEtBombe.java  |  65 ++++++++++++++++++++++++++++++
 observateurChoix.class            | Bin 888 -> 1161 bytes
 observateurChoix.java             |  13 ++++--
 6 files changed, 85 insertions(+), 23 deletions(-)
 create mode 100644 nombreCollonnesLigneEtBombe.class
 create mode 100644 nombreCollonnesLigneEtBombe.java

diff --git a/main_ex.class b/main_ex.class
index 892d803a95518ffd61a56f733479ffe0a09905fc..a23bbc278749278e133bcbd290b5ed6f61018e76 100644
GIT binary patch
delta 592
zcmY*WU2hUW6g|Tt!)^y!pt9IvtF~6?c3t}+Rs5<{nm|yWY(sonWP@0`TUl!RV)_Ss
zA^Sf}d|47njL-cOHSt&YqTbO5<2;;u?wNb<oSFHmhWz!}&(B`~Y+y%27V{ie;<&0I
zf@=~MBrHm}E@6q|h6WV{nG_{k<}l(|(U6c0378x=HKbt4<d!U3<yhlbAHJ^-f8-S%
zxgf_DPIYVu+(t=YQ^FnG6)58#!>sEawEE7r*Xwz%>-dds$91ZM3aO5Oj{5=+kP~=_
zM-1sV_B;E;@{hZ2$Er8%meXU1c>4lda#m7qTlVq5qH$hdwm%lAU|U4-1l8a>+Y8!}
z64Qt0+59d8Z+HDe&vzKqjx(t5^z8%U*+OynZF-YL-x)kVwBH_)7%S9jwIcN-NUYee
z_B(y=$Za!Z3XT6x4dP0<evzJ5t_T=;$Pr$m>@r10@xt;5>=O}&8N%2fQKiS7MV`1U
z{YYw*Vk`Kd%$ypr5Zs7{h>xK*jS;k`Mu>@(5TY?gqM1&PF!{`+f+=&1R5OKNiZVhv
zM8+^fOz-{0e@B*)q~QYc)21*<Hqw|!28-m@B)_X<qD1NzS*k+M;{}<2i8<I*#)!+S
G&HV<4a%PnP

literal 1216
zcmZWoTT|0e5dIELn>Ge%%S8%a@B*X_Q11%GYq?lW!5J8s>VtC%2MD$arYWNT$TuBl
zTE{xR_~tM1S2*rTJ3@z-Jtw>0?tbUn?C-zde*(CTRSlz<P%#;Wp`iz9X)@B7DyB53
zn3f+i(qyH%u3-c>RNU0ii(4vgYv_{&?#T15h6K_o?r9j1&ifjMFe{OBGB>AUUd023
z$h_^?{zHb4k=|fX^6s`^=(B7`tkkPz;jQy>g*-}?+YZB!@!Hzwhdf*1&Te+i_iSf3
zCld$w&W^pc$9F}3&$W-%xm}TI!$tr<%GTZ!GW&eV<5iJMzb-InYi`}!5=*wk>9YJA
zaWo@~>o|`K3`u$K&SZ!!{Q6WSa&=Fl9_o06$2y+iF++bqjKBA@%bvY$@egj@mmrEi
zMPA1O7IiFPS;rMzrTz!h(ht~5)FNr&xYe>pY`QyJyeuj@o`FbrM_zJAR2brJxhA|r
z?h~v3^`7f^0ZT^_D-3Gqd4xSyZ?(KHwtR-cwnnEUJyR3D<!*7`c1iiLQ7A~ERr0Rc
zABkm5#)DTfjCN|s*SCE|?$9v2U^v5sTo60FUh(r4w<cB(gx4vn7(rEy5F2*QZqM3y
zB|AlZw>@B*u8}@Hb~)XGb*y5}YU>xYjPvd7qFb*C%dYvt5gx<k6CA~%aQti+AV>>Q
z8bjs;GVfLoT!+xP4h8wdV<#@t5{%LU0U<E?<B+{bU-D#hhBHmDFLYtJL^cvQV~Aml
zQrpmXP$(IgZK0=>3^k!xW+>D^*i3}}Btl~iL|RZwN~DQs(VS`^W=0y&Or?P{<~Qh@
z$K@xeFrY&&TAbE!gtqV+l1S4Q&R`I?a1Qq|OmX@LJMF(Bj3{NjZK1cMG;!9FmoQz5
zE%cR|h_AGeC`~tzY@&ZoX<>kzgLB~)hDtr=bQ9<1B4&yx4NH$Q6?oLCluDkA*+6PD
zlOnEk5ckw(<cIc|+O_q#OGH5e#z?v(i8eywO_EaANuPOA=qV9hA*$;b$16;LQ*;*w
LWnZJb9*qA3oSX}E

diff --git a/main_ex.java b/main_ex.java
index 9b43fd1..a21bc4a 100644
--- a/main_ex.java
+++ b/main_ex.java
@@ -5,7 +5,7 @@
 //importons les packages necessaires
 import java.awt.*;
 import javax.swing.*;
-
+ 
 public class main_ex{
 	public static void main(String[] args){
 		// on initialise une fenettre
@@ -14,29 +14,19 @@ public class main_ex{
 		//on choisi une taille arbitraire
 		fenetre.setSize(1000,800);
 		//nous utiliserons un gestionnaire GridLayout 
-		GridLayout grille = new GridLayout(1, 3);
-		fenetre.setLayout(grille);
 		// l'application ne se fermera que si on clique sur 
 		fenetre.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		fenetre.setVisible(true);
 
-		main_ex.affichageChoixTaille(fenetre);
-	}
-	private static int[] affichageChoixTaille(JFrame fenetre){
-		// fonction pour la selection des lignes et des collones de l'aplication
-		paintChoix moins = new paintChoix(1);
-		paintChoix plus = new paintChoix(2);
-		nombre compte = new nombre();
-		JLabel neutre = new JLabel(compte.toString());
-		JPanel panneau = new JPanel();
-		observateurChoix ob1 = new observateurChoix(-1, moins, compte);
-		moins.addMouseListener(ob1);
-		observateurChoix ob2 = new observateurChoix(1, plus, compte);
-		plus.addMouseListener(ob2);
 
-		fenetre.add(moins);
-		fenetre.add(neutre);
-		fenetre.add(plus);
-		return (new int[3]);
+		// Choix des lignes/Collonnes/Bombe
+		nombreCollonnesLigneEtBombe choixCLB = new nombreCollonnesLigneEtBombe(fenetre);
+		fenetre.dispose();
+		fenetre=choixCLB.getJFrame();
+		JLabel panneau = new JLabel("ok");
+		panneau.setOpaque(true);
+		panneau.setBackground(new Color(255,0,0));
+		fenetre.add(panneau);
+		fenetre.add(panneau);
 	}
 }
\ No newline at end of file
diff --git a/nombreCollonnesLigneEtBombe.class b/nombreCollonnesLigneEtBombe.class
new file mode 100644
index 0000000000000000000000000000000000000000..6e42e38866d103208651cab237282e274ca48c66
GIT binary patch
literal 1476
zcmaKr+fEZv6o&sjGwrmc$iWke9OUG5rdSn3IV&gzQ}hBu#Jg!7o53<QWf1jojF(<$
zVj<DQ2k=RJ3gf?K0I@bUnSbxSX3hH6UTgKoudm+$OyYh9UC5`=iE)vuA_b9aBG*N3
zn3%{Qg}jN$3^KSWhbfU;BDY1RP0W~>RY;X<)oLvWJO#C?kf{0<*(XZ1?Gjgg+kGSI
z2MXp3FYv-Tt!Ii`?rZl=VQ0?|DustDb$8oitmK>@_~C-Wd8?H}ZbQLXu03afj-nrU
zk9LWuKXFS{TH1EJaQQeD!&(*Z_Vv&$zg%-)9Xh4xRE!gp?NXd$vf_nnQJPkcSBQ?1
zZ<_YVdq*M5{ZV)x<yD-v!Z|C~DqDrjdTqB}_Evn!Z!jRN?j6U70^g5QxGL4i;v(j<
zIFHj=oD=C5IU{mbqz4xiy8o@4!f7!U+`X{ypzc2}x^HW{p+uX{VgZX;+`-)}mPD3u
zPoeienJ9Ed!KyC%^0>6+l|y#Vl3JS9Du1#|OBEvugT<YS=&^0h4cv-XpN+nu=eqxn
z*H7?ku}GVWwXz%fHC8yo(}us}M;$b*XSoer<^XnaQj^f60^Dg*glJ_QqLt-|R@RCu
zq%_nt6ffONy~NW~ey4FAu@9hZvjNTS>~BD~jRp)m*+9b98%Wwt1LkM?DfCf?INE>-
zgKL_j-vMbsJL8{1KTpHVPH{JINGTms@^-I;{SrOed$ifyYky4ohuB1<Av7(bUF0pn
zTPApqPI7wK_+d_fL*5|Y7|?pUNxIycmmou)6TBnS30|U^*Gt|d^7_adAa9Vop}%-T
zt$9hZ<T=4RGM(Thn|UMTjgmJ;o<&}cJm)XoFh&mR*~eA!=5i1HBR6qdl96$oI@;1z
zYj(Xx*RhtaiDuUcx?XANYBak}(bZ!9@r1o#_jIN>^$n@b1Eh=JklAG3lDm;g9iVN^
z$?qfUbm>34^uc|!JG#D)Q;xBZ4(HSH<@z~qz%(arhVwhi+Ru?Oj{^U_lUO9p=6em!
EZ>zEPZ~y=R

literal 0
HcmV?d00001

diff --git a/nombreCollonnesLigneEtBombe.java b/nombreCollonnesLigneEtBombe.java
new file mode 100644
index 0000000..fcc95bb
--- /dev/null
+++ b/nombreCollonnesLigneEtBombe.java
@@ -0,0 +1,65 @@
+import java.awt.*;
+import javax.swing.*;
+
+public class nombreCollonnesLigneEtBombe{
+	private int collonne, ligne, bombe, max, min;
+	JFrame fenetre;
+	public nombreCollonnesLigneEtBombe(JFrame fenetre0){
+	 	this.min=4;
+		// il y a au minimun 4 ligne et 4 collonnes
+		this.max=30;
+		// il y a 30 ligne et collonne au max
+		this.collonne=1;
+		this.ligne=3;
+		this.bombe=0;
+		this.fenetre=fenetre0;
+	}
+	public void setCollonne(int n){
+		this.collonne=n;
+		if(this.collonne<this.min){
+			this.collonne=this.min;
+		}
+		if(this.collonne>this.max){
+			this.collonne=this.max;
+		}
+	}
+	public void setLigne(int n){
+		this.ligne=n;
+		if(this.ligne<this.min){
+			this.ligne=this.min;
+		}
+		if(this.ligne>this.max){
+			this.ligne=this.max;
+		}
+	}
+	public void setBombe(int n){
+		this.bombe=n;
+		if(this.bombe<this.min){
+			this.bombe=this.min;
+		}
+		if(this.bombe>this.max){
+			this.bombe=this.max;
+		}
+	}
+	public int getMax(){
+		return this.max;
+	}
+	public int getMin(){
+		return this.min;
+	}
+	public int getLignes(){
+		return this.ligne;
+	}
+	public int getCollonnes(){
+		return this.collonne;
+	}
+	public JFrame getJFrame(){
+		JFrame fen2 = new JFrame();
+		GridLayout grille = new GridLayout(this.ligne, this.collonne, 5, 5);
+		fen2.setLayout(grille);
+		fen2.setSize(1000,800);
+		fen2.setLocation(0,0);
+		fen2.setVisible(true);
+		return fen2;
+	}
+}
\ No newline at end of file
diff --git a/observateurChoix.class b/observateurChoix.class
index f1523bcb6de5b9fd5f57723a6698dcd3113f9ad4..b14945b3d95681d8ad4a9ad567595f9bada59f66 100644
GIT binary patch
literal 1161
zcmah{?M@R>5IwhF+in*qpUS6#g3DSc3MyJev6iH!q7g%)|F-Q_FSfhQ?iPqo;j5U?
zl4#-s_#{4sab~O3AjUs4duQgHv-iyX_T%$c0Bb1f$Y3Fb0bJu?a#-YG>9~%pjwF^e
zEOTDqkmInz;f9WzSmm&$;g*Km8tw?BYRZ$<K)H^9C<$my<y58J5-`e5TRB1DovV)W
z0*R{IXa-UsS$5n;#gkOi-bhCV9u-H*`}To-l=Baj^EUTn+p`-ykl0X;3N{6@X6aA5
z-xTMe7WV{V1-C}517+pNomQhFy_a^SP8Fl!wtQKrtLl4M6PPhWhMavE<m7>Lg4|Q?
z7x^>KMBVwK6G)He(;>Wgqyj#5o6kMz`+V#Rn=fQt+TmH>bz5FlZYvfZbt}H~4(vd-
zywH+mzOaD_tQ#1@uz?Yb8W_U`0~ax_;jV#u$Q#(ey1>xi?ijd_O#=@&Jj9lUM+OSm
zGVquInX__KVvbzhCV!t*_GxDVQ(@`M<;%(sXf2*V)MN`1-F4Bb?OJUoTpbx~mbj<Y
zl;3oHx}WCDU{`&hueezXdugha-KyPv8#<l#l&``q#LU->)_V_x%=F2)@F9iTnkU09
zX6bEaATWp+BJ31B;|QA-X7Ve{WEtfI%}rpE;uM{>X)aEA!a9MlCfkTu**2oqQX4UA
zJl0116Lkfqd4{k+A8GU>MSA_DH%w~d6zQ4Z(l5?BqQnYpSjR+ij7SFwO7RXf>kE>v
zPLLvAt_()M4~mZ+=zNGqJ4o|KtOKK`Is=Wk#*n644AI)BNzbBxS*1JV=?(&yPnB0l
zmz6U_6D68H&K>mk*!t<;K=VmL4PcJYv*)7;_Am52p%(~k5_;|w&EB%M=!vn_K$hZ_
N|BtQE*wv6@{wMmd-hu!C

delta 524
zcmaix%}&BV6ot>Ur9;cekNj9HqNoV1pqLm}MBhRacP?CXLkwZh+GRt04HFZ=#D$4l
zU&X|=E903$U}a1*=Vs>K@7z1nd*|Ce`}lc%18|BH7Y?=@q*2$ht!2kW1G_Hvu&<>l
zaUju>XvbF<uHBCY(db;ji{C5p=VPmYKp_LAu!gKc4ta@C;Se2(uEG(H6?zCJUm}`3
z7`3t0z78%0<nZ?HCK`;`D$NlDT$nJl5$7_rR}yK*Xft2HI<?4MpLvV16uv-&{uD;o
znZgXaQ&>+t7bsCHNKrGaRP@jC%aP8HnJzOqw`$YMV3`V^VR0EVq*fMgk}J}r%=(Qb
z)mu<`5~ekSt>X-GMP_*!z~j}bZ0nQu7W5c=jd{}qC-)a#*FS`KgLrk>yh>v|vRHM~
S&jU26oBx(61g!HDliDwfd@(}+

diff --git a/observateurChoix.java b/observateurChoix.java
index 72bbea4..10dfffe 100644
--- a/observateurChoix.java
+++ b/observateurChoix.java
@@ -3,21 +3,28 @@
 //Class pour la selection du nombre de collone et ligne et de Mine a la souris
 import java.awt.*;
 import java.awt.event.*;
+import javax.swing.*;
 
 public class observateurChoix implements MouseListener{
 	private int direction;
 	private paintChoix pinceau;
 	private nombre compte;
-	public observateurChoix(int direction0, paintChoix pinceau0, nombre compte0){
+	private JFrame fenetre;
+	public observateurChoix(int direction0, paintChoix pinceau0, nombre compte0, JFrame fenetre0){
 		this.direction=direction0;
 		// pour savoir si c'est l'observateur de la fleche de gauche ou droite
 		this.pinceau=pinceau0;
 		this.compte=compte0;
+		this.fenetre=fenetre0;
 	}
 	@Override
 	public void mouseClicked(MouseEvent evenement){
-		compte.addNombre(direction);
-
+		this.compte.addNombre(direction);
+		this.fenetre.dispose();
+		this.fenetre=new JFrame();
+		this.fenetre.setSize(1000,400);
+		this.fenetre.setLocation(0,0);
+		this.fenetre.setVisible(true);
 	}
 	@Override          // un bouton cliqué
 	public void mouseEntered(MouseEvent evenement){