Changed message list to use JLabels as elements

* Using JLabel as message list element
* Managing sender and recipient in Client
* Reduced amount of ReST requests

src/main/java/envoy/client/Chat.java

@@ -1,40 +1,20 @@
 package envoy.client;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.swing.DefaultListModel;
 
 import envoy.schema.Message;
+import envoy.schema.User;
 
 public class Chat {
 
-	public long chatPartnerID;
+	private User						recipient;
-	public List<Message> messageList;
+	private DefaultListModel<Message>	model	= new DefaultListModel<>();
-	DefaultListModel chatModel;
-	public Chat() {
-		chatPartnerID = 0;
-		chatModel = new DefaultListModel();
-		messageList = new ArrayList<Message>();
-	}
 
-	public void setUserID(long givenUserID) { chatPartnerID = givenUserID;}
+	public Chat(User recipient) { this.recipient = recipient; }
 
-	public long getUserID() { return chatPartnerID;}
+	public User getRecipient() { return recipient; }
 
-	public int getSize() { return chatModel.getSize();}
+	public void appendMessage(Message message) { model.addElement(message); }
-	
-	public void addMessage(String message) { chatModel.addElement(message);}
-	
-	public String getMessageAt(int index) { return (String) chatModel.getElementAt(index);}
-	
-	@SuppressWarnings("unchecked")
-	public DefaultListModel<String> getModel() { return chatModel;}
-	
-	public int getListSize() { return messageList.size();}
-	
-	public void addMessageElement(Message message) { messageList.add(message);}
-	
-	public Message getMessageElement(int index) { return messageList.get(index);}
 
+	public DefaultListModel<Message> getModel() { return model; }
 }

src/main/java/envoy/client/Client.java

