src/main/java/fr/insa/clavardator/chat/ChatHistory.java

@@ -32,11 +32,11 @@ public class ChatHistory {
 	}
 
 	private void notifyHistoryLoaded() {
-		historyListener.forEach(l -> l.onHistoryLoaded(user, history));
+		historyListener.forEach(l -> l.onHistoryLoaded(history));
 	}
 
 	private void notifyMessageAdded(Message message) {
-		messageListener.forEach(l -> l.onMessageAdded(user, message));
+		messageListener.forEach(l -> l.onMessageAdded(message));
 	}
 
 	public void load() {
@@ -75,11 +75,11 @@ public class ChatHistory {
 	}
 
 	public interface MessageAddedCallback {
-		void onMessageAdded(PeerUser user, Message message);
+		void onMessageAdded(Message message);
 	}
 
 	public interface HistoryLoadedCallback {
-		void onHistoryLoaded(PeerUser user, ArrayList<Message> history);
+		void onHistoryLoaded(ArrayList<Message> history);
 	}
 
 }

src/main/java/fr/insa/clavardator/ui/MainController.java

@@ -94,7 +94,7 @@ public class MainController implements Initializable {
 		userListController.addRefreshUserListener(() -> System.out.println("refresh event"));
 		userListController.addUserSelectedListener((user) -> chatController.setRemoteUser(user));
 		chatController.addAttachmentListener(() -> System.out.println("attach event"));
-		chatController.addSendListener((text) -> System.out.println("sent : " + text));
+		chatController.addSendListener(() -> System.out.println("send event"));
 		toolbarController.addEditListener(() -> {
 			try {
 				openEditUsernameDialog();

src/main/java/fr/insa/clavardator/ui/chat/ChatController.java

@@ -33,19 +33,15 @@ public class ChatController implements Initializable {
 	@FXML
 	private VBox loadingContainer;
 
-	private PeerUser remoteUser;
-
 	public void addAttachmentListener(ButtonPressEvent listener) {
 		chatFooterController.addAttachmentListener(listener);
 	}
 
-	public void addSendListener(ChatFooterController.SendMessageEvent listener) {
+	public void addSendListener(ButtonPressEvent listener) {
 		chatFooterController.addSendListener(listener);
 	}
 
 	public void setRemoteUser(PeerUser remoteUser) {
-		this.remoteUser = remoteUser;
-		this.chatFooterController.setRemoteUser(remoteUser);
 		this.chatHeaderController.setRemoteUser(remoteUser);
 		setState(State.LOADING);
 
@@ -55,15 +51,13 @@ public class ChatController implements Initializable {
 		history.load();
 	}
 
-	private void onHistoryLoaded(PeerUser user, ArrayList<Message> messages) {
+	private void onHistoryLoaded(ArrayList<Message> messages) {
-		if (user.equals(remoteUser)) {
 		messageList.setItems(FXCollections.observableArrayList(messages));
 		messageList.scrollTo(messageList.getItems().size() - 1);
 		setState(State.DONE);
 	}
-	}
 
-	private void onMessageAdded(PeerUser user, Message message) {
+	private void onMessageAdded(Message message) {
 		messageList.getItems().add(message);
 		messageList.scrollTo(messageList.getItems().size() - 1);
 	}

src/main/java/fr/insa/clavardator/ui/chat/ChatFooterController.java

@@ -1,19 +1,12 @@
 package fr.insa.clavardator.ui.chat;
 
-import com.jfoenix.controls.JFXTextField;
 import fr.insa.clavardator.ui.ButtonPressEvent;
-import fr.insa.clavardator.users.PeerUser;
-import javafx.beans.value.ObservableValue;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
 
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.ResourceBundle;
 
@@ -21,79 +14,31 @@ public class ChatFooterController implements Initializable {
 
 	@FXML
 	private HBox container;
-	@FXML
-	private JFXTextField textField;
 
 	private List<ButtonPressEvent> attachmentListeners;
-	private List<SendMessageEvent> sendListeners;
+	private List<ButtonPressEvent> sendListeners;
-
-	private PeerUser remoteUser;
-	private HashMap<PeerUser, String> savedText;
-
 
 	public void addAttachmentListener(ButtonPressEvent listener) {
 		attachmentListeners.add(listener);
 	}
-	public void addSendListener(SendMessageEvent listener) {
+	public void addSendListener(ButtonPressEvent listener) {
 		sendListeners.add(listener);
 	}
 
 	public void onAttachmentPress() {
 		attachmentListeners.forEach(ButtonPressEvent::onPress);
 	}
-	public void onSend() {
+	public void onSendPress() {
-		sendListeners.forEach((l) -> l.onSend(findSavedText()));
+		sendListeners.forEach(ButtonPressEvent::onPress);
-		textField.setText("");
 	}
 
 	public void setEnabled(boolean enabled) {
 		container.setDisable(!enabled);
 	}
 
-	private String findSavedText() {
-		String text = null;
-		if (remoteUser != null) {
-			text = savedText.get(remoteUser);
-		}
-		return text != null ? text : "";
-	}
-
-	private void saveText(String text) {
-		if (remoteUser != null) {
-			savedText.put(remoteUser, text);
-		}
-	}
-
-	public void onTextChange(ObservableValue<? extends String> observable, String oldText, String newText) {
-		saveText(newText);
-	}
-
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
-		savedText = new HashMap<>();
 		attachmentListeners = new ArrayList<>();
 		sendListeners = new ArrayList<>();
-		textField.textProperty().addListener(this::onTextChange);
-		textField.setOnKeyPressed(event -> {
-			if (event.getCode() == KeyCode.ENTER) {
-				event.consume();
-				if (event.isShiftDown()) {
-					textField.appendText(System.getProperty("line.separator"));
-				} else {
-					if(!textField.getText().isEmpty()){
-						onSend();
-					}
-				}
-			}
-		});
-	}
-
-	public void setRemoteUser(PeerUser remoteUser) {
-		this.remoteUser = remoteUser;
-		textField.setText(findSavedText());
-	}
-
-	public interface SendMessageEvent {
-		void onSend(String text);
 	}
 }

src/main/resources/fr/insa/clavardator/ui/chat/chatFooter.fxml

@@ -12,13 +12,13 @@
   <padding>
     <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
   </padding>
-  <JFXTextField HBox.hgrow="ALWAYS" fx:id="textField"/>
+  <JFXTextField HBox.hgrow="ALWAYS"/>
   <JFXButton mnemonicParsing="false" onMouseClicked="#onAttachmentPress">
     <graphic>
       <FontIcon iconLiteral="fas-paperclip" iconSize="24"/>
     </graphic>
   </JFXButton>
-  <JFXButton mnemonicParsing="false" text="Envoyer" onMouseClicked="#onSend">
+  <JFXButton mnemonicParsing="false" text="Envoyer" onMouseClicked="#onSendPress">
     <graphic>
       <FontIcon iconLiteral="fas-paper-plane" iconSize="24"/>
     </graphic>