From 99feee7e8b28909d40e655256b33cd581f292cc7 Mon Sep 17 00:00:00 2001 From: alartigu Date: Mon, 14 Dec 2020 13:27:40 +0100 Subject: [PATCH] Corrections bugs suite au merge --- Implementation/.classpath | 9 ++--- Implementation/src/ChatApp.class | Bin 5520 -> 0 bytes .../src/{ => Controller}/ChatApp.java | 32 +++--------------- .../src/{ => Controller}/Historique.java | 2 ++ .../{ => Controller}/ListUtilisateurs.java | 2 ++ .../src/{ => Controller}/MessageHorodate.java | 2 ++ .../{ => Controller}/Modification_Pseudo.java | 2 ++ .../src/{ => Controller}/Utilisateur.java | 2 ++ Implementation/src/Historique.class | Bin 1871 -> 0 bytes Implementation/src/ListUtilisateurs.class | Bin 2224 -> 0 bytes Implementation/src/MessageHorodate.class | Bin 3227 -> 0 bytes .../src/Protocoles/RunnerEcouteTCP.java | 16 +++++++++ .../src/Protocoles/RunnerEcouteUDP.java | 16 +++++++++ .../src/{ => Protocoles}/TCPEchange.java | 5 +++ .../src/{ => Protocoles}/UDPEchange.java | 4 +++ Implementation/src/Runner.class | Bin 420 -> 0 bytes Implementation/src/RunnerEcouteTCP.class | Bin 380 -> 0 bytes Implementation/src/RunnerEcouteUDP.class | Bin 380 -> 0 bytes Implementation/src/RunnerTCPEcoute.class | Bin 4069 -> 0 bytes Implementation/src/RunnerTCPEnvoi.class | Bin 2579 -> 0 bytes Implementation/src/RunnerUDP.class | Bin 3842 -> 0 bytes Implementation/src/TCPEchange.class | Bin 2851 -> 0 bytes Implementation/src/UDPEchange.class | Bin 5713 -> 0 bytes Implementation/src/Utilisateur.class | Bin 2578 -> 0 bytes .../src/{ => View}/View_Accueil.java | 6 ++++ .../src/{ => View}/View_Clavardage.java | 8 +++-- Implementation/src/{ => View}/View_Menu.java | 3 ++ .../View}/jgoodies-forms-1.8.0-sources.jar | Bin .../{ => src/View}/jgoodies-forms-1.8.0.jar | Bin 29 files changed, 72 insertions(+), 37 deletions(-) delete mode 100644 Implementation/src/ChatApp.class rename Implementation/src/{ => Controller}/ChatApp.java (94%) rename Implementation/src/{ => Controller}/Historique.java (98%) rename Implementation/src/{ => Controller}/ListUtilisateurs.java (99%) rename Implementation/src/{ => Controller}/MessageHorodate.java (99%) rename Implementation/src/{ => Controller}/Modification_Pseudo.java (98%) rename Implementation/src/{ => Controller}/Utilisateur.java (98%) delete mode 100644 Implementation/src/Historique.class delete mode 100644 Implementation/src/ListUtilisateurs.class delete mode 100644 Implementation/src/MessageHorodate.class create mode 100644 Implementation/src/Protocoles/RunnerEcouteTCP.java create mode 100644 Implementation/src/Protocoles/RunnerEcouteUDP.java rename Implementation/src/{ => Protocoles}/TCPEchange.java (99%) rename Implementation/src/{ => Protocoles}/UDPEchange.java (99%) delete mode 100644 Implementation/src/Runner.class delete mode 100644 Implementation/src/RunnerEcouteTCP.class delete mode 100644 Implementation/src/RunnerEcouteUDP.class delete mode 100644 Implementation/src/RunnerTCPEcoute.class delete mode 100644 Implementation/src/RunnerTCPEnvoi.class delete mode 100644 Implementation/src/RunnerUDP.class delete mode 100644 Implementation/src/TCPEchange.class delete mode 100644 Implementation/src/UDPEchange.class delete mode 100644 Implementation/src/Utilisateur.class rename Implementation/src/{ => View}/View_Accueil.java (98%) rename Implementation/src/{ => View}/View_Clavardage.java (97%) rename Implementation/src/{ => View}/View_Menu.java (99%) rename Implementation/{ => src/View}/jgoodies-forms-1.8.0-sources.jar (100%) rename Implementation/{ => src/View}/jgoodies-forms-1.8.0.jar (100%) diff --git a/Implementation/.classpath b/Implementation/.classpath index 9b5db30..e6f7288 100644 --- a/Implementation/.classpath +++ b/Implementation/.classpath @@ -1,15 +1,10 @@ - -<<<<<<< HEAD - -======= - + + - ->>>>>>> View diff --git a/Implementation/src/ChatApp.class b/Implementation/src/ChatApp.class deleted file mode 100644 index ecac7fc4fc20a5dddccf558b8a08a997750b5c42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5520 zcmb7I3wRt=75;Cs$!s>0q}e7ZZK2&lDVxoU2BpxHLYoIoNzy{nmb55Lcc;m;o84t* zHna*BkWYCDJ^%p)ABgw>p-4Arg9xY~4-w=kiUNZ2srY^&2>y3wHkl2J-zTM$>78@W zJ?B6FdE7kw_Q87q9532JC_$-$fQmAd3(VQ6jcaX5Ej7}%Vf#)!ZVQyJGE#=UTA(!A zxVZvBR453ksDvt@bdGBFnoLGu?xu%2-BlQP+(J2U(k3AlrdL>Uz z#c2u#RSaQMLAnj@v21;erlzIW_3myX-L{cbw5dSX#yY~x*)1wg$FRV>F>ROLnNGzu zdy8R@^3Affl+E-haML^5@20mD!Zw_t-~%c?h%=eM4*G=$l8703d@@Cg{NUxaZkAwZ zDz+m|QWE4YLghh5@R-W^xH~kGUrD@e&{gcf2y?+vKTCN&q>ge!#ZF1L8mU~jY$K)F znqlfvOH!IXB27rCNJ}Y6xxsYSjPrXh&Q@W9fGAuY+LNIwbV%t1I9J7alHox+?IIC|z+M@c^Jfv(1M1yeC>oG@T&Uus zG8)z0sqwV2)=X=OxMta93_SlUeJzBK<6;GusJIlD74T4DoOle{T71`#sYw*;@o5#G!BuVq z+;rZoC5;5ptj`D6(Y-dEPU>2U@x2D0RdB6}>u`O(RQV-XvA4UjRFrk2vNed$3oPtU zCyX5iDNVZ~8K-tcOg(E^h8||4+AHhm7gT%^Ut+mnRM+^rhAc5f`bHIQQt=hs%u~l4 z?Yik!)}x9Lx=5UyfZw9xYcebqR=%VK@eP5sY=3M)W9&S6Yqhw9Rd0@@(%Er6nbadm z7GXV-(5;BffqVyyI1SHQDLdh zMR1zkxmMu2vLfCqaM=H-h%$NZ$M+O`U&RmbKmj+r2FskvXr`s}pR=k$zT_}}@5c{S zJcNgt+2fKy8+HgZFq3`J^VB(A?onylj|8Gc94WFzTKQu+vin9yzb1^mBTQ-Fm{!!Hp!hK;yJQ@3nJKH^+^*&bj1iX4h$12G{J4v;6Cv zZbEnp&q~9eBXOgB-kinyQ;FyCGX+0a@dAD!uym$r7BS8{fFG-G8@D!JX3V!A58oe8Q1?6R2so>YMoEqw+Q?KG#ua?cd zIEdfTuzt;Co`mo^{-EHGD*l8&7t}R3?iAF|&T2`bUC@Z~y@K`QuaxOZbK1yCd;hND zANZ$R`{kq}5b=ASXH(zI6hk*x;0+c3mTrdgskr>;gl?t`&ZR-TC2;r1dUYxcMIAb7gf08$f4T7U`NkBc%^y$F}R{kUNxfGTb>MONpo-1$l6F zfkeAp@JeTXo~v?t1P$?YhNh#>2vsKZX=DVJ=exxJWBZt95S)hSws-r2d};_b$E7jY_98p!KlWr_DVA*ZMi=3A#$xX{kg~x0d#$)4Q@6 z|Ad!9?AM;uGSYz{xFsVbf+ETe(>247kRaZ@vh;N(HOta1MKlQ<`5w*| zqNIqHe0BCCUjQhJf(t2@uqu>rhzjt@J15^t>QMk zHR~Ldb1!gWYyu({*bgN(g{t8R)a=I`F))d`0WK^UZfb6sz@huGICdB2#Bw+yhoktR ziIOe*(YlW+ged2887lZ}q|!xvi=ht9Xg~|+%T`3uhGS^nY8tpiC?eA_oC7#-YJft$U}x6=dZi6u8TA3%2r?!}6MDfA9YJLTW- zDS-*}uMFIYjZFu!85|?F@_l|FhqH1>c(0>5?DAg6W?nNn*ez1>9I3y>HLhj0aWRBw zLKmvhO^|!&>&ZAC>$uX34Oow@=)+m)=j1*>vqLzOp^-+vLC+=pd!(5;e3<5a1n6&` z#07P@Xc8a01;GIxdc`C@mBZE7p@$ZRKS%p#Hr(KC;L45eY6mg=vV7&wugVQycQ@Ra z!#8h1ja>N_R|1o`V;|WN=C2COdg@Je#rJ{inC1Rd9gg+xF6Z5%yvGZKwJdbdm UM>@}=L?fj_l!%FD(Te&11?aAo00000 diff --git a/Implementation/src/ChatApp.java b/Implementation/src/Controller/ChatApp.java similarity index 94% rename from Implementation/src/ChatApp.java rename to Implementation/src/Controller/ChatApp.java index fa4e60e..ff0cabe 100644 --- a/Implementation/src/ChatApp.java +++ b/Implementation/src/Controller/ChatApp.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.io.IOException; import java.net.DatagramSocket; import java.net.InetAddress; @@ -13,6 +15,7 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import src.Protocoles.*; /** *

