From ead2eab5a018c8be4fe0640ec5d000ce604ef71a Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Fri, 7 Feb 2020 15:27:26 +0100
Subject: [PATCH] Added the UserStatusChangeProcessor and its implementation

this commit serves as solution to the merge conflict between
f/user_status_change_processor and develop
---
 src/main/java/envoy/client/net/Client.java    | 21 ++++++++--
 .../client/net/UserStatusChangeProcessor.java | 40 +++++++++++++++++++
 src/main/java/envoy/client/ui/ChatWindow.java |  4 ++
 3 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/envoy/client/net/UserStatusChangeProcessor.java

diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index d742f1b..9c52992 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -14,9 +14,7 @@ import envoy.client.data.Config;
 import envoy.client.data.LocalDb;
 import envoy.client.util.EnvoyLog;
 import envoy.data.*;
-import envoy.event.Event;
-import envoy.event.IdGeneratorRequest;
-import envoy.event.MessageStatusChangeEvent;
+import envoy.event.*;
 import envoy.util.SerializationUtils;
 
 /**
@@ -100,6 +98,8 @@ public class Client implements Closeable {
 		receiver.removeAllProcessors();
 
 		// Register processors for message and status handling
+
+		// Process incoming messages
 		final ReceivedMessageProcessor receivedMessageProcessor = new ReceivedMessageProcessor();
 		receiver.registerProcessor(Message.class, receivedMessageProcessor);
 
@@ -109,6 +109,9 @@ public class Client implements Closeable {
 		// Process message status changes
 		receiver.registerProcessor(MessageStatusChangeEvent.class, new MessageStatusChangeEventProcessor());
 
+		// Process user status changes
+		receiver.registerProcessor(UserStatusChangeEvent.class, new UserStatusChangeProcessor(this));
+
 		// Process message ID generation
 		receiver.registerProcessor(IdGenerator.class, localDb::setIdGenerator);
 
@@ -207,4 +210,16 @@ public class Client implements Closeable {
 	 * @since Envoy v0.2-alpha
 	 */
 	public boolean isOnline() { return online; }
+
+	/**
+	 * @return the contacts of this {@link Client}
+	 * @since Envoy v0.3-alpha
+	 */
+	public Contacts getContacts() { return contacts; }
+
+	/**
+	 * @param contacts the contacts to set
+	 * @since Envoy v0.3-alpha
+	 */
+	public void setContacts(Contacts contacts) { this.contacts = contacts; }
 }
\ No newline at end of file
diff --git a/src/main/java/envoy/client/net/UserStatusChangeProcessor.java b/src/main/java/envoy/client/net/UserStatusChangeProcessor.java
new file mode 100644
index 0000000..4f98358
--- /dev/null
+++ b/src/main/java/envoy/client/net/UserStatusChangeProcessor.java
@@ -0,0 +1,40 @@
+package envoy.client.net;
+
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.logging.Logger;
+
+import envoy.client.util.EnvoyLog;
+import envoy.data.User;
+import envoy.event.EventBus;
+import envoy.event.UserStatusChangeEvent;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>UserStatusChangeProcessor.java</strong><br>
+ * Created: <strong>2 Feb 2020</strong><br>
+ *
+ * @author Leon Hofmeister
+ * @since Envoy v0.3-alpha
+ */
+public class UserStatusChangeProcessor implements Consumer<UserStatusChangeEvent> {
+
+	private static final Logger	logger	= EnvoyLog.getLogger(UserStatusChangeProcessor.class.getSimpleName());
+	private Client				client;
+
+	/**
+	 * @param client the {@link Client} who receives an
+	 *               {@link UserStatusChangeEvent}
+	 * @since Envoy v0.3-alpha
+	 */
+	public UserStatusChangeProcessor(Client client) { this.client = client; }
+
+	@Override
+	public void accept(UserStatusChangeEvent evt) {
+		logger.info("Received " + evt);
+		List<User> contacts = client.getContacts().getContacts();
+		contacts.stream().filter((user) -> user.getId() == evt.getId()).findFirst().get().setStatus(evt.get());
+		EventBus.getInstance().dispatch(evt);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/envoy/client/ui/ChatWindow.java b/src/main/java/envoy/client/ui/ChatWindow.java
index 7d537bf..8a7723e 100644
--- a/src/main/java/envoy/client/ui/ChatWindow.java
+++ b/src/main/java/envoy/client/ui/ChatWindow.java
@@ -26,6 +26,7 @@ import envoy.data.MessageBuilder;
 import envoy.data.User;
 import envoy.event.EventBus;
 import envoy.event.MessageStatusChangeEvent;
+import envoy.event.UserStatusChangeEvent;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -211,6 +212,9 @@ public class ChatWindow extends JFrame {
 		// Listen to theme changes
 		EventBus.getInstance().register(ThemeChangeEvent.class, (evt) -> applyTheme((Theme) evt.get()));
 
+		// Listen to UserStatus changes
+		EventBus.getInstance().register(UserStatusChangeEvent.class, (evt) -> { userList.revalidate(); userList.repaint(); });
+
 		// Listen to received messages
 		EventBus.getInstance().register(MessageCreationEvent.class, (evt) -> {
 			Message	message	= ((MessageCreationEvent) evt).get();