@@ -36,7 +36,7 @@ public class Client {
 	private ObjectFactory	objectFactory	= new ObjectFactory();
 	private DatatypeFactory	datatypeFactory;
 	private Config			config;
-	private User			user;
+	private User			sender, recipient;
 
 	public Client(Config config, String username) {
 		this.config = config;
@@ -45,8 +45,7 @@ public class Client {
 		} catch (DatatypeConfigurationException e) {
 			e.printStackTrace();
 		}
-		user = getUser(username);
+		sender = getUser(username);
-		System.out.printf("Mein Name ist %s und ich habe die ID %d%n", user.getName(), user.getID());
 	}
 
 	/**
@@ -89,15 +88,13 @@ public class Client {
 	/**
 	 * Creates a {@link Message} object serializable to XML.
 	 * 
-	 * @param senderID    The ID of the sender
-	 * @param recipientID The ID of the recipient
 	 * @param textContent The content (text) of the message
 	 * @return prepared {@link Message} object
 	 */
-	public Message createMessage(long senderID, long recipientID, String textContent) {
+	public Message createMessage(String textContent) {
 		Message.MetaData metaData = objectFactory.createMessageMetaData();
-		metaData.setSender(senderID);
+		metaData.setSender(sender.getID());
-		metaData.setRecipient(recipientID);
+		metaData.setRecipient(recipient.getID());
 		metaData.setState(MessageState.WAITING);
 		metaData.setDate(datatypeFactory.newXMLGregorianCalendar(Instant.now().toString()));
 
@@ -150,10 +147,14 @@ public class Client {
 	}
 
 	/**
-	 * @return the user id of this client
+	 * @return the sender object that represents this client
 	 * @since Envoy 0.1
 	 */
-	public long getSenderID() { return user.getID(); }
+	public User getSender() { return sender; }
 
-	public User getClientUser() { return user;}
+	public User getRecipient() { return recipient; }
+
+	public void setRecipient(User recipient) { this.recipient = recipient; }
+
+	public boolean hasRecipient() { return recipient != null; }
 }

src/main/java/envoy/client/ui/ChatWindow.java

@@ -42,25 +42,21 @@ public class ChatWindow extends JFrame {
 
 	private static final long serialVersionUID = 6865098428255463649L;
 
-	private long	recipientID	= 0;
+	private JPanel contentPane = new JPanel();
-	private JPanel	contentPane	= new JPanel();
 
 	private Client client;
 
-	private DefaultListModel<String>	messageListModel	= new DefaultListModel<>();
+	private DefaultListModel<Message>	messageListModel	= new DefaultListModel<>();
 	private List<Chat>					partnerChatList		= new ArrayList<Chat>();
+	private Chat						currentChat;
 
-	@SuppressWarnings("null")
 	public ChatWindow(Client client) {
 		this.client = client;
 
+		// Initialize chat list and current chat
 		Users chatUsers = client.getUsersListXml();
-
+		chatUsers.getUser().forEach(user -> partnerChatList.add(new Chat(user)));
-		for (int i = 0; i < chatUsers.getUser().size(); i++) {
+		if (partnerChatList.size() > 0) currentChat = partnerChatList.get(0);
-			Chat userChat = new Chat();
-			userChat.setUserID(chatUsers.getUser().get(i).getID());
-			partnerChatList.add(userChat);
-		}
 
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		setBounds(100, 100, 600, 800);
@@ -78,24 +74,25 @@ public class ChatWindow extends JFrame {
 		gbl_contentPane.rowWeights		= new double[] { 0.05, 1, 0.07 };
 		contentPane.setLayout(gbl_contentPane);
 
-		JList<String> elementList = new JList<>();
+		JList<Message> messageList = new JList<>();
-		elementList.setFocusTraversalKeysEnabled(false);
+		messageList.setCellRenderer(new MessageListRenderer());
 
-		elementList.setSelectionForeground(new Color(255, 255, 255));
+		messageList.setFocusTraversalKeysEnabled(false);
-		elementList.setSelectionBackground(new Color(102, 0, 153));
+		messageList.setSelectionForeground(new Color(255, 255, 255));
-		elementList.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+		messageList.setSelectionBackground(new Color(102, 0, 153));
-		elementList.setForeground(new Color(255, 255, 255));
+		messageList.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
-		elementList.setBackground(new Color(51, 51, 51));
+		messageList.setForeground(new Color(255, 255, 255));
+		messageList.setBackground(new Color(51, 51, 51));
 
-		elementList.setModel(messageListModel);
+		messageList.setModel(messageListModel);
-		elementList.setFont(new Font("Arial", Font.PLAIN, 17));
+		messageList.setFont(new Font("Arial", Font.PLAIN, 17));
-		elementList.setFixedCellHeight(60);
+		messageList.setFixedCellHeight(60);
-		elementList.setBorder(new EmptyBorder(5, 5, 5, 5));
+		messageList.setBorder(new EmptyBorder(5, 5, 5, 5));
 
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setForeground(new Color(0, 0, 0));
 		scrollPane.setBackground(new Color(51, 51, 51));
-		scrollPane.setViewportView(elementList);
+		scrollPane.setViewportView(messageList);
 		scrollPane.setBorder(null);
 
 		GridBagConstraints gbc_scrollPane = new GridBagConstraints();
@@ -141,27 +138,27 @@ public class ChatWindow extends JFrame {
 
 		gbc_moveSelectionPostButton.insets = new Insets(10, 10, 10, 10);
 
-		contentPane.add(postButton, gbc_moveSelectionPostButton);
-
 		postButton.addActionListener((evt) -> {
-			if (recipientID == 0) System.out.println("Please select recipient");
+			if (!client.hasRecipient()) {
+				JOptionPane.showMessageDialog(this,
+						"Please select a recipient!",
+						"Cannot send message",
+						JOptionPane.INFORMATION_MESSAGE);
+				return;
+			}
 
-			// TODO: Acquire proper sender id
+			if (!messageEnterTextfield.getText().isEmpty()) try {
-			if (!messageEnterTextfield.getText().isEmpty() && recipientID != 0) try {
+
-				final Message message = client
+				// Create and send message object
-					.createMessage(client.getSenderID(), recipientID, messageEnterTextfield.getText());
+				final Message message = client.createMessage(messageEnterTextfield.getText());
 				client.sendMessage(message);
-				Chat partnerChat = null;
-				for (int i = 0; i < partnerChatList.size(); i++) {
-					if (recipientID == partnerChatList.get(i).getUserID()) {
-						partnerChat = partnerChatList.get(i);
-						// System.out.println("partnerChatID: " + partnerChatList.get(i).getUserID());
 
-					}
+				// Append message object to chat
-				}
+				currentChat.appendMessage(message);
-				appendMessageToChat(message, partnerChat);
+				messageList.setModel(currentChat.getModel());
+
+				// Clear text field
 				messageEnterTextfield.setText("");
-				elementList.setModel(partnerChat.getModel());
 				contentPane.revalidate();
 			} catch (Exception e) {
 				JOptionPane.showMessageDialog(this,
@@ -172,6 +169,8 @@ public class ChatWindow extends JFrame {
 			}
 		});
 
+		contentPane.add(postButton, gbc_moveSelectionPostButton);
+
 		// Partner name display
 		JTextPane textPane = new JTextPane();
 		textPane.setBackground(new Color(0, 0, 0));
@@ -194,22 +193,20 @@ public class ChatWindow extends JFrame {
 		userList.addListSelectionListener((listSelectionEvent) -> {
 			if (!listSelectionEvent.getValueIsAdjusting()) {
 				@SuppressWarnings("unchecked")
-				JList<User> selectedUserList = (JList<User>) listSelectionEvent.getSource();
+				final JList<User>	selectedUserList	= (JList<User>) listSelectionEvent.getSource();
-				recipientID = selectedUserList.getModel().getElementAt(selectedUserList.getSelectedIndex()).getID();
+				final User			user				= selectedUserList.getSelectedValue();
-				Chat selectedChat = null;
+				client.setRecipient(user);
 
-				for (int i = 0; i < partnerChatList.size(); i++) {
+				currentChat = partnerChatList.stream()
-					if (selectedUserList.getSelectedIndex() == partnerChatList.get(i).getUserID() - 1) {
+					.filter(chat -> chat.getRecipient().getID() == user.getID())
-						selectedChat = partnerChatList.get(i);
+					.findFirst()
+					.get();
 
-					}
+				client.setRecipient(user);
-				}
+
-				User partner = getPartner();
+				textPane.setText(currentChat.getRecipient().getName());
-				System.out.println(partner.getName());
+				messageList.setModel(currentChat.getModel());
-				textPane.setText(partner.getName());
-				elementList.setModel(selectedChat.getModel());
 				contentPane.revalidate();
-
 			}
 		});
 
@@ -221,7 +218,7 @@ public class ChatWindow extends JFrame {
 		userList.setBorder(new EmptyBorder(5, 5, 5, 5));
 
 		GridBagConstraints gbc_userList = new GridBagConstraints();
-		gbc_userList.fill = GridBagConstraints.VERTICAL;
+		gbc_userList.fill	= GridBagConstraints.VERTICAL;
 		gbc_userList.gridx	= 0;
 		gbc_userList.gridy	= 1;
 		gbc_userList.anchor	= GridBagConstraints.PAGE_START;
@@ -247,39 +244,4 @@ public class ChatWindow extends JFrame {
 			SwingUtilities.invokeLater(() -> userList.setModel(userListModel));
 		}).start();
 	}
-
-	/**
-	 * Extracts the first text content from a message.
-	 * 
-	 * @param message The message from which to return the text content
-	 * @return The first content of type 'text'
-	 */
-	private String getFirstTextContent(Message message) { return message.getContent().get(0).getText(); }
-
-	/**
-	 * Appends a message with sender and message content to the message list.
-	 * 
-	 * @param message The message to append
-	 */
-	private void appendMessageToChat(Message message, Chat partnerChat) {
-		partnerChat.addMessage("<html>"
-				+ "<p style=\"color:#d2d235\"> <b> <small>"
-				+ client.getClientUser().getName() + " "
-				+ (message.getMetaData().getDate().getHour() + 2) + ":" //Dont know why this parameter 2 hours back.
-				+ message.getMetaData().getDate().getMinute() + ":"
-				+ message.getMetaData().getDate().getSecond()
-				//Dont know
-				+ "</b> </small>" + "<br>" + "<p style=\"color:white\">" + getFirstTextContent(message)
-				+ "</span></html>");
-		partnerChat.addMessageElement(message);
-	}
-
-	public User getPartner() {
-		Users	users	= client.getUsersListXml();
-		User	partner	= null;
-		for (int i = 0; i < users.getUser().size(); i++) {
-			if (users.getUser().get(i).getID() == recipientID) { partner = users.getUser().get(i); }
-		}
-		return partner;
-	}
 }

src/main/java/envoy/client/ui/MessageListRenderer.java

@@ -0,0 +1,42 @@
+package envoy.client.ui;
+
+import java.awt.Component;
+
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+
+import envoy.schema.Message;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>UserListRenderer.java</strong><br>
+ * Created: <strong>19 Oct 2019</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ */
+public class MessageListRenderer extends JLabel implements ListCellRenderer<Message> {
+
+	private static final long serialVersionUID = 5164417379767181198L;
+
+	@Override
+	public Component getListCellRendererComponent(JList<? extends Message> list, Message value, int index,
+			boolean isSelected,
+			boolean cellHasFocus) {
+		if (isSelected) {
+			setBackground(list.getSelectionBackground());
+			setForeground(list.getSelectionForeground());
+		} else {
+			setBackground(list.getBackground());
+			setForeground(list.getForeground());
+		}
+
+		// Enable background rendering
+		setOpaque(true);
+
+		setText(value.getContent().get(0).getText());
+		setFont(list.getFont());
+
+		return this;
+	}
+}