@@ -31,8 +34,8 @@ public class ChatApp { /* ChatApp est associe a un utilisateur */ private Utilisateur me; - - /** + + /** * Constructeur de l'application de chat * * @param pseudo Pseudo de l'utilisateur @@ -235,28 +238,3 @@ public class ChatApp { } -class RunnerEcouteUDP implements Runnable { - ChatApp app ; - public RunnerEcouteUDP(ChatApp app) { - this.app = app ; - } - @Override - public void run() { - - UDPEchange.ecouteUDP(app); - - } -} - -class RunnerEcouteTCP implements Runnable { - ChatApp app ; - public RunnerEcouteTCP(ChatApp app) { - this.app = app ; - } - @Override - public void run() { - - TCPEchange.ecouteTCP(app); - - } -} diff --git a/Implementation/src/Historique.java b/Implementation/src/Controller/Historique.java similarity index 98% rename from Implementation/src/Historique.java rename to Implementation/src/Controller/Historique.java index 7e35e2f..270502a 100644 --- a/Implementation/src/Historique.java +++ b/Implementation/src/Controller/Historique.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.util.ArrayList; /** diff --git a/Implementation/src/ListUtilisateurs.java b/Implementation/src/Controller/ListUtilisateurs.java similarity index 99% rename from Implementation/src/ListUtilisateurs.java rename to Implementation/src/Controller/ListUtilisateurs.java index bdd8efa..edaa31a 100644 --- a/Implementation/src/ListUtilisateurs.java +++ b/Implementation/src/Controller/ListUtilisateurs.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.util.ArrayList; public class ListUtilisateurs { diff --git a/Implementation/src/MessageHorodate.java b/Implementation/src/Controller/MessageHorodate.java similarity index 99% rename from Implementation/src/MessageHorodate.java rename to Implementation/src/Controller/MessageHorodate.java index 7aeb573..1d86472 100644 --- a/Implementation/src/MessageHorodate.java +++ b/Implementation/src/Controller/MessageHorodate.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/Implementation/src/Modification_Pseudo.java b/Implementation/src/Controller/Modification_Pseudo.java similarity index 98% rename from Implementation/src/Modification_Pseudo.java rename to Implementation/src/Controller/Modification_Pseudo.java index 0ebc13e..e34b110 100644 --- a/Implementation/src/Modification_Pseudo.java +++ b/Implementation/src/Controller/Modification_Pseudo.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.awt.BorderLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/Implementation/src/Utilisateur.java b/Implementation/src/Controller/Utilisateur.java similarity index 98% rename from Implementation/src/Utilisateur.java rename to Implementation/src/Controller/Utilisateur.java index 37a4c26..9a35547 100644 --- a/Implementation/src/Utilisateur.java +++ b/Implementation/src/Controller/Utilisateur.java @@ -1,3 +1,5 @@ +package src.Controller; + import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/Implementation/src/Historique.class b/Implementation/src/Historique.class deleted file mode 100644 index 52ce906d409408ee41daf8b6e69660d89acdbadc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1871 zcmaJ?TTdHT5dID}EMAsNO%g%^>86FmHUVQ28iEOJAf-4pgw|Xd(%Zp%VsBXQy1VO0 z?sI=cpWBDNwpDQ?B1Ki7s{W)ZYCFff#CAZHrE{5``DVU3GvmMhIerP?4h$7th$x6^ z=td92&{O`5r!8)m(hm=wilWcZvt-()zswLxBzI%zMNEOJp${5^x^8;Dp1Vi_Z zC)^A}e}2a|Ez{$^sJU5bF`!{ksy8*}6uiYS+;mhU#q>Sb<@G!PsTe{;>Yvka9v2wm zE%PCBXL5#6PZD&NcLi_t0VWh$j z#j0Z$xxZ)nWjc92w|!4S=8|pM2tg&}oQ9jYMOY;vS$FCMC6HC{9>d^<@H`@U@(?QK zv7k{2Ei%N&xZu>>A_X;=NOruxiY44tu&m*Ie8AAxRvUrgmM3b4!*GraTh;eE#Cfb} zSe2$Kc?pAvgW*HTdW~VB{hdRz(?Dlnlly{MvbkS#Dee%Zvm%%BZ?MiTXBoy59Sl1z z$z6J$RmYH-$eXsYj8p5?r;nGv~ z7kpkk+~Cy{%pmb=rgSjaYM2?BODgac$MHSi<<$-0mmR|!?7@zTUF<3NOlI&A!$d3X zrv1!06zL$1K`E{ABDHv(;rsSPhl&B{I=2l=coTWYIjmK)r?cNC=`h@`SH&6XkK6Ra z8f<^R5Mq^ER>AZIb>(B~%ABRwb*@viHDOtzB5Yr0x(H65ZgAV9W^Hw4FTS9O#Pmg- zF=#p47VfIWJx_QFzGj#_m6Wr%DmY-c^8czdLW9KMD$TYoYS;*^G(YLoB?n`3r-4UB z{ZaG0jwqeGk)!niNmj@rLi?rEbFkFZ5tP)8BlM?UVCd0v#E&ri3w>qynAQtqC)X%O z5W__b&`hMMNMG~V2=T6wUm1s*`VGTV4UFuy?ByQ>(x`v(OpgK&Pu<@nVG-lbi7Y9M)xX@Dd{>QX2fQh!8WcwUO!9lQJk z?#Sy{1DW43-@xq#vYQ=}dy7#*oF0uH<9-wEyDs+Azkf;&UCkWKP zAxZNpgWFi3-vb(3`^2nFcbn$Z7HRh*@(LOD3XJ_tpCb6A3HK=qv=0#QHnH1puAk#e NlBsn63LHg@{s)7l)0_YR diff --git a/Implementation/src/ListUtilisateurs.class b/Implementation/src/ListUtilisateurs.class deleted file mode 100644 index e6a1cf678d19e09a025a9a34e668aa3285b4746a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2224 zcmZuyZBr9h6n-v5HwmkN3WzUtMO#Bc2)HJOaSVL|U2P5o zVrA*id9qe?1db(!0|yPbdEd3{GGBLLK*wTF7--lUG(suTy!QpqZ;Nmo^oY;)$t@Dc84nAY(zKG}`_ z8BMEX->EV6u)ZuOGsoKSnVK}K*(mM_T%VV=Z~E4zG>X!2rEj^?HEOouuZV!)qtYKNliefFQFq)R_Me$g`Xb{DGJVRAbv+0aR%X!94L&bff z;|tYRQQv7w9m`u~+w^NL%lQ0$EjhkR%84v%Ysx9ox;tmta<*1omF~Q`TH(o|yl)ns z&X^m`{Z79I>6~qEh$bPs+|!3w+aQD0KzVjr)hRaGIB>CF5AV~}i)z?xY?!WZQEG1T zPR%XIX-mQEQ?A-eYE*R<&QgL7&PBnM6O6xKa@PS9QGRnka$V)g7&`d{^dw(FB!7jr z{0gxj5r4@ufdbdVv;dWg@MSk*Jf*JT>q&Z4QI025b@bHHU&o2((33wP&I4mfdFg2L z(nD{(7(gG2ykX=4I+7@b?#eWd@FJ}o)Ny`h(gMGucQ(yH^nLL;4y0df zZT}@+?8NA2UchPg`58_m0}0Nr6wWnb>F9imsD|M)Zx}?NypzLs+^cu_&Yy5?CX76r z4kM58BZz!6G8kdtn~fCvmEB;Zjt`b1jc0Y-+S>kOgqPo<>w8Qcxm(BmR{BZA8DfNi z(v&8{bqv>W5#yX*w{Qhh95wfF4G%e=6g54F{DVUpP7?7YB0fyWYp_C|z6l{u??rpL z4Q)!nqb6i(u!VLoLX4j#)!qEo_Uj~Zw@?mIVqg-dh$q3xbP0EeXBrc@%hP+@-QP{- z)qu=(<`INz${n(sf919v{#y64s+Sj+-PZ@Qld99i7JsO z`=5&Sy~;0B`A1a#F;#zpQBDU%<&N@00a#AtF!VY@tJ=P(^m;_SLI}B3DEZ_z^m->@D9FH|p7{sUH1_#6NL diff --git a/Implementation/src/MessageHorodate.class b/Implementation/src/MessageHorodate.class deleted file mode 100644 index 823952415082c6a57791da816c45beac4d879560..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3227 zcmaJ@TXz#x6#h<|cG6*>C2g&x+=?x<2@q%jG3BBZYYRz1TUrW=Oq-#ECYg|#R*Is6 zpn_Kv6}-!fFFxp6kh;oR`~V;PK|YAznHicZ=HbjaJNtb5zR&*a-^GUjp2J-gRj5|r z(@=w2frfMXoE}c<>FMy1$#ce(El|5BkxtnA1gg8b$5i-Hr$E)P44OcF%&;td+88vm zW?Z)oQY^zhXjpb4t=oDcOG-mm^q8GUCM^Cxo9%NkR%ob~0Ci*^F=w+=hD2VeA%I2! zl~fN|pt&oWS8Bx0CeqUcQP3=~!ueyC=;4DzSJ8xOiSx9ER;&_ODV58B1t8%zXm|!4v~9Z7w)(E_BI5#d>P8Kl&?V54(r1i* zGd-o-;|cpLcb2WEZA+lHf<;9z-Q^ZbJ%SoSQja?7;W{kdQD2Q#p7p1*J`7LLc)4-Q6BsfcB%=)?0edmAPE0S)~) z$jHl3l|(-9*sy%)RSe)I1%n!faEPYo<>w`{0?s%p2y~R^PPyTJM43LSieVg4a8$#~ zc%`VY9y_|m$|Mskuu3uOK3NHPRG=ynQ89*b1;;f^;Do@kg6g7+ET=+7%_3@hg^(3z zu8LRjnu1drUdL(rFP{NJY1^1KvI72$p0x}fpHP#mm`Nt57ged}Fya~voRJl6>si~9 zh46&iCjyM&P8q|5jOICkZN-hFs6xuUGvt{fMioo)sd$Q6q8qP}=End*4 z8?yq+Qtt_r%aM$4Xt;oR_8(a}h0UeG<>_e_T z?%CHxXEJ7Pj~PfvZJSCYZIubav_4>(Hg(oBF~dG<#;y8Ve5B%Ie4^k}*)Kk0)#P(2 zk)AVWjIdh)Zf_jWr))DzXWlL}&|`E#2laG3X;>Xm)0~;j^p(e?fKqf(np1(j&>ik8 z*H_rBJcxchnH)*jMxP%ySrDS|Rf|M~>c^KXKH)maC49y77gDHu{6-#SBXN&+m~z5% zqf7aYkE#$V=|kzXk?l|FmStE9eiY~|b6O=|DEL`m?fAZqUs#J=FYMAxH*UA!7Vv71RtPjVgXO( z&=PF+-ACIWWE6Ol>slyWSFy{tp$@CDf)8yYscW$g9avAUxA?CsVgpr@D%MK)mOO?W zQ@~fahBpK*q1WS2di;9=>!P7x4(*HR1e|U6A~rkQduUt47LU4Z5j(u?vx|tx?e9b` z)O0J&3{%T(93r+;UJp;bWZgk7KA4{5Fu9~ojStW_5!kzc{f^WZa(FQh=&HSsQ^bCn z{x;rmFAEj5JOj6afx|h(qM_=Zzz8?Ko*~D30SaA0iVc8OCv3!71E?j(2&p z1J#dsjq~ELg3Agxw2cV`0}7f*;&9de59d80hZ@hRYxpG{HNktB$-A-EAsSpcG;)>6 zSdc0AF;ki;2`_Cqw|V@9&}J!gicB16D?yv3(B}!AB`3$23eee7=vgvxsI3H@Erp&Z z^hI*MhpQE!+kT_jZlbylxx~{oyzjAgdZkbor1RQ}D$q^C%PjvZWafb6T`Ba*T&d#M z$iykyV=Z#`T&d#MsrU^R#0S){3LoM+zZ;q3H+cJVXZ^xiZ#nDN&U)Kfzs2|DRmt}Q Je!?$k{SODp*D(M9 diff --git a/Implementation/src/Protocoles/RunnerEcouteTCP.java b/Implementation/src/Protocoles/RunnerEcouteTCP.java new file mode 100644 index 0000000..2706ea4 --- /dev/null +++ b/Implementation/src/Protocoles/RunnerEcouteTCP.java @@ -0,0 +1,16 @@ +package src.Protocoles; + +import src.Controller.ChatApp; + +public class RunnerEcouteTCP implements Runnable { + ChatApp app ; + public RunnerEcouteTCP(ChatApp app) { + this.app = app ; + } + @Override + public void run() { + + TCPEchange.ecouteTCP(app); + + } +} \ No newline at end of file diff --git a/Implementation/src/Protocoles/RunnerEcouteUDP.java b/Implementation/src/Protocoles/RunnerEcouteUDP.java new file mode 100644 index 0000000..7810123 --- /dev/null +++ b/Implementation/src/Protocoles/RunnerEcouteUDP.java @@ -0,0 +1,16 @@ +package src.Protocoles; + +import src.Controller.ChatApp; + +public class RunnerEcouteUDP implements Runnable { + ChatApp app ; + public RunnerEcouteUDP(ChatApp app) { + this.app = app ; + } + @Override + public void run() { + + UDPEchange.ecouteUDP(app); + + } +} \ No newline at end of file diff --git a/Implementation/src/TCPEchange.java b/Implementation/src/Protocoles/TCPEchange.java similarity index 99% rename from Implementation/src/TCPEchange.java rename to Implementation/src/Protocoles/TCPEchange.java index c7df02b..77c8be5 100644 --- a/Implementation/src/TCPEchange.java +++ b/Implementation/src/Protocoles/TCPEchange.java @@ -1,3 +1,5 @@ +package src.Protocoles; + import java.io.InputStream; import java.io.PrintStream; import java.io.PrintWriter; @@ -10,6 +12,9 @@ import java.util.NoSuchElementException; import java.util.Scanner; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + +import src.Controller.*; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/Implementation/src/UDPEchange.java b/Implementation/src/Protocoles/UDPEchange.java similarity index 99% rename from Implementation/src/UDPEchange.java rename to Implementation/src/Protocoles/UDPEchange.java index ab158df..4652a0d 100644 --- a/Implementation/src/UDPEchange.java +++ b/Implementation/src/Protocoles/UDPEchange.java @@ -1,3 +1,5 @@ +package src.Protocoles; + import java.io.IOException; import java.net.DatagramPacket; @@ -12,6 +14,8 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + +import src.Controller.*; /** *

* Classe representant les echanges UDP entre utilisateurs. diff --git a/Implementation/src/Runner.class b/Implementation/src/Runner.class deleted file mode 100644 index 27df8ff011be924ceb0570d15843a661e8915718..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmZWkO-sW-6r4@cu8C_?!5`pFJt+Pd z@x>MeJ?sqg-kV|e>GR@V4dw9??*j~m2@Seq{twL7?ucY&S7@SSgY!la}#(z&9JhTz)SrkD+Jrxx#y>H@TQ|cy!#P<>u#e)yv6RC&d zw^+pe1UI$TsvM?yU8!+=O(Izo4BjZ7%Idr*PJDC_aC8OM5Hk2A8m3dqSEN#n zPxSsR{RzhgL)cU?ugGLh7AMZ{Xau87tIPT!QRVpW!Y*q~@wa(hrs^UyTCwbKWP-3y z%`Gsj(}HPFXm|@D;U=+&xJA>CUcsWn7w{)y3|oX9*o0qj@C^??bh-_9={ullGTYHJ V_#0Lmm-$>^0Z!KpJG8g3`wOfQMTGzW diff --git a/Implementation/src/RunnerEcouteUDP.class b/Implementation/src/RunnerEcouteUDP.class deleted file mode 100644 index 7cf0325bbf4875c96babd201e61eef7881ea04b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmYLFy-ve07(6Fw+yv8<@Xy4+&<2Ul2!w=6nJPg1ba#S9QxzwQ65b051Y+O;cokqk z?1;~zB7^Vq*>~rY-+o?R0qkPKhXtF%5oo|=Xiwyw>`kS<>7B+Cm6QzbeyY>*fWhu` zM;@B+IDCOQ2!`Oi(pnXRB&$kwb#z7|ndc1Nus@dNVV>{#Xd&Qe3oIaH@JTdC#+0u} zrD~t({9C#sjwOb$u3}!1@suo1Kf9(83{$O6s@qrI7HvO*-xFh4A#A}We20S%c=)8#Rk$aw4$;;prz1mN`iu|JS%afw`~UktZce;D^aB7(@S7kMl&A>kC`FmTq^-twqcLIFTN=AIZ#83{Kv|1rTi#NE zlA79e<G`tl_N!=eP3Rvm84TpP#lPULQZ>d^dg2LCnGhDk3^& z<81;{eB|TR2&hS^G-11lN+)?Ae^^GJmYw3*Qsa_m^K1-dAhgPOqubu^vq1DXr$=KTDv`J zHMcCmUZ|r9?+~aWt^x*u=>@O~7Kmyg-YHSNOF|z-UdSTDP>;ouX$b>4#*{P5FllHO zfaJPF$5LD>pvk@Hux#%2)Dg>tq1CWVK#4|!XhoZf6*^Yp-Q&~1-vfbCH<_@Q2=j|= z&{Y#RO+!1=t<7{j%Qig2N}1BedvtW5lWA{mOB)IIto_avMRV<@5X+}a#~NJ0hz%J1 zW~*bz3~#;V_3_R14BMmZykby_A?aqOFAPE8N~v?5fL%m#qTsnv@@ZEXmV#@XGOj0Xb zN_&VMXtVS>CS%=R1e^x4HmtH-&q-O^(q?49awErgAKM?<>ZDVVgp+b3aWj%IA}KRw zCS{>Zb6a%u!D64Gxo$GXsHK`IcBN;rx6rF}im>{TP%)sxmdRLAu$B{C3|U_%cwJ|d_e3!YE&xjBLxJwquO(7cV(r}PDvaGk)iuJKX{mh@=CyPU7*dZPF zN@F3zXE0M2F5*0}Ei>iHu6tO=5g$t|;kfK~b8uM0Q3h%yhrHXzS(cxUDuxP1VSCq# zYx0$);sI*+M~mM;Mx5o8eUsSLvZV!DowzJP+3Z)R2R8HEAfv=CkV`2YH`H3E(bjzZ>N^fGQm1A@d%tK7_KI zrob)4P)W0Yx)V`+eLk*$JvRGcy6k3(V<+ou^xI7f~-$D&TSPf8oZL~Zic83Gu z(r{T=4QoT_A)S0tEnI#S>!U%U3J0@z-w+Id==_hsel$wBaS{l%QWAT!*qVhCtq51h z&$Lgk$l}@zs(hh+D9eZi88LMf*Y!S{C3!TZl$g8^|E>#{`oIHCp$|*IyN}{yN3ciQ zyII-`FvJ<09M$qUU(0p5ZwlSwf5#;M7bSmjb-o(%(C8i_AHtV>_lB{T(cb4rTY4au z1B3X=Aifq2N;mG1dcQ@zdDLYYw2nf__@=A!OKJu+qf6fzx1?nlG>v@UW4JY{Ko4$#a*h$FCa@y_BNirhyc6DBLA26IyXuXF~fj&l-gj_T(i7uFv<#LCf> zHf0y?_n)j6<&bipBI`zxbtCF(Q*n=l$n@#EW=Myvzf_tD;0H69J`4Xv#EEuGEO2vP4uUmk3>H6O)t< zFQT0G? diff --git a/Implementation/src/RunnerTCPEnvoi.class b/Implementation/src/RunnerTCPEnvoi.class deleted file mode 100644 index a2267ef7de31ecfe6f0f83b8d5fa9d6cf5d68320..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2579 zcmZuzTTm276g>?Kv#f(4K8Ym31S2f27>!ZEJQOfKc*!D)dFZe^umj7?GCQLfHSrbm z@R^rJV>Fr%zO}-Vid9J^R+%cR@|n;4rOMBIB~?jj%;{MccF~Wer@QaHeeSuZZ*%v* z?|%TW7T*MrhkOM-6$L01C>_xDYISkV?5}I@9nd3=K;b&WG@O?O@~dmQ75D{ac}A{d z#OuNl%`|np2m#DcpsFaw%$z9U{Ygh3638=5fw?W7r(xA?HWRKBc5Gc6Y6w6n$&a`VK(L{n5$wQ<_pa1bmh5SjUCPAUdv$oWJF+g+Bq9pgLEuc@dOqM6!%)@ zfaTiKXTL5WcFEl*RXl~K1$=SC9AtLsAg1org{{b-?sy>=Jnn{|ncSvP5o|jav5GbFbGRG#(pS|f%#eRvo?r+ zElLAejrB5x4Ww%-g>=}4H25Z|vu5%z$wDqTRwaPfWQLm_$!$V(eryq_Xrurg!!j$Q zOI)+kiE$d`w=OjmKnq$Gw5e!E$Mn*rqX;MoS;)B5_5@b%?r_^M`-xUTCkxoBCzD#g zzR9w!DAf=^7q%$#d#7cR?gGq2T0~XovP%^7#oc5~-rIf^G4T5N zO?|{^F-(G=lc{d@(F%C8Dm_Hr?QFBcZY0(m*N1e|X&#B_30Vd|*eU#>P`InTBNPh2 zLPEi?3LDAXrsC1d)}#-+TAX`1=a2QvCm98+*y#d|m* z5SZHHM2kizR3aH{nWh+z|1Nx>;zNAI&N8G8WP6uXXP+ahe2VF1Re4C4`t#$Az`~8X zJ)}FXtyf0fMx{XFxhrN{`zC^h`2`kGiH&8O zQ`j2(77H$6%`I%};b#?pl_`YFdJ4wzdTUS~FD>6nTdrK1!XBEeOd&G*@E3lSrO?+h z3Z-=v7pBFi^~n&mW$_fui(rB|C)DP92QXH4OtR+zaC+K)mS6l;r7)7hp?Y7rkCsQ| zYPm0k_d~Zw5vVT+-7YWqk&9j!3H9UzR1ad6TsfUyX-wfP4J%UkWE8&E8)T=6&A%N3 zxQ^SnL%#0dt~cJp0|9)>%1YKxkYB)rpB<_MNi2rLO1N0To>Px~SdS4#I>1=(Fxo+M z;1I&>8!;TlFpkjwDAjR{T071foaAYza1*ET9an$CS^SFg_>DUHox6YV#Cy1mKUuTC zaRm=>jYzHvL9Z)Bu?hiy!xjYt_vQa{)_pW7*!B=1_!P|M0%uatLc!I4QTPwacPh+- L#lJ@9JY4@DQj?#u diff --git a/Implementation/src/RunnerUDP.class b/Implementation/src/RunnerUDP.class deleted file mode 100644 index 7b65e740b2213bca30ba0deb998e33e61e13b00b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3842 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