From 34acbe031e229a5e1cec9b08b7695e50c1ee4556 Mon Sep 17 00:00:00 2001 From: foussats Date: Sat, 13 Feb 2021 12:17:03 +0100 Subject: [PATCH] Correction des derniers bugs --- {chatGitElise => chatGit}/.classpath | 0 {chatGitElise => chatGit}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 {chatGitElise => chatGit}/b1.jpg | Bin {chatGitElise => chatGit}/background2.jpg | Bin .../bin/config/ConfLoad$ConfLoadCb.class | Bin .../bin/config/ConfLoad.class | Bin .../bin/config/Configuration$Conf.class | Bin .../bin/config/Configuration$SConf.class | Bin .../bin/config/Configuration.class | Bin .../bin/config/package-info.class | Bin .../bin/controller/Agent.class | Bin .../bin/controller/DataBase.class | Bin .../bin/controller/Test.class | Bin .../bin/controller/package-info.class | Bin .../bin/gui/FenetreChat$1.class | Bin .../bin/gui/FenetreChat$2.class | Bin .../bin/gui/FenetreChat$3.class | Bin .../bin/gui/FenetreChat.class | Bin .../bin/gui/FenetreConnexion$1.class | Bin .../bin/gui/FenetreConnexion$2.class | Bin .../bin/gui/FenetreConnexion.class | Bin .../bin/gui/FenetreInscription$1.class | Bin .../bin/gui/FenetreInscription$2.class | Bin .../bin/gui/FenetreInscription$3.class | Bin .../bin/gui/FenetreInscription$4.class | Bin .../bin/gui/FenetreInscription.class | Bin .../bin/gui/FenetreMenu$1.class | Bin .../bin/gui/FenetreMenu$2.class | Bin .../bin/gui/FenetreMenu$3.class | Bin .../bin/gui/FenetreMenu$4.class | Bin .../bin/gui/FenetreMenu$5.class | Bin .../bin/gui/FenetreMenu.class | Bin chatGit/bin/gui/FenetreModifPseudo.class | Bin 0 -> 3785 bytes .../bin/gui/SmartScroller$1.class | Bin .../bin/gui/SmartScroller.class | Bin .../bin/gui/package-info.class | Bin .../bin/images/panda.png | Bin .../bin/model/Contact.class | Bin .../bin/model/ListeContacts.class | Bin .../bin/model/Message.class | Bin .../bin/model/MessageAffichage.class | Bin .../bin/model/MessageChat.class | Bin .../bin/model/MessagePseudo.class | Bin .../bin/module-info.class | Bin .../bin/network/Manager.class | Bin .../bin/network/TCPChat.class | Bin .../bin/network/TCPServer.class | Bin .../bin/network/Tools.class | Bin .../bin/network/UDPInput.class | Bin .../bin/network/UDPOutput.class | Bin .../bin/server/Request.class | Bin .../bin/server/package-info.class | Bin .../bin/test/App$1.class | Bin {chatGitElise => chatGit}/bin/test/App.class | Bin .../bin/test/Launcher.class | Bin .../bin/test/package-info.class | Bin {chatGitElise => chatGit}/config.json | 2 +- .../lib/JTattoo-1.6.13.jar | Bin {chatGitElise => chatGit}/lib/java-json.jar | Bin .../lib/mysql-connector-java-5.0.5-bin.jar | Bin {chatGitElise => chatGit}/panda.png | Bin .../src/config/ConfLoad.java | 0 .../src/config/Configuration.java | 0 .../src/config/package-info.java | 0 .../src/controller/Agent.java | 0 .../src/controller/DataBase.java | 0 .../src/controller/Test.java | 0 .../src/controller/package-info.java | 0 .../src/gui/FenetreChat.java | 0 .../src/gui/FenetreConnexion.java | 0 .../src/gui/FenetreInscription.java | 0 .../src/gui/FenetreMenu.java | 0 .../src/gui/FenetreModifPseudo.java | 24 +++++++++++++----- .../src/gui/SmartScroller.java | 0 .../src/gui/package-info.java | 0 .../src/images/panda.png | Bin .../src/model/Contact.java | 0 .../src/model/ListeContacts.java | 0 .../src/model/Message.java | 0 .../src/model/MessageAffichage.java | 0 .../src/model/MessageChat.java | 0 .../src/model/MessagePseudo.java | 0 .../src/module-info.java | 0 .../src/network/Manager.java | 0 .../src/network/TCPChat.java | 0 .../src/network/TCPServer.java | 0 .../src/network/Tools.java | 0 .../src/network/UDPInput.java | 0 .../src/network/UDPOutput.java | 0 .../src/server/Request.java | 0 .../src/server/package-info.java | 0 {chatGitElise => chatGit}/src/test/App.java | 0 .../src/test/Launcher.java | 0 .../src/test/package-info.java | 0 chatGitElise/bin/gui/FenetreModifPseudo.class | Bin 3452 -> 0 bytes 96 files changed, 18 insertions(+), 8 deletions(-) rename {chatGitElise => chatGit}/.classpath (100%) rename {chatGitElise => chatGit}/.project (100%) rename {chatGitElise => chatGit}/.settings/org.eclipse.jdt.core.prefs (100%) rename {chatGitElise => chatGit}/b1.jpg (100%) rename {chatGitElise => chatGit}/background2.jpg (100%) rename {chatGitElise => chatGit}/bin/config/ConfLoad$ConfLoadCb.class (100%) rename {chatGitElise => chatGit}/bin/config/ConfLoad.class (100%) rename {chatGitElise => chatGit}/bin/config/Configuration$Conf.class (100%) rename {chatGitElise => chatGit}/bin/config/Configuration$SConf.class (100%) rename {chatGitElise => chatGit}/bin/config/Configuration.class (100%) rename {chatGitElise => chatGit}/bin/config/package-info.class (100%) rename {chatGitElise => chatGit}/bin/controller/Agent.class (100%) rename {chatGitElise => chatGit}/bin/controller/DataBase.class (100%) rename {chatGitElise => chatGit}/bin/controller/Test.class (100%) rename {chatGitElise => chatGit}/bin/controller/package-info.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreChat$1.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreChat$2.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreChat$3.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreChat.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreConnexion$1.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreConnexion$2.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreConnexion.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreInscription$1.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreInscription$2.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreInscription$3.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreInscription$4.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreInscription.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreMenu$1.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreMenu$2.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreMenu$3.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreMenu$4.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreMenu$5.class (100%) rename {chatGitElise => chatGit}/bin/gui/FenetreMenu.class (100%) create mode 100644 chatGit/bin/gui/FenetreModifPseudo.class rename {chatGitElise => chatGit}/bin/gui/SmartScroller$1.class (100%) rename {chatGitElise => chatGit}/bin/gui/SmartScroller.class (100%) rename {chatGitElise => chatGit}/bin/gui/package-info.class (100%) rename {chatGitElise => chatGit}/bin/images/panda.png (100%) rename {chatGitElise => chatGit}/bin/model/Contact.class (100%) rename {chatGitElise => chatGit}/bin/model/ListeContacts.class (100%) rename {chatGitElise => chatGit}/bin/model/Message.class (100%) rename {chatGitElise => chatGit}/bin/model/MessageAffichage.class (100%) rename {chatGitElise => chatGit}/bin/model/MessageChat.class (100%) rename {chatGitElise => chatGit}/bin/model/MessagePseudo.class (100%) rename {chatGitElise => chatGit}/bin/module-info.class (100%) rename {chatGitElise => chatGit}/bin/network/Manager.class (100%) rename {chatGitElise => chatGit}/bin/network/TCPChat.class (100%) rename {chatGitElise => chatGit}/bin/network/TCPServer.class (100%) rename {chatGitElise => chatGit}/bin/network/Tools.class (100%) rename {chatGitElise => chatGit}/bin/network/UDPInput.class (100%) rename {chatGitElise => chatGit}/bin/network/UDPOutput.class (100%) rename {chatGitElise => chatGit}/bin/server/Request.class (100%) rename {chatGitElise => chatGit}/bin/server/package-info.class (100%) rename {chatGitElise => chatGit}/bin/test/App$1.class (100%) rename {chatGitElise => chatGit}/bin/test/App.class (100%) rename {chatGitElise => chatGit}/bin/test/Launcher.class (100%) rename {chatGitElise => chatGit}/bin/test/package-info.class (100%) rename {chatGitElise => chatGit}/config.json (87%) rename {chatGitElise => chatGit}/lib/JTattoo-1.6.13.jar (100%) rename {chatGitElise => chatGit}/lib/java-json.jar (100%) rename {chatGitElise => chatGit}/lib/mysql-connector-java-5.0.5-bin.jar (100%) rename {chatGitElise => chatGit}/panda.png (100%) rename {chatGitElise => chatGit}/src/config/ConfLoad.java (100%) rename {chatGitElise => chatGit}/src/config/Configuration.java (100%) rename {chatGitElise => chatGit}/src/config/package-info.java (100%) rename {chatGitElise => chatGit}/src/controller/Agent.java (100%) rename {chatGitElise => chatGit}/src/controller/DataBase.java (100%) rename {chatGitElise => chatGit}/src/controller/Test.java (100%) rename {chatGitElise => chatGit}/src/controller/package-info.java (100%) rename {chatGitElise => chatGit}/src/gui/FenetreChat.java (100%) rename {chatGitElise => chatGit}/src/gui/FenetreConnexion.java (100%) rename {chatGitElise => chatGit}/src/gui/FenetreInscription.java (100%) rename {chatGitElise => chatGit}/src/gui/FenetreMenu.java (100%) rename {chatGitElise => chatGit}/src/gui/FenetreModifPseudo.java (85%) rename {chatGitElise => chatGit}/src/gui/SmartScroller.java (100%) rename {chatGitElise => chatGit}/src/gui/package-info.java (100%) rename {chatGitElise => chatGit}/src/images/panda.png (100%) rename {chatGitElise => chatGit}/src/model/Contact.java (100%) rename {chatGitElise => chatGit}/src/model/ListeContacts.java (100%) rename {chatGitElise => chatGit}/src/model/Message.java (100%) rename {chatGitElise => chatGit}/src/model/MessageAffichage.java (100%) rename {chatGitElise => chatGit}/src/model/MessageChat.java (100%) rename {chatGitElise => chatGit}/src/model/MessagePseudo.java (100%) rename {chatGitElise => chatGit}/src/module-info.java (100%) rename {chatGitElise => chatGit}/src/network/Manager.java (100%) rename {chatGitElise => chatGit}/src/network/TCPChat.java (100%) rename {chatGitElise => chatGit}/src/network/TCPServer.java (100%) rename {chatGitElise => chatGit}/src/network/Tools.java (100%) rename {chatGitElise => chatGit}/src/network/UDPInput.java (100%) rename {chatGitElise => chatGit}/src/network/UDPOutput.java (100%) rename {chatGitElise => chatGit}/src/server/Request.java (100%) rename {chatGitElise => chatGit}/src/server/package-info.java (100%) rename {chatGitElise => chatGit}/src/test/App.java (100%) rename {chatGitElise => chatGit}/src/test/Launcher.java (100%) rename {chatGitElise => chatGit}/src/test/package-info.java (100%) delete mode 100644 chatGitElise/bin/gui/FenetreModifPseudo.class diff --git a/chatGitElise/.classpath b/chatGit/.classpath similarity index 100% rename from chatGitElise/.classpath rename to chatGit/.classpath diff --git a/chatGitElise/.project b/chatGit/.project similarity index 100% rename from chatGitElise/.project rename to chatGit/.project diff --git a/chatGitElise/.settings/org.eclipse.jdt.core.prefs b/chatGit/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from chatGitElise/.settings/org.eclipse.jdt.core.prefs rename to chatGit/.settings/org.eclipse.jdt.core.prefs diff --git a/chatGitElise/b1.jpg b/chatGit/b1.jpg similarity index 100% rename from chatGitElise/b1.jpg rename to chatGit/b1.jpg diff --git a/chatGitElise/background2.jpg b/chatGit/background2.jpg similarity index 100% rename from chatGitElise/background2.jpg rename to chatGit/background2.jpg diff --git a/chatGitElise/bin/config/ConfLoad$ConfLoadCb.class b/chatGit/bin/config/ConfLoad$ConfLoadCb.class similarity index 100% rename from chatGitElise/bin/config/ConfLoad$ConfLoadCb.class rename to chatGit/bin/config/ConfLoad$ConfLoadCb.class diff --git a/chatGitElise/bin/config/ConfLoad.class b/chatGit/bin/config/ConfLoad.class similarity index 100% rename from chatGitElise/bin/config/ConfLoad.class rename to chatGit/bin/config/ConfLoad.class diff --git a/chatGitElise/bin/config/Configuration$Conf.class b/chatGit/bin/config/Configuration$Conf.class similarity index 100% rename from chatGitElise/bin/config/Configuration$Conf.class rename to chatGit/bin/config/Configuration$Conf.class diff --git a/chatGitElise/bin/config/Configuration$SConf.class b/chatGit/bin/config/Configuration$SConf.class similarity index 100% rename from chatGitElise/bin/config/Configuration$SConf.class rename to chatGit/bin/config/Configuration$SConf.class diff --git a/chatGitElise/bin/config/Configuration.class b/chatGit/bin/config/Configuration.class similarity index 100% rename from chatGitElise/bin/config/Configuration.class rename to chatGit/bin/config/Configuration.class diff --git a/chatGitElise/bin/config/package-info.class b/chatGit/bin/config/package-info.class similarity index 100% rename from chatGitElise/bin/config/package-info.class rename to chatGit/bin/config/package-info.class diff --git a/chatGitElise/bin/controller/Agent.class b/chatGit/bin/controller/Agent.class similarity index 100% rename from chatGitElise/bin/controller/Agent.class rename to chatGit/bin/controller/Agent.class diff --git a/chatGitElise/bin/controller/DataBase.class b/chatGit/bin/controller/DataBase.class similarity index 100% rename from chatGitElise/bin/controller/DataBase.class rename to chatGit/bin/controller/DataBase.class diff --git a/chatGitElise/bin/controller/Test.class b/chatGit/bin/controller/Test.class similarity index 100% rename from chatGitElise/bin/controller/Test.class rename to chatGit/bin/controller/Test.class diff --git a/chatGitElise/bin/controller/package-info.class b/chatGit/bin/controller/package-info.class similarity index 100% rename from chatGitElise/bin/controller/package-info.class rename to chatGit/bin/controller/package-info.class diff --git a/chatGitElise/bin/gui/FenetreChat$1.class b/chatGit/bin/gui/FenetreChat$1.class similarity index 100% rename from chatGitElise/bin/gui/FenetreChat$1.class rename to chatGit/bin/gui/FenetreChat$1.class diff --git a/chatGitElise/bin/gui/FenetreChat$2.class b/chatGit/bin/gui/FenetreChat$2.class similarity index 100% rename from chatGitElise/bin/gui/FenetreChat$2.class rename to chatGit/bin/gui/FenetreChat$2.class diff --git a/chatGitElise/bin/gui/FenetreChat$3.class b/chatGit/bin/gui/FenetreChat$3.class similarity index 100% rename from chatGitElise/bin/gui/FenetreChat$3.class rename to chatGit/bin/gui/FenetreChat$3.class diff --git a/chatGitElise/bin/gui/FenetreChat.class b/chatGit/bin/gui/FenetreChat.class similarity index 100% rename from chatGitElise/bin/gui/FenetreChat.class rename to chatGit/bin/gui/FenetreChat.class diff --git a/chatGitElise/bin/gui/FenetreConnexion$1.class b/chatGit/bin/gui/FenetreConnexion$1.class similarity index 100% rename from chatGitElise/bin/gui/FenetreConnexion$1.class rename to chatGit/bin/gui/FenetreConnexion$1.class diff --git a/chatGitElise/bin/gui/FenetreConnexion$2.class b/chatGit/bin/gui/FenetreConnexion$2.class similarity index 100% rename from chatGitElise/bin/gui/FenetreConnexion$2.class rename to chatGit/bin/gui/FenetreConnexion$2.class diff --git a/chatGitElise/bin/gui/FenetreConnexion.class b/chatGit/bin/gui/FenetreConnexion.class similarity index 100% rename from chatGitElise/bin/gui/FenetreConnexion.class rename to chatGit/bin/gui/FenetreConnexion.class diff --git a/chatGitElise/bin/gui/FenetreInscription$1.class b/chatGit/bin/gui/FenetreInscription$1.class similarity index 100% rename from chatGitElise/bin/gui/FenetreInscription$1.class rename to chatGit/bin/gui/FenetreInscription$1.class diff --git a/chatGitElise/bin/gui/FenetreInscription$2.class b/chatGit/bin/gui/FenetreInscription$2.class similarity index 100% rename from chatGitElise/bin/gui/FenetreInscription$2.class rename to chatGit/bin/gui/FenetreInscription$2.class diff --git a/chatGitElise/bin/gui/FenetreInscription$3.class b/chatGit/bin/gui/FenetreInscription$3.class similarity index 100% rename from chatGitElise/bin/gui/FenetreInscription$3.class rename to chatGit/bin/gui/FenetreInscription$3.class diff --git a/chatGitElise/bin/gui/FenetreInscription$4.class b/chatGit/bin/gui/FenetreInscription$4.class similarity index 100% rename from chatGitElise/bin/gui/FenetreInscription$4.class rename to chatGit/bin/gui/FenetreInscription$4.class diff --git a/chatGitElise/bin/gui/FenetreInscription.class b/chatGit/bin/gui/FenetreInscription.class similarity index 100% rename from chatGitElise/bin/gui/FenetreInscription.class rename to chatGit/bin/gui/FenetreInscription.class diff --git a/chatGitElise/bin/gui/FenetreMenu$1.class b/chatGit/bin/gui/FenetreMenu$1.class similarity index 100% rename from chatGitElise/bin/gui/FenetreMenu$1.class rename to chatGit/bin/gui/FenetreMenu$1.class diff --git a/chatGitElise/bin/gui/FenetreMenu$2.class b/chatGit/bin/gui/FenetreMenu$2.class similarity index 100% rename from chatGitElise/bin/gui/FenetreMenu$2.class rename to chatGit/bin/gui/FenetreMenu$2.class diff --git a/chatGitElise/bin/gui/FenetreMenu$3.class b/chatGit/bin/gui/FenetreMenu$3.class similarity index 100% rename from chatGitElise/bin/gui/FenetreMenu$3.class rename to chatGit/bin/gui/FenetreMenu$3.class diff --git a/chatGitElise/bin/gui/FenetreMenu$4.class b/chatGit/bin/gui/FenetreMenu$4.class similarity index 100% rename from chatGitElise/bin/gui/FenetreMenu$4.class rename to chatGit/bin/gui/FenetreMenu$4.class diff --git a/chatGitElise/bin/gui/FenetreMenu$5.class b/chatGit/bin/gui/FenetreMenu$5.class similarity index 100% rename from chatGitElise/bin/gui/FenetreMenu$5.class rename to chatGit/bin/gui/FenetreMenu$5.class diff --git a/chatGitElise/bin/gui/FenetreMenu.class b/chatGit/bin/gui/FenetreMenu.class similarity index 100% rename from chatGitElise/bin/gui/FenetreMenu.class rename to chatGit/bin/gui/FenetreMenu.class diff --git a/chatGit/bin/gui/FenetreModifPseudo.class b/chatGit/bin/gui/FenetreModifPseudo.class new file mode 100644 index 0000000000000000000000000000000000000000..9874d4cc3f5092b2dda8fecbb3f6c7ab77702ffc GIT binary patch literal 3785 zcmZ`+dw3jG75`1L>1?J`+Ae+2TFQo(o6vRQUGqcRh zHV-KB5(TMf@kOi;sy06GQA&0T5ww0<6?|9f8xddp>%V@Ve*W&v>}I#A{l4s-d+)jD zp7T4ubI$F{|9#;l05{-G6*UUhjpof{yRd}kh%P&0j`X-9pRrX$6s+2B959ku!x~L? z5APRgPsK6?7yGNmq?Z&2gyki7q&?HNI!)K37Dqwdh+|9$1#3E`;8fC`G^t>ByIgJI zcFwRwcFA^+T;=xioPYm_DY6*_7gg)%7gJul+@WAZPL`;_?goavNq+<;> zD5y;|4%9=zTXe*5p^A&Cc_{`_T%zDYA8RvhNbKT)&l)zNL8`jczjG1%KF=Y9ErIgO zb*P9+*(-It6$ygm3a?F!82PN1%G$2z&I!lYOA`|vjRPv0LPL@=YHj9(uv}iNp%Gi; zeOrk{qJxrBYf{J6c$)&1TKmiy26BDE$Fce_tx<99xeoeKRPlB?SZ2wsj+yB+rtQ3^ z;W}*5a1Cyhx86jcDl`WoU53S&IH9jCI_jZmg!COcZk7;hMkaH+nHd$HD~)}pjvZ(v zYq-#B+n&5%!G=U*b>vH1EiyW7I#yzphIZ^yaVw#&3QA!-;3fxlmM9#J(WrHYHq$^RBAl;#35JL)d`qC?0bH*6X5~WCDDA>PK$GauAk(`kp zmj~|B@m_gAg6)qM3yyHWMqasEaUxt1x*!d79$b2(0EMpPHm&m!nYSzY0H?H9*8syKHb$kV1 zWnnOKIbjj6ts!0&%34AaR4j%18K|RpM#tBs!%@!;eADnv99QwJ(5_Onc6aCe*syTw zcvhB})$W)**(F?;g}BW$vi7K~3D4=6mqkL&m~M_uMn#cb#ajF@hT+J285s;Ag@bbJ@5=%SrJARP8!WvGtN68@`wQ^ODNLlvj1ULgHro}dPS&v9vWC5apQ`wYg3XJFcgTwBJ=d*%Mi_LWj!{sZ)4XGVlTHeWhmc0@aD+NM26ICWfyyE2f zVBsw_f*rrYk|o|yCU{LHtNq~m3LnWXBj9)Z%|7O$NQR!Sl@Kj zJT^8hVAEi1a}n`*T-Nj)E?ZW>6>?laC|RRlv?*wueJ=th<2Q~`pf;2Lm(I@%Lq@OkNZ4~g@%_j8;n&BL*o zYi0otNe|_>Q}Ine%Ih=Xw-e>RlX#?n#}`3p_5;|#aCTxNx(P)OpN6;5?OwXt$JGJ! z^U=ar2(s9RDcp&NaTgAAMFOD*E`~rT_y|54xUalUU}YUS%@7{$+Cl?U$1oe%{HeVh zH*PK9$WsijAMm4tu`d>JjB9fReC;H@A(sm{v4Db4CTcAVBlIHwLo5n!~o>>(x12F3p=chD~Mp#Y>}m zY16C6>CHaUCc_H17KiBP8GoF`S)9O&te|H}cS)=L#1X`!j?}0XE79afB;R;}JZ=N5u&|%DW!JDLl@? z{DdEYUOzQYm#KIfzs2tugE~t69)BPu*HZeA_!I3L;p%JnGkrPCuh;PxejV|@-r(0M v{=LRDt;JvIK^)QlV2_Gg6@R-!#VgA)D$aDMIQwtZ@8b~R9si(Q4gUE*0Q&-= literal 0 HcmV?d00001 diff --git a/chatGitElise/bin/gui/SmartScroller$1.class b/chatGit/bin/gui/SmartScroller$1.class similarity index 100% rename from chatGitElise/bin/gui/SmartScroller$1.class rename to chatGit/bin/gui/SmartScroller$1.class diff --git a/chatGitElise/bin/gui/SmartScroller.class b/chatGit/bin/gui/SmartScroller.class similarity index 100% rename from chatGitElise/bin/gui/SmartScroller.class rename to chatGit/bin/gui/SmartScroller.class diff --git a/chatGitElise/bin/gui/package-info.class b/chatGit/bin/gui/package-info.class similarity index 100% rename from chatGitElise/bin/gui/package-info.class rename to chatGit/bin/gui/package-info.class diff --git a/chatGitElise/bin/images/panda.png b/chatGit/bin/images/panda.png similarity index 100% rename from chatGitElise/bin/images/panda.png rename to chatGit/bin/images/panda.png diff --git a/chatGitElise/bin/model/Contact.class b/chatGit/bin/model/Contact.class similarity index 100% rename from chatGitElise/bin/model/Contact.class rename to chatGit/bin/model/Contact.class diff --git a/chatGitElise/bin/model/ListeContacts.class b/chatGit/bin/model/ListeContacts.class similarity index 100% rename from chatGitElise/bin/model/ListeContacts.class rename to chatGit/bin/model/ListeContacts.class diff --git a/chatGitElise/bin/model/Message.class b/chatGit/bin/model/Message.class similarity index 100% rename from chatGitElise/bin/model/Message.class rename to chatGit/bin/model/Message.class diff --git a/chatGitElise/bin/model/MessageAffichage.class b/chatGit/bin/model/MessageAffichage.class similarity index 100% rename from chatGitElise/bin/model/MessageAffichage.class rename to chatGit/bin/model/MessageAffichage.class diff --git a/chatGitElise/bin/model/MessageChat.class b/chatGit/bin/model/MessageChat.class similarity index 100% rename from chatGitElise/bin/model/MessageChat.class rename to chatGit/bin/model/MessageChat.class diff --git a/chatGitElise/bin/model/MessagePseudo.class b/chatGit/bin/model/MessagePseudo.class similarity index 100% rename from chatGitElise/bin/model/MessagePseudo.class rename to chatGit/bin/model/MessagePseudo.class diff --git a/chatGitElise/bin/module-info.class b/chatGit/bin/module-info.class similarity index 100% rename from chatGitElise/bin/module-info.class rename to chatGit/bin/module-info.class diff --git a/chatGitElise/bin/network/Manager.class b/chatGit/bin/network/Manager.class similarity index 100% rename from chatGitElise/bin/network/Manager.class rename to chatGit/bin/network/Manager.class diff --git a/chatGitElise/bin/network/TCPChat.class b/chatGit/bin/network/TCPChat.class similarity index 100% rename from chatGitElise/bin/network/TCPChat.class rename to chatGit/bin/network/TCPChat.class diff --git a/chatGitElise/bin/network/TCPServer.class b/chatGit/bin/network/TCPServer.class similarity index 100% rename from chatGitElise/bin/network/TCPServer.class rename to chatGit/bin/network/TCPServer.class diff --git a/chatGitElise/bin/network/Tools.class b/chatGit/bin/network/Tools.class similarity index 100% rename from chatGitElise/bin/network/Tools.class rename to chatGit/bin/network/Tools.class diff --git a/chatGitElise/bin/network/UDPInput.class b/chatGit/bin/network/UDPInput.class similarity index 100% rename from chatGitElise/bin/network/UDPInput.class rename to chatGit/bin/network/UDPInput.class diff --git a/chatGitElise/bin/network/UDPOutput.class b/chatGit/bin/network/UDPOutput.class similarity index 100% rename from chatGitElise/bin/network/UDPOutput.class rename to chatGit/bin/network/UDPOutput.class diff --git a/chatGitElise/bin/server/Request.class b/chatGit/bin/server/Request.class similarity index 100% rename from chatGitElise/bin/server/Request.class rename to chatGit/bin/server/Request.class diff --git a/chatGitElise/bin/server/package-info.class b/chatGit/bin/server/package-info.class similarity index 100% rename from chatGitElise/bin/server/package-info.class rename to chatGit/bin/server/package-info.class diff --git a/chatGitElise/bin/test/App$1.class b/chatGit/bin/test/App$1.class similarity index 100% rename from chatGitElise/bin/test/App$1.class rename to chatGit/bin/test/App$1.class diff --git a/chatGitElise/bin/test/App.class b/chatGit/bin/test/App.class similarity index 100% rename from chatGitElise/bin/test/App.class rename to chatGit/bin/test/App.class diff --git a/chatGitElise/bin/test/Launcher.class b/chatGit/bin/test/Launcher.class similarity index 100% rename from chatGitElise/bin/test/Launcher.class rename to chatGit/bin/test/Launcher.class diff --git a/chatGitElise/bin/test/package-info.class b/chatGit/bin/test/package-info.class similarity index 100% rename from chatGitElise/bin/test/package-info.class rename to chatGit/bin/test/package-info.class diff --git a/chatGitElise/config.json b/chatGit/config.json similarity index 87% rename from chatGitElise/config.json rename to chatGit/config.json index 0cf120b..b5a5399 100644 --- a/chatGitElise/config.json +++ b/chatGit/config.json @@ -5,7 +5,7 @@ "port": 8080 }, "config":{ - "interface": "wlan4", + "interface": "wlan3", "portSrc": 26000, "portDest":26001 } diff --git a/chatGitElise/lib/JTattoo-1.6.13.jar b/chatGit/lib/JTattoo-1.6.13.jar similarity index 100% rename from chatGitElise/lib/JTattoo-1.6.13.jar rename to chatGit/lib/JTattoo-1.6.13.jar diff --git a/chatGitElise/lib/java-json.jar b/chatGit/lib/java-json.jar similarity index 100% rename from chatGitElise/lib/java-json.jar rename to chatGit/lib/java-json.jar diff --git a/chatGitElise/lib/mysql-connector-java-5.0.5-bin.jar b/chatGit/lib/mysql-connector-java-5.0.5-bin.jar similarity index 100% rename from chatGitElise/lib/mysql-connector-java-5.0.5-bin.jar rename to chatGit/lib/mysql-connector-java-5.0.5-bin.jar diff --git a/chatGitElise/panda.png b/chatGit/panda.png similarity index 100% rename from chatGitElise/panda.png rename to chatGit/panda.png diff --git a/chatGitElise/src/config/ConfLoad.java b/chatGit/src/config/ConfLoad.java similarity index 100% rename from chatGitElise/src/config/ConfLoad.java rename to chatGit/src/config/ConfLoad.java diff --git a/chatGitElise/src/config/Configuration.java b/chatGit/src/config/Configuration.java similarity index 100% rename from chatGitElise/src/config/Configuration.java rename to chatGit/src/config/Configuration.java diff --git a/chatGitElise/src/config/package-info.java b/chatGit/src/config/package-info.java similarity index 100% rename from chatGitElise/src/config/package-info.java rename to chatGit/src/config/package-info.java diff --git a/chatGitElise/src/controller/Agent.java b/chatGit/src/controller/Agent.java similarity index 100% rename from chatGitElise/src/controller/Agent.java rename to chatGit/src/controller/Agent.java diff --git a/chatGitElise/src/controller/DataBase.java b/chatGit/src/controller/DataBase.java similarity index 100% rename from chatGitElise/src/controller/DataBase.java rename to chatGit/src/controller/DataBase.java diff --git a/chatGitElise/src/controller/Test.java b/chatGit/src/controller/Test.java similarity index 100% rename from chatGitElise/src/controller/Test.java rename to chatGit/src/controller/Test.java diff --git a/chatGitElise/src/controller/package-info.java b/chatGit/src/controller/package-info.java similarity index 100% rename from chatGitElise/src/controller/package-info.java rename to chatGit/src/controller/package-info.java diff --git a/chatGitElise/src/gui/FenetreChat.java b/chatGit/src/gui/FenetreChat.java similarity index 100% rename from chatGitElise/src/gui/FenetreChat.java rename to chatGit/src/gui/FenetreChat.java diff --git a/chatGitElise/src/gui/FenetreConnexion.java b/chatGit/src/gui/FenetreConnexion.java similarity index 100% rename from chatGitElise/src/gui/FenetreConnexion.java rename to chatGit/src/gui/FenetreConnexion.java diff --git a/chatGitElise/src/gui/FenetreInscription.java b/chatGit/src/gui/FenetreInscription.java similarity index 100% rename from chatGitElise/src/gui/FenetreInscription.java rename to chatGit/src/gui/FenetreInscription.java diff --git a/chatGitElise/src/gui/FenetreMenu.java b/chatGit/src/gui/FenetreMenu.java similarity index 100% rename from chatGitElise/src/gui/FenetreMenu.java rename to chatGit/src/gui/FenetreMenu.java diff --git a/chatGitElise/src/gui/FenetreModifPseudo.java b/chatGit/src/gui/FenetreModifPseudo.java similarity index 85% rename from chatGitElise/src/gui/FenetreModifPseudo.java rename to chatGit/src/gui/FenetreModifPseudo.java index c1581f0..e880c0c 100644 --- a/chatGitElise/src/gui/FenetreModifPseudo.java +++ b/chatGit/src/gui/FenetreModifPseudo.java @@ -79,6 +79,7 @@ public class FenetreModifPseudo implements ActionListener { this.ok = new JButton("Continue"); this.Cancel = new JButton("Cancel"); this.ok.addActionListener(this); + this.ok.setSelected(false); this.Cancel.addActionListener(this); //On associe au bouton Connexion des actions a realiser @@ -104,15 +105,24 @@ public class FenetreModifPseudo implements ActionListener { //Si le nouveau pseudo est acceptable if(agent.changerPseudo(newPseudo)) { - - //Affichage message - JOptionPane.showMessageDialog(frame, "Your new pseudo is "+newPseudo); - frame.dispose(); - new FenetreMenu(agent); - + //Affichage message + JOptionPane.showMessageDialog(frame, "Your new pseudo is "+newPseudo); + frame.dispose(); + new FenetreMenu(agent); //Sinon affichage message erreur }else { - JOptionPane.showMessageDialog(frame, "Pseudo already use, choose another one"); + if(!ok.isSelected() && !FenetreMenu.ouvert) { + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + JOptionPane.showMessageDialog(frame, "Pseudo already use, choose another one"); + ok.setSelected(true); + frame.dispose(); + new FenetreModifPseudo(agent); + } } } catch (HeadlessException e1) { diff --git a/chatGitElise/src/gui/SmartScroller.java b/chatGit/src/gui/SmartScroller.java similarity index 100% rename from chatGitElise/src/gui/SmartScroller.java rename to chatGit/src/gui/SmartScroller.java diff --git a/chatGitElise/src/gui/package-info.java b/chatGit/src/gui/package-info.java similarity index 100% rename from chatGitElise/src/gui/package-info.java rename to chatGit/src/gui/package-info.java diff --git a/chatGitElise/src/images/panda.png b/chatGit/src/images/panda.png similarity index 100% rename from chatGitElise/src/images/panda.png rename to chatGit/src/images/panda.png diff --git a/chatGitElise/src/model/Contact.java b/chatGit/src/model/Contact.java similarity index 100% rename from chatGitElise/src/model/Contact.java rename to chatGit/src/model/Contact.java diff --git a/chatGitElise/src/model/ListeContacts.java b/chatGit/src/model/ListeContacts.java similarity index 100% rename from chatGitElise/src/model/ListeContacts.java rename to chatGit/src/model/ListeContacts.java diff --git a/chatGitElise/src/model/Message.java b/chatGit/src/model/Message.java similarity index 100% rename from chatGitElise/src/model/Message.java rename to chatGit/src/model/Message.java diff --git a/chatGitElise/src/model/MessageAffichage.java b/chatGit/src/model/MessageAffichage.java similarity index 100% rename from chatGitElise/src/model/MessageAffichage.java rename to chatGit/src/model/MessageAffichage.java diff --git a/chatGitElise/src/model/MessageChat.java b/chatGit/src/model/MessageChat.java similarity index 100% rename from chatGitElise/src/model/MessageChat.java rename to chatGit/src/model/MessageChat.java diff --git a/chatGitElise/src/model/MessagePseudo.java b/chatGit/src/model/MessagePseudo.java similarity index 100% rename from chatGitElise/src/model/MessagePseudo.java rename to chatGit/src/model/MessagePseudo.java diff --git a/chatGitElise/src/module-info.java b/chatGit/src/module-info.java similarity index 100% rename from chatGitElise/src/module-info.java rename to chatGit/src/module-info.java diff --git a/chatGitElise/src/network/Manager.java b/chatGit/src/network/Manager.java similarity index 100% rename from chatGitElise/src/network/Manager.java rename to chatGit/src/network/Manager.java diff --git a/chatGitElise/src/network/TCPChat.java b/chatGit/src/network/TCPChat.java similarity index 100% rename from chatGitElise/src/network/TCPChat.java rename to chatGit/src/network/TCPChat.java diff --git a/chatGitElise/src/network/TCPServer.java b/chatGit/src/network/TCPServer.java similarity index 100% rename from chatGitElise/src/network/TCPServer.java rename to chatGit/src/network/TCPServer.java diff --git a/chatGitElise/src/network/Tools.java b/chatGit/src/network/Tools.java similarity index 100% rename from chatGitElise/src/network/Tools.java rename to chatGit/src/network/Tools.java diff --git a/chatGitElise/src/network/UDPInput.java b/chatGit/src/network/UDPInput.java similarity index 100% rename from chatGitElise/src/network/UDPInput.java rename to chatGit/src/network/UDPInput.java diff --git a/chatGitElise/src/network/UDPOutput.java b/chatGit/src/network/UDPOutput.java similarity index 100% rename from chatGitElise/src/network/UDPOutput.java rename to chatGit/src/network/UDPOutput.java diff --git a/chatGitElise/src/server/Request.java b/chatGit/src/server/Request.java similarity index 100% rename from chatGitElise/src/server/Request.java rename to chatGit/src/server/Request.java diff --git a/chatGitElise/src/server/package-info.java b/chatGit/src/server/package-info.java similarity index 100% rename from chatGitElise/src/server/package-info.java rename to chatGit/src/server/package-info.java diff --git a/chatGitElise/src/test/App.java b/chatGit/src/test/App.java similarity index 100% rename from chatGitElise/src/test/App.java rename to chatGit/src/test/App.java diff --git a/chatGitElise/src/test/Launcher.java b/chatGit/src/test/Launcher.java similarity index 100% rename from chatGitElise/src/test/Launcher.java rename to chatGit/src/test/Launcher.java diff --git a/chatGitElise/src/test/package-info.java b/chatGit/src/test/package-info.java similarity index 100% rename from chatGitElise/src/test/package-info.java rename to chatGit/src/test/package-info.java diff --git a/chatGitElise/bin/gui/FenetreModifPseudo.class b/chatGitElise/bin/gui/FenetreModifPseudo.class deleted file mode 100644 index eedc77aae753d7ff03c084e15ca628fc95f02675..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3452 zcmZ`+33n6M75>JS8F?}UP*?&XM9x;(0hE$73#Li2jDta5f*lhdXi) z&DJapO+wNp-O`P&xO+L_p`uN}*6E6s9T2wgT`}Yot*KE@REmy@go2HyjMGN8WZ2W$k;zlS^i`}= zaAUA)%==k!TG)Q}py^wVowq!nR$K)gQ?4;56l~5*!G)|hZ_&V!0lC`C?XqEuQp@(J zT;=vP<>34&OO%QVu5Y$6E*AU&xkJH(oV1w98diW_OU6@w&hQgB^>wPhL-yL1?{hMnk=rfv?-yaN81?-Ih^(DTz#xk%KEMDQEP2Saig{zvsrVZ1#%>M!aGyN& zegYM<9EuDXHgn=evG(fdgr*VF59)Y8LaZ6Z;&H1uEqqTp`ym|%(MQ&B;h5w2@_Yr` zGu_RZuW$9r?DXr{fQ=dka9G7dgt{q3bx|FIIKmRRf^A42!W}x@Aa+En5WT#PAq*?H zmJa2}DN-r)X=~(DfTG+nELKZz5~Grj6cet7V;EO47Ee|~QpY18=h_*+g6L}oZ0-doO6P~qXOqPgJB6A|#|FDjaNNf{j!<>~0kL&oTRM4m} zVR=>{z9CPChbwcF!W|C{r1FkwlqL+z5Lz>K6u zM&{|1j%%Q+V4XHsQBdPa*ew3>#j;3~T5j4F^Nli^MOj+;7!Qho3P6dZ>S@;SJU*%71@b%&W1r&|g*#xFzT+?@%mO#pbbcLQ#n%+9H)nY72{*hB|4&0cq2lZ8kAdqkiuF~j z5_6HnH_5F+Gdt6km)39&UGnEUI?iL64ZtXug-yKnM0mxF^+qI!Ek*X3sB`$9j_=EW zlfDzirs0S9v5Fr>e$}&eWTYJAh7D53Ph>0E1 zF5wp{R^!P&OobACIJ97jz(F0ql*ex<^UCwbe0HR9*D$I3j@12C{bI44?BGa4iT78) z8U;JATvaVRl6Sfn5h&H#EXgo7k$S%40ugBxv!seGt%) zQ4X4=ioZ6!vBG26c0-mASh7oRYkiyTm3%`NTTwgzb?`X=`6S>k&Dd$5a-lRI%2`nh`;_hSMFFog$UqYoA2 z@FaI8skJqX1SX1{F(&yUW1MaB84<<%FJh-~?`8Tg3LP~}ufXE>Y#}w*UW2m&movYR zI$guU3Uc9OF_xWwj7)yJv2Oy=SYL|1-6a29#B)`AYHjd? zOk*B9FhU4M`FeVo;T~g%k8t%-{w*-P6DZ>(p1@;x36BTC>tR??@Cwf2)i7kmCzu@! z`7G1++R$z~mpcz5^!Iba9Cz%g;>|ai(jdv_3aM|@@GY)=yNd5##1G_h6+d0YTT-@$ zm1XqHwN#Cp%eZfUVmovA^JVM}zb-H1R(Z