From c2ef4108cbdf10750db4766e11c15bf94af6a4ff Mon Sep 17 00:00:00 2001 From: bouclyma Date: Wed, 11 Dec 2024 10:54:28 +0100 Subject: [PATCH] =?UTF-8?q?feat(message):=20Cr=C3=A9ation=20message=20quan?= =?UTF-8?q?d=20bouton=20send=20cliqu=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/rtgre/chat/ChatController.java | 28 +++++++++++++++++-- chat/src/main/java/rtgre/modeles/Contact.java | 8 ++++-- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/chat/src/main/java/rtgre/chat/ChatController.java b/chat/src/main/java/rtgre/chat/ChatController.java index 6b307d5..006995a 100644 --- a/chat/src/main/java/rtgre/chat/ChatController.java +++ b/chat/src/main/java/rtgre/chat/ChatController.java @@ -25,6 +25,7 @@ import net.synedra.validatorfx.Validator; import rtgre.chat.graphisme.ContactListViewCell; import rtgre.modeles.Contact; import rtgre.modeles.ContactMap; +import rtgre.modeles.Message; import java.awt.image.BufferedImage; import java.io.File; @@ -89,6 +90,7 @@ public class ChatController implements Initializable { avatarMenuItem.setOnAction(this::handleAvatarChange); avatarImageView.setOnMouseClicked(this::handleAvatarChange); + sendButton.setOnAction(this::onActionSend); initContactListView(); @@ -103,6 +105,15 @@ public class ChatController implements Initializable { /* -------------------------------------- */ loginTextField.setText("riri"); connectionButton.setSelected(true); + /* -------------------------------------- */ + } + + private void onActionSend(ActionEvent actionEvent) { + String login = getSelectedContactLogin(); + if (login != null) { + Message message = new Message(login, messageTextField.getText()); + LOGGER.info(message.toString()); + } } private void handleAvatarChange(Event event) { @@ -131,8 +142,8 @@ public class ChatController implements Initializable { java.awt.Image img = SwingFXUtils.fromFXImage(this.avatarImageView.getImage(), null); this.contact = new Contact(loginTextField.getText(), img); contactMap.put(this.contact.getLogin(), this.contact); - System.out.println("Nouveau contact : " + contact); - System.out.println(contactMap); + LOGGER.info("Nouveau contact : " + contact); + LOGGER.info(contactMap.toString()); } } @@ -160,7 +171,7 @@ public class ChatController implements Initializable { Platform.runLater(() -> dateTimeLabel.setText(datetime)); Thread.sleep(60000); } catch (Exception e) { - System.out.println(e); + LOGGER.severe(e.getMessage()); } } @@ -181,4 +192,15 @@ public class ChatController implements Initializable { LOGGER.severe(e.getMessage()); } } + + public String getSelectedContactLogin() { + String login; + try { + login = contactsListView.getSelectionModel().getSelectedItem().toString(); + } catch (java.lang.NullPointerException e) { + login = null; + } + LOGGER.info("Selected login: " + login); + return login; + } } \ No newline at end of file diff --git a/chat/src/main/java/rtgre/modeles/Contact.java b/chat/src/main/java/rtgre/modeles/Contact.java index cf3e786..549fefa 100644 --- a/chat/src/main/java/rtgre/modeles/Contact.java +++ b/chat/src/main/java/rtgre/modeles/Contact.java @@ -7,6 +7,8 @@ import java.io.File; import java.io.IOException; import java.util.Objects; +import static rtgre.chat.ChatApplication.LOGGER; + public class Contact { protected String login; protected java.awt.Image avatar; @@ -52,9 +54,9 @@ public class Contact { try { this.avatar = avatarFromLogin(banques_avatars, login); } catch (IOException e) { - System.out.println("Impossible de créer l'utilisateur " + login); - System.out.println(e.getMessage()); - System.out.println(banques_avatars); + LOGGER.severe("Impossible de créer l'utilisateur " + login); + LOGGER.severe(e.getMessage()); + LOGGER.severe(banques_avatars.getAbsolutePath()); } this.connected = connected; this.currentRoom = null;