From 2eb1862b9cb7db031316869febce0ab32a1d8ac3 Mon Sep 17 00:00:00 2001
From: Nabzzz <n.moukhlis@gmail.com>
Date: Mon, 14 Dec 2020 12:47:04 +0100
Subject: [PATCH] TCP fini Historique KO

---
 Implementation/src/RunnerTCPEcoute.class | Bin 4306 -> 4069 bytes
 Implementation/src/RunnerTCPEnvoi.class  | Bin 2666 -> 2579 bytes
 Implementation/src/TCPEchange.class      | Bin 2857 -> 2851 bytes
 Implementation/src/TCPEchange.java       |  32 +++++++++++++----------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Implementation/src/RunnerTCPEcoute.class b/Implementation/src/RunnerTCPEcoute.class
index dfc1313847bec74bc38533ec5bba308fa20e00a2..a029f97c2ae06e9b3971d0e84910ef019ce88d1e 100644
GIT binary patch
delta 1683
zcma)64Qx|Y7(L%x``+v8+ZY`TI|PbRA)B*0mnan#_hSGDLs+6jO>DMqD;w=>y8)Y0
zb%M%J)T=l^L=h<}3<{%z4FO>Y@-qY-pa{n3P!J>j#E2T=_uiI8Lo~L@{W<r1=brn$
z@7|*$dq!ycFSTz6Fa}@5wN;iR6+TgD&6O*3RKhQ!R+p^`)e2_n2#7V-;e%`Nu!4||
zFd_scztS7Iv!+ILS>5(J%u+C0#~joPRlZ5B!6P~z#axjuUo}j{V+46xur^fcQ}G0W
zG!6N9QpY^Z7tQiSwF*z`cm@l^Ir(;Zp^j(qoVZ>Y5`CVKQkyd&;E(vd)&8*0HB!Zk
z1WU=B8diFVm2y-pCM4$t12b6P74ntVj&vXi#R`@XQfGMUyzXjmpu$~J8S;6{6f9%O
zskMQCFI190r7%zz^lMm(<vOf*jgU3E$P5YiBJOEH(W$u9X1s1Jz9G&lSEe=NO&zNs
z6RhEgHxyB^S`1Y)My+8}1>OjodWSPJ$rlcLD|`-EuvW(u%y+Orv5NKL0o5tjA+BSi
zXi$e1w(8hyij`Ie!#)jHqgBNg_I;N>;15^&0~M}FpYL`;nrY1+bWbQQoL%axiTHy7
z1>3|)wVZZ~JlowV`!sxr{R$2kyB-wFY@JzM1c@{iAF*XJekzU<1{xW3mDRdt_FDBY
z{E1kgWoX9;Nn`|^5G~pWIw`ueOv@?4aB)N%E;8&6cLyIU6?W)cIuZu(*y#C_nSB}t
znLTfZ_dwV#?zdla;||8s83ERE^g7tkf)uPr8a6OzCuD;OSOiogv)nlmw@=C3ne7;t
zKweUgV|)S=m!QdMb9l^=BfA}w0guHo)nkiMqsY>83*8$r*in|iu*_B@JGBJL6PS@e
z&|`PnjcKik+Y@MrA;kb5TnafxSuq;azfn|l>8|MG#x{*x@YH5B8KR2}QOjlwjG?Qa
z`hw|XZtvWZ;}GV&)Zo8t@SRrEJ+J&-&Xi#edud{O?RW)Xb_bfLcVOvshLy}5_HV3P
z+VE-{R(LeS>`FuUEvEJzU5+8Y-%CuaNY049Z8}KlBd9UXg36P3IZ-M{^KhNH*>wqw
zogBNAXDGI?;^lUXO!YbB1SYV7LpB-S5=a<PZM{+djE?r7=Cbe@LPh@?_g`VRdi4Jt
z7c~;vYuBmoi1RC;N(E9qwwisM%PKBylDOw`<$|P4OyqGZms|ovum#y@#|`K}F1Fzo
zF5a<RlH-_Jzy&%U?_&~n;U4UP7ayPsd-)mMhk6`96Aoe#4k5Z2U0997T-V)b!!cey
z&a)Hz{~RZA3SZ$g&frU&<<UiaO@to4cV}n>zM)b0mfZM`?!b8}#`knDexLv@P#8bb
zJp4o}@iWEn3$4em)Q;b1KQ2-?{-7TGNf-Db{GF1@B$+Hy3aL^$*`(2=Nn^+^-A1}p
zK&es@4U|gAA(c~_G>g)udP<fW7;j{}iSgx(w=f=Otb?)LjCC`1hOx7B1)m=%#sD!U
zb+qLn1^0=n)S*RN>lEy|nKRvKW_1r|2Dp~5^IpEths^e{*&Z?5kIlB*Y>(qp=4#CQ
KjMH-(&c6V5hPVO%

delta 1856
zcmbVMX>b%(5dM0yyEB=cB(O;c2`WJmLy!uDREaCaO-Ya=#9#^KpEVi6!m=Co2n01N
z;*E0n6gfmi0~;<ONH!2KTv6`GAqYf3<URrxg-4ZEV$VRK=pV}Y@s6JEufP6Yzjv<v
z!4B%~=Gr;{kK=lkT44#R&@om<v4(MQ6XXHoT)}=NC4^*mV6Zz7^!eSBLVCYam)qld
z-lG#@GCGe@Az^|B4{QX>WS2WA!%KKzysOle<#Bn7vvR#b-R}>T1ofgpQwsHxpxfs)
zGL>kU1V5ooKo6SeZT}5#$r#i583jR6Wy!IXYM6{E;)*3bYbsul@uG&8(1&0j6?A*t
z0as8DF<5M|9?T2qp(3A=BCO$MOcPI9v+UFHs*Kk(ypA`-G;0q<$6FfS#tgB^`d|;E
zhIcj0G-`<T`hxDUW&J!J1+xjZr+p!Rp|0RP0;wtn;C&4rV6OPXIz*X@c^c+pff#1%
zZTm>WB77|7*it%uN{A0-=X%{iw~M*y=^Ye&#_|-Dl`v8TBV{XCDjIAl*~<v6{?@8s
zoL_ep$ymVv`5~`Y_ZJMv8{{qZxm7I3Dh*bAAyVXSN+s49n<_CvzAv#7Uusxqkhcbc
zE`Lx#RFunUkF4jE16ddawS1bx^gzH>tUF-ACJlL*>tKKp3O0+)a;j}QwrbcWPRi}t
z)NA<K1S|CT0=kNhs8_I4Bq+&gy9tRVTemMOcf_6Jl(ARzR>smHu|#<){-}y$I4+~n
z$nt||R_eQ)BuJzx_>n1+@hSL;(Av-=y(pAE@fI~Fo6m}-*fjM#_ZAre7e#BeJzWvq
z)l6y<&#66VkC?3{r?S%AxDpbPWX_C>eIPW5I`!f1-?FU@TYyTgb{S$>ym+i&@0IMc
zA2!1iu$+N{I3OlTB-!&aFL!nHjiP@{wqtM<L*}D8HP+!YSB|c=7!Eisj(lfqgjR`}
z_MC#znd=Z2MbQEzWJWPQ(sILTkF+!y)|e=KYmw{-L~*~dPgSD`MNt+-xznC%H@2^s
zc6$_W8Vd^tFvvUNsy&Tn30X@I&oOd~_4u$F3k|GK3@l4ET1U`uhv;IHUiq!PCEM}2
zxi2*Qml*!3R<k7j^G`SvhJ85mLS|Kq2*BPOQ8{`emK$}+nQ6?*_;0Df${MV8ss`z`
z25`05qNRju%uMmOg^?r3xI=2gUB8qF*RQbOMix+E0A7A&=6f`XUc)2JZ4J;m&i`LV
zhBUWHvUE{w;gIbHy=WNU7-2hZh23j-1pcA_E9?oUc6VI(p6I4(o2$41H*mpQFcFI6
zl`62yoEy1&8>JHx&)mk`u+*P#3$TV;axGH$I(OwW>4qBQU_E*=MlaN&FRM5Zn=m-c
zki$@ik=P0swqXLcBY=8L#SYBCPR!yobFmvsu?MTMm&5mQL<3*!{k%GW!#IfZID{sA
zhhKTuj3XrBC|Plg;&7Z=;RGe(6g|XOwhK;EHs9A=oS~68OQUgt!fsroGF+l*xI*)A
zl@_6iR^uA&#dSJ>pXnHG&{^E1oA`xV@SBu?-=#GCDRo4P)Qw+*o@9~wl2ytln^Z`$
zR7|W6X;LZ0N#ztT&87rtF*&3Pij|hIeHGiQ*}jAAN6C>cHL~#>8=KhJLJ2Xg$PtrB
zNn9H+3J#H<kfG+tcs5VQL`xr0p3rXSu2LBXA43e+Y>0jsM|keUufg~H9-J`8Q|5Tu
X9M72JIdi;#OYEz%-(_6IHKhIp@nZl3

diff --git a/Implementation/src/RunnerTCPEnvoi.class b/Implementation/src/RunnerTCPEnvoi.class
index 0065535b3b069458fe9fd11364cafaa62e10a91c..a2267ef7de31ecfe6f0f83b8d5fa9d6cf5d68320 100644
GIT binary patch
delta 537
zcmXAlOGuPa6vuye{J!r_(=4hnaUe(s7d>W}AY7!YXo&C?NsHPw41>)yG^JzOOMBYG
zXWeqNbW9^=t;9zN6*=HSXc@F=7Z`0?6%?ACvBf#}fBxtBzuzlOrElf$;yd6FFXw&V
ztOMIRlDXFSg=49%T(&cHu{){QzGrVsI({i0?ark#QAsxXxXcyJRX^8EuU+Hx`RV6|
zDcI4ix45mj<L52|=CfVz-1qZ<hbG{JD!dGtHm6FBn4}Y`8uRlAM`0&2*{-CI{fudz
zm}#e4jT_fFr>0Cuhj(gTC<2@7Gx75s(UWI8vpuFsht*TlqYvA8JWQCkI-w>_tv9;+
znP{<4JQthB5kCRyryxgOkI8!5Ro*OlWBu*>UQ^?eJKeTaMq+g?y)M@qte_Qkxmjj|
zmdm|Jsfe$^j+BD-dm#@>^2`E9cMQ5Tmt&Viaigxx4F6}2xQt3-m&@ZKR_nZ66r+XX
zq?x0{vfQ{_&B`WNWnF<08IwW}P-|XoY3>`8!XXwI<_#l!V3d!H^NBoPM9^2MU1f?N
zBJmdm)|r(VGfGKUL8jE>^ENhV(rZ*`vTMXNCpL&+X#zq>q-CMf%>2RmP4JYK3*@h6
IrP;&WKVr3z6aWAK

delta 672
zcmZutO-vI}5dI!*ciUw#LMrh<v=WR3X{s?EjHkw8peUkIV>r3AYqNFjVs~5lQLCtc
zfC@f9C_gF!^^XHa-@!yrUi4t%(St`5W1<IRLK=znZA?6Qm^bsjnfYesqu#Gx>D}*_
zuL11A@{07uncbk7jhbm0DeY`p4P_KfSK4)zz~QfLlTd;#8Ql;FoaYqH5^<hjQ$ooo
zL0w74gH1_GO{LNumKtm5jH(@$W+WvX#YGueTq3A6RqMa(PJdhNaS6Q$ToG|q#x-aJ
zrN=By*G$Dy(<uT^T(w$FH61f-#(o(CxK0~g!O|fNi?|`<CT`JQ*KT1{#%)mg%2mC?
zUU*!_guSpQX;|8+u8^*~F-cI~kjxmGFSae6^qo;nC9b-WqXk!W<&2D3yTKLJ4O5k{
z9Wx^C(VfCZGEXDIY4VUVp`QK{{Nz5Z5ksyAe98h%h*7dg-;2S`OI%JT2=d$>LE!HK
zKngr^a$iBK+($^B8t!nmz3w@D3|0>7>KHon#UCyC;&&T#FkG-bw;G1a41FzudWJz8
z3owlQt6>=9@h+Y_`3(Cj?l3gle}-tj=(UllzsNp@X`ZNJn9IX?a0L#8eK>$aNMIgI
ze9<1Pk}|R$clkMs{DcW?r4dhacOTF9^NIm1V-PPegf|$*Tdwy9jNl_i@reum85G|z
zhMyS6Dkf3H6cLakWtioh)1(}8c+6S1KyvSmh)Ar#A;MTgSj6F05j~Cqnofv(I@jw7
IFD${+KVKoeF8}}l

diff --git a/Implementation/src/TCPEchange.class b/Implementation/src/TCPEchange.class
index c5f4e52b980f3dc4410e8d92005c1d7944d50a07..755f7d9f3b8dcbeaa795583c4a81836df673a5e4 100644
GIT binary patch
delta 34
pcmZ1}wpeV#aVAl*ko?jTg<|#8;u3{|#Ny&qh2)~t&5xMeIRMyd3`+n2

delta 40
vcmZ21wo+`vaVBY*ko?jTg<|#8;u3{|#Ny(^&4*ShBo_gx6`SucxpM#jMU4>X

diff --git a/Implementation/src/TCPEchange.java b/Implementation/src/TCPEchange.java
index f8404ee..63b3c23 100644
--- a/Implementation/src/TCPEchange.java
+++ b/Implementation/src/TCPEchange.java
@@ -36,7 +36,7 @@ public class TCPEchange {
 		}catch(InterruptedException e) {
 			System.out.println("Un thread s'est arrete brusquement");
 		}
-    	System.out.println("Tout s'est passé crème");
+    	System.out.println("Tout s'est passe creme");
     	app.getHist(User2.getPseudo()).afficher10derniers(); 
 		
 	}
@@ -126,23 +126,27 @@ class RunnerTCPEnvoi implements Runnable {
     	}
         MessageHorodate mh = new MessageHorodate(Destinataire,app.getMe(),msg,1);
         if(msg.equals("--STOP--")) {
-        	mh = new MessageHorodate(Destinataire,app.getMe(),msg,0);
+        	mh = new MessageHorodate(Destinataire,app.getMe(),msg,0); // ENVOYER JUSTE --STOP-- SUFFIT
         	out.println(mh);
         	out.flush();
         	break;
         }
-        while(!app.isHistoriqueAvailable()) {
+       /* while(!app.isHistoriqueAvailable()) {
 			try{wait();
 			}catch(InterruptedException e) {}
-		}
-		app.setHistoriqueAvailable(false);
-        Historique h = app.getHist(Destinataire.getPseudo());
-		h.addMessage(mh);
+		}*/
+		//app.setHistoriqueAvailable(false);
+        synchronized( this.app.getMapHistorique()) {
+        	 Historique h = app.getHist(Destinataire.getPseudo());
+     		 h.addMessage(mh);
+     		 app.majHistorique(h);
+        }
+     
 		// on update la liste des historiques de app 
-		app.majHistorique(h);
+	
         //app.majHistorique2(mh.toString(),Destinataire.getPseudo());
-		app.setHistoriqueAvailable(false);
-		notifyAll();
+		//app.setHistoriqueAvailable(false);
+		//notifyAll();
         out.println(mh);
         System.out.println("Envoi d'un mesage");
         out.flush();
@@ -201,17 +205,17 @@ class RunnerTCPEcoute implements Runnable {
 	            			MessageHorodate mh = MessageHorodate.stringToMessageHorodate(msg);
 	            			System.out.println("Type du message:"+mh.getType());
 	            			if(mh.getType()==1) {
-	            			while(!app.isHistoriqueAvailable()) {
+	            			/*while(!app.isHistoriqueAvailable()) {
 	            				try{wait();
 	            				}catch(InterruptedException e) {}
 	            			}
-	            			app.setHistoriqueAvailable(false);
+	            			app.setHistoriqueAvailable(false);*/
 	            			System.out.println("Historique mis à jour lors de la reception");		
 	            			Historique h = app.getHist(mh.getSource().getPseudo());
 	            			h.addMessage(mh);
 	            			app.majHistorique(h);
-	            			app.setHistoriqueAvailable(true);
-	            			notifyAll();
+	            			//app.setHistoriqueAvailable(true);
+	            			//notifyAll();
 	            			//app.majHistorique2(mh,mh.getSource().getPseudo());
 	            			}
 	            			else if(mh.getType()==0) {