From 5222751b1f9da79530c148e3f0f92b99da3bdb7e Mon Sep 17 00:00:00 2001 From: foussats Date: Sun, 27 Dec 2020 18:21:46 +0100 Subject: [PATCH] Envoi des messages fonctionne --- chat/bin/controller/DataBase.class | Bin 5457 -> 5454 bytes chat/bin/gui/FenetreChat$2.class | Bin 2715 -> 2889 bytes chat/bin/gui/FenetreChat.class | Bin 3796 -> 3795 bytes chat/src/controller/DataBase.java | 6 ++--- chat/src/gui/FenetreChat.java | 34 ++++++++++++++++------------- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/chat/bin/controller/DataBase.class b/chat/bin/controller/DataBase.class index 0ac016fc4def3de8fd8044f23a98e1a04871c553..29d1cf531a6c2da88609d8deaf83ddd1f779f81e 100644 GIT binary patch delta 659 zcmZ9J&ubGw9L3*scaurf$WBsA8!J<*U_((FYlI+5TDMw_jkJlSqExqOK`(*`l^BiH zgBO2)Q47}k0}+v6tF;N*n}|oje?@N|)NeL62N?#w%e;B-vv0n~zQq>((w2B4AjX3z z;OSai$1}2JNBawbb^XImD(mQMsxR$miI)O~-WHU2MHv~7z7~j_$&Z|$(1Sx+J(S^{ zOQ*Z}{0+^?Hc_Uk+}!q7Ae=vaVN&m}S*@yAv`9bYA@xxpG~%S4{;ZDaf#J*%y_5^g z`a>6CAOPT6bnnK5NhP(Rb*_S$X0w9%3T`B=6%@wQ^D3^iS`@Q8n$!Xvw6|L>rct0v z_SRAtZekB^A%)u*z#SaMT^z+d>aEQu{wzm{ZPA03m)!N-JyZ& zHgH|6;+|^Yp8SU^+3yop7`Gb<58Q`+==8Y#oLA?TT!w)-dbyHaoV*3bZzv(e9~=Oc t!!5$3FX7%gxy7$TBJy?T|8>wJrSk1cw&KZ_9_ZR0AB z6_KLGy$N&9v%{{|JXK`Zx5R6caXVRCmx$Y%=L(lyl%<(9?Yb;Fr^p@bZyoBh8=I1L zQ?op6iA0Iqzfgn*`;VrE&zmWoYd&dP&6^)OPrWj~^|8EVh3e6K5JGD_5wB0$F}tCq z`NUGYZ`yl!7#BWZEL;<*aEBwa=txbt!o9*s=g#*$SmsK|ona=!wJK{h8F(V8d@I95 z;F&4*?>49W#a1^%Trd;c&4!-4`0Jef^lcrhnMcRx7cKI^m=XjghKv_X{mCsdS z<@+-13t970P)CQ*N~L7Gl+=)8eg-Pfz7*twV=}PTYSSdWX_98cB(-VMyKbWC;UgfqG_J6(+fNo;mk9&w1{ddrvm}*=Rj@eCsZ- zl0QbRZALlHI|3H-DBB!hsbKnU(CrQf(`e_A&AV7aEO0Dd<9(YC_)sZXH`wI6MPX)h z%i8`z#?7bF1ut;=f_94$J~8=Nn6cX_IjOwkWm6l2V$RFje9C819nB6fF_Hbw45m8Pt`@oyy|W%rMk28$A#yr>CRA)a!alkq*nDs0v!>qbehZL_sV|rE!kT6 z+gvcMOf7Mc9hDd2_sdJhn2~rpWWR#?F%I5l@s>%L4tXzR{Wu@pq&4w*$jdM3NPMYN z$g3fTn+y#c`H#H%`G(q%qsN*3R7g1|udw2&SjgF_?{Y|#H%Usg88=v%xDc|u$q2bL ziZCK;WSzFDh6X)-z0A>hoBH3*e0I>v8>HFE799Pdy?TT)dRAP%XBT5+8CQItJ^V$U zM|e_0K^hs5#q5vnA|kUjEI6FCjHPf x!CvbAU7A{9f<+il1f$H$^;+#W)r)b9+xo86OLvFpf?DcQZ)Wwmr*n+~MqPT;C3pM1%_}~LiYT{quzhI*N1L7&*1J1*oGv9o3zHiRVm;BLy`Ss7oPr!CE z8FQbu!z9Tmi+;)#dMcXeXh_9OS~+cThO>&5cBH*08tRJJwSDoFolgzYRWjO;D z=egi?`bvv0SqySnVI`u+v*d90)FQXlV93e%ii?K1u5(S1*Bv<)sfhPh)Hl}l9gZHg zMn9Ic_>jh43wf3HMxmR4a1vQteLh;Ma&1}rQ<#H#3Vo>>29>Xjn9gzOFvs&gx zakZ1R?4pz=LNv3Nu)Ii%baOXD>|s)n8QS~{#>81tBpylT73l#U^8`%{ z<(Jd#L#fg{PU5 diff --git a/chat/bin/gui/FenetreChat.class b/chat/bin/gui/FenetreChat.class index ce17c62c1107bafe66c2c230bc01abb5f48e4f44..aea363da2c05844dc921ba58047809a78c27f795 100644 GIT binary patch delta 870 zcmZ9KYiLwQ6vuy)-MzDWbBmi*VsDoq2t^IC(Sje0AQnw9G(PGpSwE8YS_O80|6&tnM8e6wbYa0wj1Ffyr)~bDgox34^a0cf5=bZmJ z=ReFzX5Gj-K4`oWK(N;$NQR&N0!*SDv^Ye*Aibu%HovT*wsdV}x#X}Qtg6g#)TEuv zfIf~{9H&FzT~|?ADG-H{F2R@$rJG7~OY3WM3#)X28k0_979kvgoLs2alof9F35%1Q z5*QUJnjoX-xy)HEt;gcD+r;-~bw$}`?Xfv)aqgLGi%A{578m$TJ@vopkz7s^*AQ}md3yzD^7^5w_n>Me*$F2?Sb7)EMNyNRx`83b#0*}Li1nrSHNAi5O&l}^Y z?Mu)Z@p$~6INdSgw$BqIk&2zsDOnD0*P5?$>ogT1h-u|4Z72?!_T8aq%DK#F@CY7&($MS{arlT-_5b5 zR?q>YQLN8BybP-6g$dDm=CX}>>?WU&D4>P;wDLL~6zLIIKrajFXAuJ|W{5W!W(kj2 z%6}{qX)G5(N<^55n8ZpkgLlLn8blG>#A>#S^)!l&yesN>PrS|hqLB~8hwPw4D_An} z8(WF6QeXXIC%HrctS{CU8)SaOp|j-@U+J>JZn0f zuCr#?Z1cRZ@IRd^Mn;0Gij|Vb7G5x`oh6I53T;CZ<$PbMQVPaO%Wf_PXLq~Q2|cnj z%`Rt&GtD-S?L_9JbK&`EgqJ)rv^l&i;8Noik5}mx=8u^O}$|18%P7 zGRqlhJ>K+qi`}aFrt~Ht4xIt{IBz(xa^R}`!PvsXskR~)r`+!k0bx4*1Amap~o>kGCS>Vb3uB695cOX z=?S`pF)m%d|R=%0P|R>=lz@mCOU0V zt;#Z;|7F}mFZa>MgIvxgu4IM*eKE^*+`}B^7EVy%3r6^rQT}GNSd59sxSUBK9Zbk# zCS@sAxrDW{oON;o>!r+;jB=|?Qj_)ECL7rx_p*^|Rl$n6ajc`jbs9Qy2jB9YKFzA+ z_?|Wux``ij|ERyk44?56Ka*7YhxtWwDHU*+M!#VxO((yrXKUrj))oKYPqkUa=u;c7 N`kdh}wN@)%{|A6H1S$Xk diff --git a/chat/src/controller/DataBase.java b/chat/src/controller/DataBase.java index 50a4aa0..8e975ff 100644 --- a/chat/src/controller/DataBase.java +++ b/chat/src/controller/DataBase.java @@ -136,7 +136,7 @@ public class DataBase { idSrc = id2; idDest = id1; } - String nameTable = idSrc+""+idDest; + String nameTable = idSrc+"_"+idDest; String query = "CREATE TABLE " +nameTable+" (\n" + "id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, \n" + "idSrc INT NOT NULL,\n" + @@ -163,14 +163,14 @@ public class DataBase { idDest = id1; } String nameTable = idSrc+"_"+idDest; - String query = "SELECT * FROM" + nameTable; + String query = "SELECT * FROM " + nameTable; PreparedStatement pStat = null; try { pStat = connexion.prepareStatement(query); pStat.executeQuery(); }catch(SQLException e) { res = false; - e.printStackTrace(); + //e.printStackTrace(); } return res; } diff --git a/chat/src/gui/FenetreChat.java b/chat/src/gui/FenetreChat.java index 67e1da2..240059c 100644 --- a/chat/src/gui/FenetreChat.java +++ b/chat/src/gui/FenetreChat.java @@ -63,7 +63,7 @@ public class FenetreChat extends JFrame{ this.panel = new JPanel(); //zone pour rentrer les message à envoyer - JTextArea text = new JTextArea(10, 7); + JTextArea text = new JTextArea(10, 3); text.setForeground(Color.BLACK); text.setFont(new Font("Century Schoolbook", Font.PLAIN, 11)); text.setText("Enter your message"); @@ -71,6 +71,19 @@ public class FenetreChat extends JFrame{ JScrollPane sp = new JScrollPane(text); + //zone affichage texte + this.ta = new JTextArea(20, 20); + this.ta.setLineWrap(true); + this.ta.setText(""); + JScrollPane sp2 = new JScrollPane(ta); + this.ta.setEditable(false); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.fill = GridBagConstraints.BOTH; + gbc.insets = new Insets(0, 0, 5, 0); + gbc.gridx = 0; + gbc.gridy = 1; + frame.getContentPane().add(sp2, gbc); + //bouton envoyer JButton envoyer = new JButton("Send"); frame.getRootPane().setDefaultButton(envoyer); @@ -90,6 +103,10 @@ public class FenetreChat extends JFrame{ tcpChat = tcp; } } + //text.append(message); + text.setText(""); + ta.append(agent.getUser().getPseudo()+ " : "+message+"\n"); + //ta.setText(""); tcpChat.sendMsg(message); if(agent.getDb().tableChatExists(idUser, idDest)) { agent.getDb().addMessage(idUser, idDest, message); @@ -101,21 +118,8 @@ public class FenetreChat extends JFrame{ System.out.println("Envoi du message impossible"); e1.printStackTrace(); } - text.append(message); - text.setText(""); + }}); - //zone affichage texte - this.ta = new JTextArea(10, 10); - this.ta.setLineWrap(true); - this.ta.setText(""); - JScrollPane sp2 = new JScrollPane(ta); - this.ta.setEditable(false); - GridBagConstraints gbc = new GridBagConstraints(); - gbc.fill = GridBagConstraints.BOTH; - gbc.insets = new Insets(0, 0, 5, 0); - gbc.gridx = 0; - gbc.gridy = 1; - frame.getContentPane().add(sp2, gbc); panel.add(BorderLayout.CENTER, sp); panel.add(BorderLayout.SOUTH,envoyer);