diff --git a/Application/Clavardage/src/controller/ListeningThreadTCPChat.java b/Application/Clavardage/src/controller/ListeningThreadTCPChat.java index c8f4e6a..8d6ea26 100644 --- a/Application/Clavardage/src/controller/ListeningThreadTCPChat.java +++ b/Application/Clavardage/src/controller/ListeningThreadTCPChat.java @@ -94,7 +94,6 @@ public class ListeningThreadTCPChat extends ListeningThread{ try { String msgToprint; while (!(input=in.readLine()).equals("end")/* && c.getActive()*/) { - System.out.println("("+this.controller.myUser.getPseudo()+") recoit => "+rm.getPseudo()+" : "+input); Msg_Text message = new Msg_Text(rm,input); c.addMessage(message); diff --git a/Application/Clavardage/src/model/LocalUser.java b/Application/Clavardage/src/model/LocalUser.java index 9230f63..dae9dbc 100644 --- a/Application/Clavardage/src/model/LocalUser.java +++ b/Application/Clavardage/src/model/LocalUser.java @@ -70,12 +70,19 @@ public class LocalUser extends User{ int index = this.remoteUsersList.indexOf(tmpRemoteUser); if(index!=-1) { System.out.println("("+this.pseudo+") "+"MAJ, IP(port) : "+remoteUserPseudo+" => "+remoteUserIP+"("+remoteUserPortTCP+")"); - this.remoteUsersList.set(index,tmpRemoteUser); + this.remoteUsersList.get(index).setAddIP(remoteUserIP); + this.remoteUsersList.get(index).setPortTCP(remoteUserPortTCP); + this.remoteUsersList.get(index).setPseudo(remoteUserPseudo); } else { System.out.println("("+this.pseudo+") "+"Add new user IP(port) : "+remoteUserPseudo+" => "+remoteUserIP+"("+remoteUserPortTCP+")"); this.remoteUsersList.add(tmpRemoteUser); } + /* + int i = getChatIndexOf(tmpRemoteUser); + if(i!=-1) { + chats.get(i).setRemoteUser(tmpRemoteUser); + }*/ } public Chat addChats(RemoteUser rm) { @@ -83,10 +90,7 @@ public class LocalUser extends User{ if(getChatIndexOf(rm)==-1) { this.getChats().add(newChat); - }/* - else { - System.out.println("pb add chat, déjà un chat avec cet rm user"); - }*/ + } return newChat; }