From 26a0c1341c6b639acf9018776b2dce3eefb183de Mon Sep 17 00:00:00 2001 From: "Elise.B" Date: Tue, 2 Feb 2021 16:28:12 +0100 Subject: [PATCH] fix qq trucs et encore pb --- chatGit/bin/controller/Agent.class | Bin 10965 -> 11118 bytes chatGit/bin/controller/DataBase.class | Bin 8598 -> 8624 bytes chatGit/bin/gui/FenetreConnexion$1.class | Bin 551 -> 551 bytes chatGit/bin/gui/FenetreConnexion.class | Bin 4760 -> 5179 bytes chatGit/bin/gui/FenetreMenu$3$1.class | Bin 1081 -> 0 bytes chatGit/bin/gui/FenetreMenu$3$2.class | Bin 1861 -> 0 bytes chatGit/bin/gui/FenetreMenu$4$1.class | Bin 936 -> 0 bytes chatGit/bin/gui/FenetreMenu$4$2.class | Bin 1676 -> 0 bytes chatGit/bin/gui/FenetreModifPseudo.class | Bin 3452 -> 3452 bytes chatGit/bin/gui/panda.png | Bin 5890 -> 0 bytes chatGit/bin/model/MessageAffichage.class | Bin 1816 -> 1821 bytes chatGit/bin/model/MessageDeconnexion.class | Bin 955 -> 0 bytes chatGit/bin/model/MessagePseudo.class | Bin 1029 -> 1273 bytes chatGit/bin/network/TCPServer.class | Bin 2303 -> 2404 bytes chatGit/bin/network/UDPOutput.class | Bin 2609 -> 2281 bytes chatGit/bin/server/Server.class | Bin 514 -> 0 bytes chatGit/src/controller/Agent.java | 38 ++++++++++++--------- chatGit/src/controller/DataBase.java | 10 +++--- chatGit/src/gui/FenetreConnexion.java | 30 ++++++++++++---- chatGit/src/gui/FenetreModifPseudo.java | 2 +- chatGit/src/gui/panda.png | Bin 5890 -> 0 bytes chatGit/src/model/MessageDeconnexion.java | 26 -------------- chatGit/src/model/MessagePseudo.java | 12 ++++++- chatGit/src/network/TCPServer.java | 4 +++ chatGit/src/network/UDPOutput.java | 10 ++++-- chatGit/src/server/Server.java | 18 ---------- 26 files changed, 73 insertions(+), 77 deletions(-) delete mode 100644 chatGit/bin/gui/FenetreMenu$3$1.class delete mode 100644 chatGit/bin/gui/FenetreMenu$3$2.class delete mode 100644 chatGit/bin/gui/FenetreMenu$4$1.class delete mode 100644 chatGit/bin/gui/FenetreMenu$4$2.class delete mode 100644 chatGit/bin/gui/panda.png delete mode 100644 chatGit/bin/model/MessageDeconnexion.class delete mode 100644 chatGit/bin/server/Server.class delete mode 100644 chatGit/src/gui/panda.png delete mode 100644 chatGit/src/model/MessageDeconnexion.java delete mode 100644 chatGit/src/server/Server.java diff --git a/chatGit/bin/controller/Agent.class b/chatGit/bin/controller/Agent.class index ccd221c5bf21e8fa0a3b68ec768f89c75fa5ee17..6e44182e64575c9eb1e1e075b5e426c8e7c29aab 100644 GIT binary patch delta 3752 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 D`Y9Tq diff --git a/chatGit/bin/controller/DataBase.class b/chatGit/bin/controller/DataBase.class index badaa284b7ebb5ad28ad030903c3190689366487..1520d67584a02e28252447adb52a503b5227f827 100644 GIT binary patch delta 1000 zcmZXSS!`5w6vlt2`_#^KIy0Rzbe%$Jr&8Kdk)@PU%2s4pq=Z-`Fv3(os6dNC0u4~Y z@&JThw(uZP(O_^X-1uYyNT_>M5)&7Q8d0Md7otYR8vT612VZXP{r`XG`_B2!J=QwV zIxytPFIko7NiJWV+`K7S*4`GMv8cTzzQFZo52aYOm zlRbA%j4EegddTsoWlz0x*l48vt7(Mhu1!3asO{dkuJ*s%Ofw_!{|o1W_c_aTR{N60 zLDI-4n=n2K2r!&diWosLm6SR+ef|06r0d(mNW4^ttt3LZb2#_Awi;3yLk4xKtEZ5$ zx^K|QJ>1JU8ugsY1X`KMOnu$YWR}vzDyGmyGh1n)mud7d-5vA?EH;}I+GI9|Eanm- zt|sO&iup2Fz$6JYvxw;|?ho9octCIm!=zZqGWE1v&#fblI)|B-5}YGs@SB89?5Q&>=q{)`Z~5v^mfs`qIZbiDSDUaKGC~H?-9LM^nRx< z|3>V9=!2pUi9Rg4U$i6oi0GrDkBdGb`lRTnvn+hN_z7ipN)=Dy=PC97wDLZ!Y@Z>< z8K?+fj-P;90i(ioSMG0Nf@?Ir}%j9xJB7=(g zHAVZnLVtt%cvIQE#bVx8T!V_~9UkIch43Da^FG_Ssu4eMJ0cMq_n{;|lH|vl<`ZrE znk28Qi%;eLnI`#M+xkN5xWN*>kwDY?b^#`5YmiwP_ACmiDa{t?{F4|`cQ^>M(yq1CAG6`B1Ve=5NY>F(0@#bZY z`G}jJ4$EVu1?aROdo9F4y`Qi!r>uZyZ5U@Q!hjXJsU3$w6o#Jz1KpUV?M&&E4t8h<7y=BmmI9?fX$w*)P*T$bFr~r(8mvMqL_?}j zg%T45E~_y?!WJNq!o~Q5KP-kt!MG$uK?N5e;15BgMyOjX;*gYw5)d6`M&avj{Sq2y;}nUPb0g zs6ok3E1}WJ%eohvFM5I6eny3x)L65qXGJZNY?7x~LLJMTc=p}+a*;1cw?(=yNq2>G zS4y{48Ewi~CEeB1ebp%s-j276eogf2qSuM;5dDVeH$|@(-6?vb=(n8O(2wzVL~jzk zS+pa1tLSZ_w~O8(dY9;TMZYIH>a5P$7kOW%?NP>F0_;=&`(^b3ia01^4?AP~pNbw8 zaZI*$$=2hV?u4Q)!#T-lK9IE^y20FRt2?dIXC!o1+dD@;KEls=iCka;7v=9Ix&E;X z{X`~SmT^~@r&tr8%BIhFk{wsdkVgRu1@-+YvrpIQr0XIad%Y!+FN zB^F|X`M?C8HexVe1Fo delta 23 fcmZ3^vYchZ3P#3BlUFiYvrb`PW|%tpC8HexU*QL* diff --git a/chatGit/bin/gui/FenetreConnexion.class b/chatGit/bin/gui/FenetreConnexion.class index 3a07b1687c1b4dc03aabc81ae817603ed2977b4f..b7fa2afc7b59a6de2e2a89c725f2d0f125866364 100644 GIT binary patch delta 2238 zcmaJ?d3+O95dNk~cDI{tErCK?um(9w3pEy`Vy!^Sq1<4pSnrUoWg*Sh-7N)CkXDiza8y^ng|2i~{heWIc$IGaT6UuJ)KJ3H^q+i$-4-t4+TokP@T_V0WU zz>yT%t{&kFnpmRY9Mls0w(ivEQ9a`5^(snno`#u-i;2FFbOA1saiLh^EA%YI#bTqc zQo2OLa;y;V`y!dEaD|M^2?eXi=8DrL*>fdU3qvZBgodlJMqDEeC|%3@N6iK!Her!r zJGzSXxK_pnLbk123w0}Wyna@*ZaW$_Vw3n>8dZ2bZj^BYA!mMgVK@{G#~MO4i#fDW z!%etZRLViRMVu-JN3`NL8MhL8CKnoJXr^VvoEpc{!@Tx(988d#Tvs%vVk_>Hu}$19 z=Z(7yJqZUTXKI{qWWj7J9MKhQCnyZ0D&iPtsxWbnh8?(<~OdiceC|Eskn*@)KbmV&PsN3|K7Z#G*&6}!>T9lq7@9ljS| zWgcC*8$W9J32WT6OqL4s?AC6NTb@}meq~`aG#jCbIM9XyjWWbu_0SCRihllr4DyIk{`uKisgsZv znYh8fobp7mR^sieQ9m(98zAD^FmHdZ@9LahWdqAp3Zl1418J~KgZP|v*H(?Iuv*86 z8jhjc8Wquyd-iA%svQI`iqHea$j4B=N-+i@j6)e_VFbb$2?Ix>38SzGN8wa%2^uR3 zSd7zfI^Q$c+mk)L*!~f|7H`0r`%T>xTXW^%Dt@!R7h>O zF0eU)E%{Occa#S1c4vI8P%EUQC)c|HWhFb};N;piU?1;P7)S&z>7ZthLdQkcNQ zouGC+){0%ZzV&WQI^?Nj$m9PTvbhsobsc!hGrSEiwBfbVcI-+4c)K)#_bZfmzLc-9 z`DwYFE3e1l?w+04T^IPW9be}w34D{l4;}c~^(UeHQkO5aFx`!)(tZu(xt z+V{XMZySd3cs%Q;23e>@F6JN)Cvx;j9Dg!~@T$YPjw89i$FM4^5#fTL$z^ZA37Chu ztkU^>orMKxK_lXb#j%3h@*0-zCU$Rz#Xa7^HZ0-(cn+S&dDw;Xxzk*TJ-7(_a4|_( zMwwVa0j#7xxQq_LDk|bHRxz%iGF(aJ5LAV$={Rl()3GiotECK=rIVHwTO^Up!tzmk zGAX=W26CxCspRKO^QaJONpo4DzLdq5k2A}nY;rYN%|R*aQPfZl^6sRVA0mGYNz~nII}r7@E6&O>-d0PpE_?X z9Ko%E4o?1V+IYQ TQoi%Ije>mVA05Vn*M0sQGU6Qd delta 1830 zcmZuxX>=1+6#gDrUNV`qr5jCw5`~^>At$mGDIAt=hYAR_MX4y9n9iwF)0vP=p)4hU zidw;iL0QBF#TG=+mXKB|;D#vTF5-%y;J%`wh_>EId!#>{bLPD}ckcb(cb9iNF4>SR z9PZq^AHW!v)gp|t*gRMwVkVaAb1mMSWmwJ;VQ|&>7WnGD;f1nN?JZD4RZ^(L=hxKG zA`vUFQjc23TW=9@D^}@eEq-ewR&(5`&$A9Pt-)RT3Tuw_9ufCqt-i}T*t3qo5m2jT zrMO-WYm$Kbv4LYfLqb>zEs#RqtEBmLQdkqQ5u5Z*>*ZOS@es#@3`qtJZ@@<+$`_Gq zt%!&5h+e_n>`}dryQghM6UXBWDRDzt_09~*idL?LBp=x}V;}<$8mfRIU^{kjJkiUz zbVhN#UkYlns)%?}KgrXF>|)5MxKR$f5G+W^yUl<7fR z>PU_~#M7@TT1X89D45CBl0v3!c!r~$!Kp~vLN#=gw?b6|VG(=Lp^vra7Vg6Vj{OWa zjUx9>4hBU$hvyBtYDg;&`59QL9sBU2h?fk#&CnN-t$-+A7LklYdXs&GEs9q~9L8(< z3Hy+XUdNjpZ%~B2_!RjxUx6)FDjSy8+z;yrBY=B-G6tx#1I3Q<)!-e>67 zE9)91uezX44p0Z!@B#5CP?Z|BF60()6a$RqV-cU=Q+=;6uH+~_6LA7-jj&Xz0{IH) zhtEZPffS0ZN)89ru*7kiA+fqn_LfMLo{%(MQtAYp!dFIIU+cpine1DAnqwsUUSIBT zvmf;>j&zQnjr#qf?{{3BgNpEoW_aq`+U@0t(vs8x6-Ys8lH2y424#=7;g+-Rm`t3gG^fONm%(xVN zF%&L%X!T+uhNBQ8QHIg*VGLx9MG*O@$2fgf;voBJSm;>L^=L?(5gDBuMO6%ouc6(L zYkSEPddXUkTx+AJ9St$u+(ICIa2>6AaMC&vA|@k~4$namMxhwvQ9{xbOv4qJjj5<2 zDTwJ`B(!abKRf8OiyURy>frC5FdbmKe6BnKvPkEVGh#w&SU0Z0$g_vK=wgh*mt?iWfX> zIGAs7St2pK;)&r%K6hDMoTPX1tZCMbxXkeFz|qR&V{Q1*#bfv=hT{Zf=wmq9fm4+( zOB=q-w>4u*{Ge~*2aV6?29fU!BILEL8M)n>A9^%DH6z0aMQcJ*ZZy(^cBT!#wZMc7 zxG|UpLm{?dN6)^G8qE~X^I~LCI?Abl6_oL-kw#g~z_sKv2iaudp^T1*7ySlIf}c=i zvZx^`fLbUBQT7`#p9WzVo1xL{iY%mq7GWnAV-J?l^Ec5 zm_TJeAE6TaQOp>*aH8R4eaMg#36huzoSEssBG|epEfx;O(a2%q%tG^sV|zkUC+2WO z8ELwR-2a%A(M3InzNrw%A*H*us8{=t1Vo(Xc4q4Ut88PAsTVprfdT;K%8b?2pljm6 z8;wdY6XT6)XHJ&TgEqDY&C$UU38-&7OTGXl&`)431g!rL25_(p<^qPm#4_o3AJ(4@ Spq(ZHOQfA1Hjoyx@%=C6|H}jb diff --git a/chatGit/bin/gui/FenetreMenu$3$1.class b/chatGit/bin/gui/FenetreMenu$3$1.class deleted file mode 100644 index 076cda8762a3889e8af7a71a6dba8ce6b89669eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1081 zcmaJ=T~8B16g|@xwp|xnzA7pd(1N8PTg2}oh7gFD7EB;KJ8TCSTy~q?DexEkB|eiN z7)^XM24nn3#yd-6gf?z6J2Piy&OP_co%7$HzXEuImj+@Cy*mwQFAGnoKvad-$j|0y z3?vvbd;EagF86lqwXHqjCVfB>asCw*6pV)EI^fmA1Jp={(C5n}V?#>fIK{qm}Xd)hRkCd0ZPlBGFJSSVtWNcj%sq>XcYPX)f~iojmb7*XbMU;8~x z-W6KcwGSmcFrcqE@=N;m%G%PABkH;mEX?Yt>3SeNwXV4HZX@6hCBUc+{?B2Cm>|;r zi#?ZF>B71qvMR4P@7G-S8-XL1rLKU?KLtFkRgr=v&vE^b+^Pz->(?ywBgp^D$o-uc&M@@>$?DW8>|;9B zg&|T_qEk9bmec{?2|XwL2UW;VjNw-lb>xD%8I@v?-bchRiUc0hYmeb6ouw!L)<7vi h;4_-W@Em386I9!CctN8c!Um|^nSzY9r+d35opEnN?D=^)L(4{Pn6~NPWSB`0 z3G=djnKDCU(W!`0FvL|Th{~^5RE#1PLl`Gj9LG3AI4zgP3#KhrTa7K@ZtyKjFeD3( z!L2fPP1)}bMkFJKiK9SLvjjEH0|nNFTXo!qAYSLw0YH6Fq$Md>E>n)-EM8Y|j^WgB z0aToa#-P-MFGXP(PiHzIgKU(1mjuhjZ~-X=ZxX>HN~?Ga7a5}5Fofr&t}t92CS+!i zQ*IP#WEEtH*FaDemodd~jMs>Tl*({y-*qfYxcY(|BS15_qCh9>49=;zidlv+qfT}b z?z$&h6^AtKD%DRb^FU&FTg5xLM#oiM-k{8kAI^DRj^-4+%W(R@rX6AKv`nia+$i27 z6K*;!SF^>g)(no+OizoE^>0Wcy#Epal%RRsQgIs#3AYWTHlvqd=!W=m^X?R#Rj>jlQE53 zuHcn#rnHtPG^6fN1dZE{Ul*=MfMO`)Qw5)p@CR90+A~BzP{pP^I^HDv`X!$m4>w$H z2nC-pOa|-ajajAxETZ1qrr?Vg@k~cwS?f(OFmlG(js(Lm8x(~D1+dn|xi5=mLZsBDMmIS!R($LQ-i z^~2Q0vzMRZM0V;a64`wu9|sF3=siLUfgf>--f|Ny#c7fK75XJuYYMD>yI$m>(3=i zwEPiKoo?gf#{@nKfjS;^+s}!NM4b(&{zRic6Utw34ZmU$zoCTR$zgxcosAXJ112gfs1>)Nl<|CDb;l^_TGP9MU&{o= zpz;CyP{#L~B`70aa=m+hPJ?he6TmGhzwkp} zy<{j?uc+6$44JK{FY;iRwqPJ9*Y|Dg$RRj0P z0!{tjs)hU7G^6j!kC7xxZPYB(u|}YLK$^61UKFZ03IY+kn>t63HXdrf*U7u;WL>`i zBR)(2GmF7|7mZ?1w0-?P#lOaDT@xj>+o2aklCsjxx=k)}NbRxIkdpb1XV&cmeaHM%t^))}+D_61h`6f>Wbo>}^4sRuYiiN02H zH!+8Kiby2NV}uW51iO9$>l?10pz;-WzvCjVp5nm;>I^Xgeqb6uQNekFUQRgJV|0+2 lE;a~1g9i1c@Cc9T%+M$`@q}(A$}Q5Vm*%L~Q`#xme*hO=(v<)J diff --git a/chatGit/bin/gui/FenetreMenu$4$2.class b/chatGit/bin/gui/FenetreMenu$4$2.class deleted file mode 100644 index c7352268c73812ad2f4f4955462ff295957d0aa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1676 zcmZ`(Yje{^6g}&N$TlKzO?b40qNXm`CPWY@DK(`86BnqRq;={N=xZadZBa$*k=6_PnE9>6hJ5k&A#~ zOtsuFbB_F$_c$&vBsRF0X}H3xGaM~zU-#{B)1^CZt%&=oq)*6f?6T{->I%b5c8HtT z{g93bmPOEz!MdQhPGlp1_8>_Mny^Bymc%iHP6_S`j#=v_N;2x$;ypNL%aqc)G3^QjLP7Wh7HyBeP zfh_U{aunBqQxm5#&9IL*DGE)MBYhP}&l7z=IiE+;PLP&9E} z=P|Bi7g-V|+%WKI5A=@mm)g39mbouX+{7(PXxNgQ70Miueck1rY%=8fR8^GgZRu;y z`v7!{G}2cYiv}u`q+R-oNHejdE5N9`VOxeGNnC%f$@n57V=!;zEshmZPd8&0_X5G| zKTcbnP*_e&k_U_XQnf^25g-Oe<5(BeaQRaUpmh8%fOH@Jo~%hFRmGhjD!d&Ppn36|*JQ-4@RD^2Dx`{XO7K3@yr#@Bmco+(*>iD7v z)eRXcSkx&-XzW8QmC~&PNTqe-pk5iHu^%R#9*8<;j4XkP{ON}n&rd%@D!+~NFOlIP zdXJGI@DzvXt$!j@9KlhVnFi5w^8%xhn@0WtQd@YtLi6||y!!yBrnhkBCtTgxIR6-P ztLaPIDA383EnItqg;$4L`0O#VJL^;1SpFI5o%Q*2mCQA|5omN%IyC%7@81c{AGnA= zQN&-U;&0UO4+Ne^$gM8A9&(_8FX@~p!?*Yfw~3Th@{>U9C29ulj8iyY(?$&6kO62l Xh41h^eWht{ie~+2GW5e~#E|_DdjY8c diff --git a/chatGit/bin/gui/FenetreModifPseudo.class b/chatGit/bin/gui/FenetreModifPseudo.class index 00f3f47cf24108bfb96fca069c292c79d9070129..44c377f5e49d79e8395463cc7ded665caf4d4ac3 100644 GIT binary patch delta 18 Zcmew(^+#$$5(le7X>qE~=5!8GRscpF1|a|d delta 18 Zcmew(^+#$$5(le}LTPd8=5!8GRscm{1|a|d diff --git a/chatGit/bin/gui/panda.png b/chatGit/bin/gui/panda.png deleted file mode 100644 index 8525465b2b129869d0192d95ca85945a07c79199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5890 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 G^#1@0EL*?; diff --git a/chatGit/bin/model/MessageAffichage.class b/chatGit/bin/model/MessageAffichage.class index ca1a317f26dd29416a1fb8eef1b27595f6246cb8..6afb11a123ce558941b396f0f0834e023b6a3b9f 100644 GIT binary patch delta 28 jcmbQiH8VI=!jtT$~E@kIJ}27Jfj# z7n4awZBEvEgCJNf+ZzdJFA1TEIxGuKv<062Z{6N#0|GZJ7|@&87HBQ;i^NhE=}EgrH%+jPCY?T$&!FA)jvwzkn$!4>mba^4 zV$-v?E@6LFnH~DulnKgd(b|TE9kk()=XIHnE_wKKY3)*Vw)V)XDeD$)D?Bdt$>K^b z?vT|`79-Os=KyyrTt4kwqv3tS<`*(*U=SPxY^lap8BjGAMEQ_BOzKq8rfBb&h+I)H j6_^e+byS6}I_rO-vlQGx;Qm@5_P;>fwLl&yxDWpT7azO` diff --git a/chatGit/bin/model/MessagePseudo.class b/chatGit/bin/model/MessagePseudo.class index 4e3dd756190346a024c924e504f8515245435797..30cc222b735de41707708fcdaaaec4cea87520db 100644 GIT binary patch literal 1273 zcmb7?O>fgc5Qg7PoH!p&ljf@pA!(sN9j77^7Y;?0DiD&TfRKX1g^Qc4f>G*3j)TNM z;=lnUA|wv{0Dcr=W^HKFxCdm(J3Biw`^-E0>-UeJ03PE+M?#=-IUCDq?}c0}oQZt3 zkjwE*hbBThTlYC$69oUrME zKN6_NcP@~RqMpe`AfV4@exMREY=zEz@Nq7qkqKlcGWe@^)$D8wMusqZLQjr0m7tER6|wi=lgs$W%po&I&I z3d+o*fL-ih4@I<4q7`@>R>D3Sw4<81g(ls@)@`y9%4!h}6SnEgKvUKMSzNcRn3=Mz zsC8vAcZTX5s_vM&M?0>Yvc948g^UD&fx_5XQ7}dr5WxuC#SwWp`HZ3&C2e)7&8yaO z%DYDh`>H}cjQZD3TEX$f_i#U|wGLALOhwm0nz0}caJ&W5B&Dx|9ME-#H-PX&8N`fL fq9!JFA%6AR{EZ44mHwgN|Flxho9kt zf`j0LAK*uc`s8tHM8v#t)09ES8SH24||U`K+<`k#jQY4G!;hUEMXl!5MVSGc*RS zb%y2_b#sT$7IZ#q{5WW$j?37_E=OJ$_u-<=9(Ur5$K9pX;a5}E6|RzaJnXS0J9)Uu zmZ2<(P-67tdif=Ev0oze`765_gRf|OWPE1dANlnhr%S)}u%+Ir) z?8qn<<*6CQ#n8_Xz|Js%kwF5NT9A@p5HXpDVG2VIBLiD{YKd=gIwOM=PV+afWBbm? ztjo|lxr05JwNHB+!^FuC*ku_fP5#HOZm-6`&Y;d9z@Wh(&7jGk$e_ib#-Poh%b>&H r3?zLR^cad6^ns!b3_%PWK(YiVs{^D#tOkaulT$bx*{1<{ObpWj@%urK diff --git a/chatGit/bin/server/Server.class b/chatGit/bin/server/Server.class deleted file mode 100644 index 15076ff40de63837fbd56f82a41af4ac159373cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmZWl%SyvQ6g|_#KGM{-QR}M<-Sq)xEsC3fP$(+26kJZ?&`zxrnWXi*Tol2DAK*uc zcalO8H}`oScjo)&^9#Tw+9ebiYKhP*q5V;oO0XFkbH3vKf~%>2AI?RTGT5&?oiTXB z?P`>2sis$E7i)sB0Wov2AXbWKGFA-Dp%Up^te^dH@DR*+N{r&QR5HC`Xm$Pz4!RT4 z4B{u@z(Uhbhf;~V5tu8bqTm~bskzZu%; zOeO~X=e=}HIawx=mLU!-~mMsHbsYGl>}Vu60Jp(vz&%Q98pICnH|e2V^|=A eV>C84eVUsc+X@%6K{FFG*BC%9#&AMi0jIzIK3gvU diff --git a/chatGit/src/controller/Agent.java b/chatGit/src/controller/Agent.java index 709b8c3..71fcb05 100644 --- a/chatGit/src/controller/Agent.java +++ b/chatGit/src/controller/Agent.java @@ -134,7 +134,7 @@ public class Agent implements PropertyChangeListener{ switch(msg.getTypeMessage()) { case 0 : //System.out.println("Envoi message présentation"); - MessagePseudo msgPresentation = new MessagePseudo(this.localAddress, msg.getAddressSrc(), this.user.getPort(), msg.getPortSrc(), 1, this.user.getPseudo(), this.user.getId()); + MessagePseudo msgPresentation = new MessagePseudo(this.localAddress, msg.getAddressSrc(), this.user.getPort(), msg.getPortSrc(), 1, this.user.getPseudo(), this.user.getId(), ""); BOut.send(msgPresentation, msg.getAddressSrc(), msg.getPortSrc()); break; case 1 : @@ -149,11 +149,12 @@ public class Agent implements PropertyChangeListener{ } } break; + case 2 : MessagePseudo messageDeconnexion = (MessagePseudo) msg; boolean pseudoExiste = Request.sendPseudo(messageDeconnexion.getPseudo(), "pseudoOK"); - if(!pseudoExiste){ - Request.sendDeconnexion(Integer.toString(messageDeconnexion.getId()),messageDeconnexion.getPseudo(), "deconnexion"); + if(pseudoExiste){ + //Request.sendDeconnexion(Integer.toString(messageDeconnexion.getId()),messageDeconnexion.getPseudo(), "deconnexion"); FenetreMenu.getCb().removeItem(messageDeconnexion.getPseudo()); } @@ -164,25 +165,26 @@ public class Agent implements PropertyChangeListener{ if(FenetreChat.isOuvert()&&FenetreChat.getDest().getPseudo().equals(messageDeconnexion.getPseudo())) { FenetreChat.fermer(); } + break; case 3 : MessagePseudo messageNewPseudo = (MessagePseudo) msg; //Contact contact = list.findContact(messageNewPseudo.getPseudo()); //int id = this.db.getIdFromPseudo(contact.getPseudo()); for(int i = 0 ; i msg_recus = BIn.getListMessage(); @@ -197,7 +199,7 @@ public class Agent implements PropertyChangeListener{ Request.sendUser(pseudo, this.localAddress.toString(), Integer.toString(App.portSrc), "addUser"); int id = db.addUser(pseudo, login); this.user.setId(id); - MessagePseudo msgPresentation = new MessagePseudo(this.localAddress, this.broadcast, this.user.getPort(), App.portDest, 1, this.user.getPseudo(), this.user.getId()); + MessagePseudo msgPresentation = new MessagePseudo(this.localAddress, this.broadcast, this.user.getPort(), App.portDest, 1, this.user.getPseudo(), this.user.getId(), ""); BOut.send(msgPresentation, this.broadcast, App.portDest); this.user.setStatut("En ligne"); //System.out.println("Connexion réussie avec le pseudo : "+pseudo); @@ -208,7 +210,7 @@ public class Agent implements PropertyChangeListener{ } public boolean connectConnexion(String pseudo, String login) throws IOException, InterruptedException { - MessagePseudo msg_connexion = new MessagePseudo(this.localAddress, this.broadcast, this.user.getPort(), App.portDest, 0, "", this.user.getId()); + MessagePseudo msg_connexion = new MessagePseudo(this.localAddress, this.broadcast, this.user.getPort(), App.portDest, 0, "", this.user.getId(), ""); BOut.send(msg_connexion, this.broadcast, App.portDest); Thread.sleep(2000); ArrayList msg_recus = BIn.getListMessage(); @@ -221,7 +223,7 @@ public class Agent implements PropertyChangeListener{ Request.sendUser(pseudo, this.localAddress.toString(), Integer.toString(App.portSrc), "addUser"); int id = db.getIdFromLogin(login); this.user.setId(id); - MessagePseudo msgPresentation = new MessagePseudo(this.localAddress, this.broadcast, this.user.getPort(), App.portDest, 1, this.user.getPseudo(), this.user.getId()); + MessagePseudo msgPresentation = new MessagePseudo(this.localAddress, this.broadcast, this.user.getPort(), App.portDest, 1, this.user.getPseudo(), this.user.getId(), ""); BOut.send(msgPresentation, this.broadcast, App.portDest); db.updateStatus(id, "En ligne"); this.user.setStatut("En ligne"); @@ -247,8 +249,12 @@ public class Agent implements PropertyChangeListener{ public void deconnexion() throws IOException { Request.sendDeconnexion(Integer.toString(this.user.getId()),this.user.getPseudo(), "deconnexion"); - MessagePseudo msgDeconnexion = new MessagePseudo(this.localAddress, this.broadcast, App.portSrc, App.portDest, 2, this.user.getPseudo(), this.user.getId()); + MessagePseudo msgDeconnexion = new MessagePseudo(this.localAddress, this.broadcast, App.portSrc, App.portDest, 2, this.user.getPseudo(), this.user.getId(), ""); BOut.send(msgDeconnexion, this.broadcast, App.portSrc); + this.BIn.interrupt(); + this.BOut.getSocket().close(); + //this.server.getSocket().close(); + this.server.interrupt(); //list.deleteContact(user); System.exit(1); } @@ -261,7 +267,7 @@ public class Agent implements PropertyChangeListener{ db.updatePseudo(this.user.getId(), pseudo); //list.modifierListe(ancienPseudo, pseudo); Request.sendPseudoChange(ancienPseudo, pseudo, "pseudoChanged"); - MessagePseudo msgNewPseudo = new MessagePseudo(this.localAddress, this.broadcast, App.portSrc, App.portDest, 3, pseudo, this.user.getId()); + MessagePseudo msgNewPseudo = new MessagePseudo(this.localAddress, this.broadcast, App.portSrc, App.portDest, 3, pseudo, this.user.getId(), ancienPseudo); BOut.send(msgNewPseudo, this.broadcast, App.portSrc); return true; }else { diff --git a/chatGit/src/controller/DataBase.java b/chatGit/src/controller/DataBase.java index 6a1dd4d..0e1f293 100644 --- a/chatGit/src/controller/DataBase.java +++ b/chatGit/src/controller/DataBase.java @@ -4,8 +4,6 @@ import java.sql.*; import java.util.ArrayList; import model.MessageAffichage; -//import model.MessageAffichage; -import model.MessageChat; public class DataBase { @@ -201,7 +199,7 @@ public class DataBase { "idSrc INT NOT NULL,\n" + "idDest INT NOT NULL,\n" + "message MEDIUMTEXT NOT NULL,\n" + - "date_heure DATETIME NOT NULL\n" + + "date_heure TIMESTAMP NOT NULL\n" + ");"; PreparedStatement pStat = null; try { @@ -285,8 +283,8 @@ public class DataBase { return result; } - public Date getDateFromMessage(int id1, int id2, String message) { - Date date = null; + public Timestamp getDateFromMessage(int id1, int id2, String message) { + Timestamp date = null; int idSrc = id1; int idDest = id2; if(id1>id2) { @@ -301,7 +299,7 @@ public class DataBase { pStat.setString(1, message); ResultSet resPseudo = pStat.executeQuery(); if(resPseudo.first()) { - date = resPseudo.getDate("date_heure"); + date = resPseudo.getTimestamp("date_heure"); } }catch(SQLException e) { e.printStackTrace(); diff --git a/chatGit/src/gui/FenetreConnexion.java b/chatGit/src/gui/FenetreConnexion.java index 04120bb..211bc5d 100644 --- a/chatGit/src/gui/FenetreConnexion.java +++ b/chatGit/src/gui/FenetreConnexion.java @@ -15,8 +15,6 @@ import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.JOptionPane; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.io.IOException; import controller.*; @@ -31,7 +29,7 @@ public class FenetreConnexion implements ActionListener { JLabel Text; JButton Connexion; JButton Cancel; - + /* * Constructeur d'une fenetre d'affichage pour la connexion d'un utilisateur. * Cette fenetre sera munie d'un bouton de connexion et d'une zone de saisie de pseudo. @@ -70,6 +68,7 @@ public class FenetreConnexion implements ActionListener { this.Cancel.addActionListener(this); //On associe au bouton Connexion des actions a realiser this.Connexion.addActionListener(this); + this.Connexion.setSelected(false); // On ajouter les differents elements au panel panel.add(pseudofield); panel.add(Text); @@ -86,22 +85,41 @@ public class FenetreConnexion implements ActionListener { String login = pseudofield.getText(); boolean loginExiste = false; - try { + boolean loginEstActif = false; + try { loginExiste = Request.sendLogin(login, "loginExiste"); } catch (IOException e1) { System.out.println("Pb envoi requete au serveur"); e1.printStackTrace(); } - + try { + loginEstActif = Request.sendLogin(login, "estActif"); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } if(!loginExiste) { - JOptionPane.showMessageDialog(frame, "This login doesn't exist") ; + if(!Connexion.isSelected()) { + JOptionPane.showMessageDialog(frame, "This login doesn't exist", "Error", JOptionPane.WARNING_MESSAGE) ; + Connexion.setSelected(true); + frame.dispose(); + new FenetreConnexion(); + } + }else if(loginEstActif){ + if(!Connexion.isSelected()) { + JOptionPane.showMessageDialog(frame, "This login is used by an active user", "Error", JOptionPane.WARNING_MESSAGE) ; + Connexion.setSelected(true); + frame.dispose(); + new FenetreConnexion(); + } }else { // On crée un objet de type ChatApp Agent agent; boolean connexion; try { + agent = new Agent(Tools.getAdress()[0], App.portSrc, App.portDest, login); String pseudo = agent.getDb().getPseudoFromLogin(login); // on tente une connexion avec ce pseudo diff --git a/chatGit/src/gui/FenetreModifPseudo.java b/chatGit/src/gui/FenetreModifPseudo.java index 0e03dd7..59ba8fc 100644 --- a/chatGit/src/gui/FenetreModifPseudo.java +++ b/chatGit/src/gui/FenetreModifPseudo.java @@ -87,7 +87,7 @@ public class FenetreModifPseudo implements ActionListener { frame.dispose(); new FenetreMenu(agent); }else { - JOptionPane.showMessageDialog(frame, "Pseudo already, use choose another one"); + JOptionPane.showMessageDialog(frame, "Pseudo already use, choose another one"); } } catch (HeadlessException e1) { e1.printStackTrace(); diff --git a/chatGit/src/gui/panda.png b/chatGit/src/gui/panda.png deleted file mode 100644 index 8525465b2b129869d0192d95ca85945a07c79199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5890 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 G^#1@0EL*?; diff --git a/chatGit/src/model/MessageDeconnexion.java b/chatGit/src/model/MessageDeconnexion.java deleted file mode 100644 index 8223361..0000000 --- a/chatGit/src/model/MessageDeconnexion.java +++ /dev/null @@ -1,26 +0,0 @@ -package model; - -import java.net.InetAddress; - -public class MessageDeconnexion extends Message{ - private String msg; - private String pseudo; - - public MessageDeconnexion(InetAddress addressSrc, InetAddress addressDest, int portSrc, int portDest, int typeMessage, String pseudo) { - super(addressSrc, addressDest, portSrc, portDest, typeMessage); - this.pseudo = pseudo; - this.msg = "Deconnexion"; - } - - public String getPseudo() { - return pseudo; - } - - public void setPseudo(String pseudo) { - this.pseudo = pseudo; - } - - public String getMsg() { - return msg; - } -} diff --git a/chatGit/src/model/MessagePseudo.java b/chatGit/src/model/MessagePseudo.java index 72029bb..bd32491 100644 --- a/chatGit/src/model/MessagePseudo.java +++ b/chatGit/src/model/MessagePseudo.java @@ -6,11 +6,13 @@ public class MessagePseudo extends Message{ private String pseudo; private int id; + private String ancienPseudo; - public MessagePseudo(InetAddress addressSrc, InetAddress addressDest, int portSrc, int portDest, int typeMessage,String pseudo, int id) { + public MessagePseudo(InetAddress addressSrc, InetAddress addressDest, int portSrc, int portDest, int typeMessage,String pseudo, int id, String ancienPseudo) { super(addressSrc, addressDest, portSrc, portDest, typeMessage); this.pseudo = pseudo; this.id = id; + this.ancienPseudo=ancienPseudo; } public String getPseudo() { @@ -28,6 +30,14 @@ public class MessagePseudo extends Message{ public void setId(int id) { this.id=id; } + + public String getAncienPseudo() { + return ancienPseudo; + } + + public void setAncienPseudo(String ancienPseudo) { + this.ancienPseudo = ancienPseudo; + } } diff --git a/chatGit/src/network/TCPServer.java b/chatGit/src/network/TCPServer.java index 73da550..3fe7a10 100644 --- a/chatGit/src/network/TCPServer.java +++ b/chatGit/src/network/TCPServer.java @@ -58,4 +58,8 @@ public class TCPServer extends Thread{ public TCPChat getConnexionTCPChat() { return this.listeConnexions.remove(0); } + + public ServerSocket getSocket() { + return this.socket; + } } diff --git a/chatGit/src/network/UDPOutput.java b/chatGit/src/network/UDPOutput.java index 8bf39c7..80d8ad5 100644 --- a/chatGit/src/network/UDPOutput.java +++ b/chatGit/src/network/UDPOutput.java @@ -34,7 +34,11 @@ public class UDPOutput { System.out.println("Message envoyé, pseudo = "+msg.getPseudo()+" et num port destination = "+portSrc+"\n"); } - public void send(MessageDeconnexion msg, InetAddress addressDest, int portSrc) throws IOException { + public DatagramSocket getSocket() { + return this.socket; + } + + /*public void send(MessageChangePseudo msg, InetAddress addressDest, int portSrc) throws IOException { byte[] buffer = "".getBytes(); ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); ObjectOutputStream objectOutStream = new ObjectOutputStream(byteOutStream); @@ -43,8 +47,8 @@ public class UDPOutput { buffer = byteOutStream.toByteArray(); DatagramPacket packet = new DatagramPacket(buffer,buffer.length,msg.getAddressDest(),msg.getPortDest()); this.socket.send(packet); - System.out.println("Message envoyé, pseudo = "+msg.getMsg()+" et num port destination = "+portSrc+"\n"); - } + System.out.println("Message envoyé, pseudo = "+msg.getPseudo()+" et num port destination = "+portSrc+"\n"); + }*/ } diff --git a/chatGit/src/server/Server.java b/chatGit/src/server/Server.java deleted file mode 100644 index 676cbe8..0000000 --- a/chatGit/src/server/Server.java +++ /dev/null @@ -1,18 +0,0 @@ -package server; - -import network.TCPChat; - -public class Server { - private final String path; - private final int port; - private TCPChat serverConnection; - - public Server(String path, int port) { - this.path=path; - this.port=port; - } - - public void suscribe() { - - } -} \ No newline at end of file