From fcc8136d14d5f12f79ee06e6abc13573b9187881 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Wed, 6 Jan 2021 11:15:02 +0100 Subject: [PATCH] Do not add new line if no text on attachment --- .../insa/clavardator/ui/chat/MessageListItemController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/insa/clavardator/ui/chat/MessageListItemController.java b/src/main/java/fr/insa/clavardator/ui/chat/MessageListItemController.java index 37df280..022edfb 100644 --- a/src/main/java/fr/insa/clavardator/ui/chat/MessageListItemController.java +++ b/src/main/java/fr/insa/clavardator/ui/chat/MessageListItemController.java @@ -40,7 +40,10 @@ public class MessageListItemController implements Initializable { String text = message.getText(); if (message instanceof FileMessage) { FileMessage fileMessage = ((FileMessage) message); - text += "\n<" + fileMessage.getFileName() + ">"; + if (text != null && !text.isEmpty()) { + text += "\n"; + } + text += "<" + fileMessage.getFileName() + ">"; button.setOnMouseClicked(event -> openFile(fileMessage.getPath())); } button.setText(text);