From 62dda76977109c92bc1f5df633c70f4dacfd9118 Mon Sep 17 00:00:00 2001 From: Alexandre Gonzalvez Date: Fri, 18 Dec 2020 09:59:18 +0100 Subject: [PATCH 1/3] fix askCloseSession --- Application/Clavardage/src/controller/Controller.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Clavardage/src/controller/Controller.java b/Application/Clavardage/src/controller/Controller.java index 01b578a..b1018b8 100644 --- a/Application/Clavardage/src/controller/Controller.java +++ b/Application/Clavardage/src/controller/Controller.java @@ -380,6 +380,7 @@ public class Controller { } public void askCloseSession() { + closeSession(this.activeChat); this.activeChat = null; } public void closeSession(Chat c) { From a44ec938693705a0cbce9e33b968411c3d6f7c77 Mon Sep 17 00:00:00 2001 From: Alexandre Gonzalvez Date: Fri, 18 Dec 2020 10:00:17 +0100 Subject: [PATCH 2/3] fix askCloseSession --- Application/Clavardage/src/controller/Controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Clavardage/src/controller/Controller.java b/Application/Clavardage/src/controller/Controller.java index b1018b8..33fb58d 100644 --- a/Application/Clavardage/src/controller/Controller.java +++ b/Application/Clavardage/src/controller/Controller.java @@ -385,7 +385,7 @@ public class Controller { } public void closeSession(Chat c) { sendMessage(new Msg_Text(myUser.getAddIP(),"end"), c); // tell rm session STOP - JOptionPane.showMessageDialog(null ,"Close session with "+c.getRemoteUser().getPseudo()+" loading history"); + JOptionPane.showMessageDialog(null ,"Close session with "+c.getRemoteUser().getPseudo()); this.myUser.closeChat(c); } From b9a1a15dca7f9a197888edaf5538f4847cc0a64b Mon Sep 17 00:00:00 2001 From: Alexandre Gonzalvez Date: Fri, 18 Dec 2020 10:05:57 +0100 Subject: [PATCH 3/3] fix changePseudo --- Application/Clavardage/src/controller/Controller.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Application/Clavardage/src/controller/Controller.java b/Application/Clavardage/src/controller/Controller.java index 33fb58d..6fdf8ca 100644 --- a/Application/Clavardage/src/controller/Controller.java +++ b/Application/Clavardage/src/controller/Controller.java @@ -190,16 +190,18 @@ public class Controller { String tmpPseudo = view.PseudotextField.getText(); // Read user input - while(!(this.validatePseudo(tmpPseudo)) || tmpPseudo.equals(oldPseudo)) { + if(!(this.validatePseudo(tmpPseudo)) || tmpPseudo.equals(oldPseudo)) { view.Pseudolabel.setText("Already exists, enter another nickname. Your current username is: " + oldPseudo); // Read user input tmpPseudo = view.PseudotextField.getText(); // Read user input } + else { + this.myUser.setPseudo(tmpPseudo); + JOptionPane.showMessageDialog(null ,"Your new nickname : " + tmpPseudo + " is valid !"); + this.notify_remote_users(); - this.myUser.setPseudo(tmpPseudo); + } - JOptionPane.showMessageDialog(null ,"Your new nickname : " + tmpPseudo + " is valid !"); - this.notify_remote_users(); } /** *