Packets

Organized how packets work.

src/main/java/client/ChatWindow.java

@@ -31,8 +31,9 @@ import javax.swing.ListSelectionModel;
 import javax.swing.WindowConstants;
 import javax.swing.border.EmptyBorder;
 
-import common.Message;
-import common.Message.MessageType;
+import common.InfoPacket;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 @SuppressWarnings("serial")
 public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyListener {
@@ -51,7 +52,7 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 	GridBagConstraints con = new GridBagConstraints();
 	
 	JPanel right = new JPanel();
-	JLabel lblUsersOnline = new JLabel("Users online:");
+	JLabel infoLabel = new JLabel("Users online:");
 	DefaultListModel<String> model = new DefaultListModel<String>();
 	JList<String> userList = new JList<String>(model);
 	JButton reconnect = new JButton("Reconnect");
@@ -69,15 +70,15 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		userList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		userList.setLayoutOrientation(JList.VERTICAL);
 		//Label config
-		lblUsersOnline.setHorizontalAlignment(JLabel.CENTER);
-		lblUsersOnline.setBorder(new EmptyBorder(5, 5, 5, 5));
+		infoLabel.setHorizontalAlignment(JLabel.CENTER);
+		infoLabel.setBorder(new EmptyBorder(5, 5, 5, 5));
 		//Layout config
 		right.setLayout(g);
 		con.fill = GridBagConstraints.HORIZONTAL;
 		con.weightx = 1;
 		con.gridx = 0;
 		
-		right.add(lblUsersOnline, con);
+		right.add(infoLabel, con);
 		
 		con.weighty = 1;
 		con.fill = GridBagConstraints.BOTH;
@@ -116,13 +117,13 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		if (so.isConnected() && !so.isClosed())
 			out.println(text);
 		else {
-			chat.log(new Message("Not connected to server!", MessageType.WARNING, false));
+			chat.log(new MessagePacket("Not connected to server!", MessageType.WARNING));
 			write.setEnabled(false);
 		}
 	}
 	
 	void connect(String address, int port, String username) {
-		chat.log(new Message("Connecting to " + address + " on port " + port + ".", MessageType.INFO, false));
+		chat.log(new MessagePacket("Connecting to " + address + " on port " + port + ".", MessageType.INFO));
 		if (getMessages != null)
 			getMessages.interrupt();
 		
@@ -133,7 +134,7 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		} catch (NullPointerException ex) {
 			//Nothing
 		} catch (IOException ex) {
-			chat.log(new Message(ex.toString(), MessageType.ERROR, false));
+			chat.log(new MessagePacket(ex.toString(), MessageType.ERROR));
 		}
 		
 		try {
@@ -142,10 +143,10 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 			objIn = new ObjectInputStream(so.getInputStream());
 			out = new PrintWriter(so.getOutputStream(), true);
 		} catch (SocketTimeoutException ex) {
-			chat.log(new Message("Could not connect to server. (Connection timed out!)", MessageType.ERROR, false));
+			chat.log(new MessagePacket("Could not connect to server. (Connection timed out!)", MessageType.ERROR));
 			return;
 		} catch (IOException e) {
-			chat.log(new Message(e.toString(), MessageType.ERROR, false));
+			chat.log(new MessagePacket(e.toString(), MessageType.ERROR));
 			return;
 		}
 		
@@ -159,7 +160,7 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 	
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		if (e.getSource() == reconnect)
+		if (e.getSource().equals(reconnect))
 			connect(adress, port, username);
 	}
 	
@@ -168,31 +169,33 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		try {
 			getMessages();
 		} catch (EOFException eof) {
-			chat.log(new Message(eof.toString() + " Disconnected from host.", MessageType.ERROR, false));
+			chat.log(new MessagePacket(eof.toString() + " Disconnected from host.", MessageType.ERROR));
 		} catch (ClassNotFoundException cnf) {
-			chat.log(new Message("The message recieved from the server could not be understood. Are you using the right version?", MessageType.ERROR, false));
+			chat.log(new MessagePacket("The message recieved from the server could not be understood. Are you using the right version?", MessageType.ERROR));
 		} catch (IOException e) {
-			chat.log(new Message(e.toString(), MessageType.ERROR, false));
+			chat.log(new MessagePacket(e.toString(), MessageType.ERROR));
 		}
 	}
 	
 	public void getMessages() throws IOException, ClassNotFoundException {
 		while (!getMessages.isInterrupted()) {
 			Object fromServer = objIn.readObject();
-			if (fromServer instanceof Message) {
-				Message mess = ((Message) fromServer);
+			if (fromServer instanceof MessagePacket) {
+				MessagePacket mess = ((MessagePacket) fromServer);
 				chat.log(mess);
+			} else if (fromServer instanceof InfoPacket) {
+				InfoPacket info = (InfoPacket) fromServer;
 				
-				if (mess.usersOnline == null)
-					continue;
+				infoLabel.setText("<html>" + info.toString().replace("\n", "<br>"));
 				
 				model = new DefaultListModel<String>();
-				for (String user: mess.usersOnline)
+				for (String user: info.usersOnline)
 					model.addElement(user);
 				
 				userList.setModel(model);
-			} else if (fromServer instanceof String) {
-				chat.log(new Message((String) fromServer, MessageType.NORMAL, false));
+			}
+			else if (fromServer instanceof String) {
+				chat.log(new MessagePacket((String) fromServer, MessageType.NORMAL));
 			} else
 				throw new ClassNotFoundException();
 		}

src/main/java/client/Console.java

@@ -5,7 +5,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyledDocument;
 
-import common.Message;
+import common.MessagePacket;
 
 @SuppressWarnings("serial")
 public class Console extends JTextPane {
@@ -14,7 +14,7 @@ public class Console extends JTextPane {
 		setEditable(false);
 	}
 	
-	void log(Message mess) {
+	void log(MessagePacket mess) {
 		SwingUtilities.invokeLater(new AppendThread(mess.toString(), mess.style, this.getStyledDocument()));
 	}
 	

src/main/java/command/Ban.java

@@ -10,8 +10,8 @@ import util.Numbers;
 import util.StringArrays;
 
 import common.Command;
-import common.Message;
-import common.Message.MessageType;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 public class Ban extends Command {
 	
@@ -26,11 +26,11 @@ public class Ban extends Command {
 		if (maybeVictim.isPresent())
 			victim = maybeVictim.get();
 		else {
-			caller.send(new Message("No user called " + args[0] + ".", MessageType.ERROR, false));
+			caller.send(new MessagePacket("No user called " + args[0] + ".", MessageType.ERROR));
 			return;
 		}
 		
-		IP = victim.sock.getInetAddress().toString();
+		IP = victim.getIP();
 		
 		BanNote bn = new BanNote(IP);
 		

src/main/java/command/CreateChannel.java

@@ -4,7 +4,7 @@ import server.Client;
 import server.Server;
 
 import common.Command;
-import common.Message;
+import common.MessagePacket;
 
 public class CreateChannel extends Command {
 	
@@ -12,7 +12,7 @@ public class CreateChannel extends Command {
 	public void execute(String[] args, Client caller) throws Exception {
 		Server.channels.add(new server.Channel(args[0]));
 		
-		Server.wideBroadcast(new Message("Channel " + args[0] + " is now available. Use '/join " + args[0] + "' to join."));
+		Server.wideBroadcast(new MessagePacket("Channel " + args[0] + " is now available. Use '/join " + args[0] + "' to join."));
 	}
 	
 	@Override

src/main/java/command/Help.java

@@ -8,8 +8,8 @@ import server.Client;
 import server.Server;
 
 import common.Command;
-import common.Message;
-import common.Message.MessageType;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 public class Help extends Command {
 	
@@ -25,7 +25,7 @@ public class Help extends Command {
 			if (it.hasNext())
 				help += "\n";
 		}
-		caller.send(new Message(help, MessageType.COMMAND, false));
+		caller.send(new MessagePacket(help, MessageType.COMMAND));
 	}
 	
 	@Override

src/main/java/command/JoinChannel.java

@@ -7,8 +7,8 @@ import server.Client;
 import server.Server;
 
 import common.Command;
-import common.Message;
-import common.Message.MessageType;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 public class JoinChannel extends Command {
 	
@@ -25,9 +25,9 @@ public class JoinChannel extends Command {
 		try {
 			selectedChannel.add(caller);
 			caller.primaryChannel = selectedChannel;
-			caller.send(new Message("You are now speaking in channel " + args[0] + ".", MessageType.COMMAND, false));
+			caller.send(new MessagePacket("You are now speaking in channel " + args[0] + ".", MessageType.COMMAND));
 		} catch (NullPointerException ex) {
-			caller.send(new Message("No such channel!", MessageType.ERROR, false));
+			caller.send(new MessagePacket("No such channel!", MessageType.ERROR));
 		}
 	}
 	

src/main/java/command/Kick.java

@@ -6,8 +6,8 @@ import server.Client;
 import server.Server;
 
 import common.Command;
-import common.Message;
-import common.Message.MessageType;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 public class Kick extends Command {
 	
@@ -18,7 +18,7 @@ public class Kick extends Command {
 		try {
 			maybeVictim.orElseThrow(NullPointerException::new).disconnect(false);
 		} catch (NullPointerException ex) {
-			caller.send(new Message("No user called " + args[0] + "!", MessageType.ERROR, false));
+			caller.send(new MessagePacket("No user called " + args[0] + "!", MessageType.ERROR));
 		}
 	}
 	

src/main/java/command/LeaveChannel.java

@@ -7,8 +7,8 @@ import server.Client;
 import server.Server;
 
 import common.Command;
-import common.Message;
-import common.Message.MessageType;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 public class LeaveChannel extends Command {
 	
@@ -26,10 +26,10 @@ public class LeaveChannel extends Command {
 			selectedChannel.remove(caller);
 			if (caller.primaryChannel.equals(selectedChannel))
 				caller.primaryChannel = Server.channels.get(0);
-			caller.send(new Message("You left channel " + args[0] + ".", MessageType.COMMAND, false));
-			caller.send(new Message("You are now speaking in channel " + caller.primaryChannel.name + ".", MessageType.COMMAND, false));
+			caller.send(new MessagePacket("You left channel " + args[0] + ".", MessageType.COMMAND));
+			caller.send(new MessagePacket("You are now speaking in channel " + caller.primaryChannel.name + ".", MessageType.COMMAND));
 		} catch (NullPointerException ex) {
-			caller.send(new Message("No channel named " + args[0] + ".", MessageType.ERROR, false));
+			caller.send(new MessagePacket("No channel named " + args[0] + ".", MessageType.ERROR));
 			return;
 		}
 	}

src/main/java/command/List.java

@@ -7,8 +7,8 @@ import server.Client;
 import server.Server;
 
 import common.Command;
-import common.Message;
-import common.Message.MessageType;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 public class List extends Command {
 	
@@ -20,19 +20,19 @@ public class List extends Command {
 			Optional<Channel> maybeChannel = Server.getChannelByName(args[0]);
 			Channel selectedChannel = maybeChannel.isPresent() ? maybeChannel.get() : null;
 			try {
-				arr = selectedChannel.listClients();
+				arr = selectedChannel.listClients('\n');
 				channelName = selectedChannel.name;
 			} catch (NullPointerException ex) {
-				caller.send(new Message("No channel named " + channelName + ".", MessageType.ERROR, false));
+				caller.send(new MessagePacket("No channel named " + channelName + ".", MessageType.ERROR));
 				return;
 			}
 		} else
-			arr = Server.listClients();
+			arr = Server.listClients('\n');
 		
 		if (channelName == null)
-			caller.send(new Message("Users online are:" + "\n" + arr, MessageType.COMMAND, false));
+			caller.send(new MessagePacket("Users online are:" + "\n" + arr, MessageType.COMMAND));
 		else
-			caller.send(new Message("Users in channel " + channelName + " are:" + "\n" + arr, MessageType.COMMAND, false));
+			caller.send(new MessagePacket("Users in channel " + channelName + " are:" + "\n" + arr, MessageType.COMMAND));
 	}
 	
 	@Override

src/main/java/command/PrivateMessage.java

@@ -7,8 +7,8 @@ import server.Server;
 import util.StringArrays;
 
 import common.Command;
-import common.Message;
-import common.Message.MessageType;
+import common.MessagePacket;
+import common.MessagePacket.MessageType;
 
 public class PrivateMessage extends Command {
 	
@@ -20,7 +20,7 @@ public class PrivateMessage extends Command {
 		if (maybeVictim.isPresent())
 			reciever = maybeVictim.get();
 		else {
-			caller.send(new Message("No user called " + args[0] + ".", MessageType.ERROR, false));
+			caller.send(new MessagePacket("No user called " + args[0] + ".", MessageType.ERROR));
 			return;
 		}
 		if (caller.equals(reciever)) {
@@ -31,7 +31,7 @@ public class PrivateMessage extends Command {
 			return;
 		}
 		
-		Message mess = new Message("PM", caller.username, StringArrays.arrayToString(StringArrays.removeFirst(args)), Message.MessageType.PM);
+		MessagePacket mess = new MessagePacket("PM", caller.username, StringArrays.arrayToString(StringArrays.removeFirst(args)), MessagePacket.MessageType.PM);
 		
 		reciever.send(mess);
 		caller.send(mess);

src/main/java/common/InfoPacket.java

@@ -0,0 +1,34 @@
+package common;
+
+import server.Client;
+import server.Server;
+
+public class InfoPacket implements Packet {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	public String[] usersOnline, permissions;
+	public String username, channel;
+	
+	private InfoPacket() {
+		usersOnline = Server.getUsersOnline();
+	}
+	
+	public static InfoPacket of(Client c) {
+		InfoPacket info = new InfoPacket();
+		
+		info.channel = c.primaryChannel.name;
+		info.permissions = c.permissions;
+		info.username = c.username;
+		
+		return info;
+	}
+	
+	@Override
+	public String toString() {
+		return "Username: " + username + '\n'
+				+ "Channel: " + channel + '\n'
+				+ "Users online: " + usersOnline.length;
+	}
+}

src/main/java/common/Message.java → src/main/java/common/MessagePacket.java

@@ -8,11 +8,13 @@ import java.util.Date;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 
-import server.Server;
-
-@SuppressWarnings("serial")
-public class Message implements java.io.Serializable {
+public class MessagePacket implements Packet {
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	public enum MessageType {
 		PM, NORMAL, WARNING, ERROR, COMMAND, INFO
 	}
@@ -20,44 +22,35 @@ public class Message implements java.io.Serializable {
 	public MessageType messType = MessageType.NORMAL;
 	public String content = "", channel = "", sender = "";
 	public SimpleAttributeSet style = new SimpleAttributeSet();
-	public String[] usersOnline;
-	public boolean preInfo = true;
 	
-	public Message(String channel, String send, String con, MessageType messType) {
+	public MessagePacket(String channel, String send, String con, MessageType messType) {
 		this.sender = send;
 		this.channel = channel;
 		this.content = con;
 		this.messType = messType;
-		usersOnline = Server.getUsersOnline();
 	}
 	
-	public Message(String sender, String con) {
-		this("", sender, con, MessageType.NORMAL);
+	public MessagePacket(String con, MessageType messType) {
+		this.content = con;
+		this.messType = messType;
 	}
 	
-	public Message(String con) {
-		this("Info", "SERVER", con, MessageType.INFO);
+	public MessagePacket(String sender, String con) {
+		this("", sender, con, MessageType.NORMAL);
 	}
 	
-	public Message(String con, MessageType messType, boolean preInfo) { //TODO Needs to include Server.getUsersOnline() to prevent NullPointerException
-		this.content = con;
-		this.preInfo = preInfo;
-		this.messType = messType;
-		if (preInfo)
-			usersOnline = Server.getUsersOnline();
-		else
-			usersOnline = null;
+	public MessagePacket(String con) {
+		this("Info", "SERVER", con, MessageType.INFO);
 	}
 	
 	public boolean validate() {
-		if (content.equals("") || content == null) {
-			return false;
-		}
-		return true;
+		return (!content.equals("")) && content != null;
 	}
 	
 	@Override
 	public String toString() {
+		boolean preInfo = false;
+		
 		switch (messType) {
 		case COMMAND:
 			StyleConstants.setForeground(style, Color.GREEN);
@@ -67,11 +60,14 @@ public class Message implements java.io.Serializable {
 			break;
 		case INFO:
 			StyleConstants.setForeground(style, Color.BLUE);
+			preInfo = true;
 			break;
 		case NORMAL:
+			preInfo = true;
 			break;
 		case PM:
 			StyleConstants.setForeground(style, Color.GRAY);
+			preInfo = true;
 			break;
 		case WARNING:
 			StyleConstants.setForeground(style, Color.YELLOW);
@@ -80,15 +76,14 @@ public class Message implements java.io.Serializable {
 			break;
 		}
 		
-		DateFormat dateFormat = new SimpleDateFormat("[HH:mm:ss]");
-		Date time = new Date();
-		String timestamp = dateFormat.format(time);
-		
-		String preInfoStr = timestamp + "<" + channel + ">" + sender + ": ";
-		
-		if (preInfo)
+		if (preInfo) {
+			DateFormat dateFormat = new SimpleDateFormat("[HH:mm:ss]");
+			Date time = new Date();
+			String timestamp = dateFormat.format(time);
+			
+			String preInfoStr = timestamp + "<" + channel + ">" + sender + ": ";
 			return preInfoStr + content;
-		else
+		} else
 			return content;
 	}
 }

src/main/java/common/Packet.java

@@ -0,0 +1,5 @@
+package common;
+
+public interface Packet extends java.io.Serializable {
+	
+}

src/main/java/server/Channel.java

@@ -1,6 +1,6 @@
 package server;
 
-import common.Message;
+import common.MessagePacket;
 
 public class Channel extends ClientCollection {
 	/**
@@ -16,7 +16,7 @@ public class Channel extends ClientCollection {
 	}
 	
 	@Override
-	void broadcast(Message mess) {
+	void broadcast(MessagePacket mess) {
 		mess.channel = name;
 		super.broadcast(mess);
 	}

src/main/java/server/Client.java

@@ -11,7 +11,9 @@ import java.time.LocalDateTime;
 
 import javax.swing.Timer;
 
-import common.Message;
+import common.InfoPacket;
+import common.MessagePacket;
+import common.Packet;
 
 public class Client implements Runnable, ActionListener {
 	Thread readuser;
@@ -22,7 +24,7 @@ public class Client implements Runnable, ActionListener {
 	public String username;
 	public Socket sock;
 	
-	String[] permissions;
+	public String[] permissions;
 	
 	int messLastPeriod = 0;
 	Timer timer = new Timer(3000, this);
@@ -47,7 +49,7 @@ public class Client implements Runnable, ActionListener {
 		
 		permissions = new String[] {"noob.*"};
 		
-		send(new Message("Welcome to the server! Enjoy your stay!"));
+		send(new MessagePacket("Welcome to the server! Enjoy your stay!"));
 		
 		readuser = new Thread(this, username);
 		readuser.start();
@@ -106,7 +108,7 @@ public class Client implements Runnable, ActionListener {
 		Server.cleanUp();
 		
 		if (output)
-			Server.wideBroadcast(new Message(username + " has disconnected."));
+			Server.wideBroadcast(new MessagePacket(username + " has disconnected."));
 	}
 	
 	public void disconnect() {
@@ -142,7 +144,7 @@ public class Client implements Runnable, ActionListener {
 						send("No spamming!");
 						disconnect(false);
 					} else
-						primaryChannel.broadcast(new Message(this.username, lastMess));
+						primaryChannel.broadcast(new MessagePacket(this.username, lastMess));
 				}
 			}
 			disconnect();
@@ -150,10 +152,14 @@ public class Client implements Runnable, ActionListener {
 			disconnect();
 		}
 	}
-	
-	public void send(Object message) {
+	/**
+	 * Sends a packet to the user.
+	 * @param pack Packet to send to the user
+	 */
+	public void send(Packet pack) {
 		try {
-			objOut.writeObject(message);
+			objOut.writeObject(pack);
+			objOut.writeObject(InfoPacket.of(this));
 			objOut.flush();
 		} catch (IOException e) {
 			if (isConnected())
@@ -161,6 +167,14 @@ public class Client implements Runnable, ActionListener {
 		}
 	}
 	
+	public void send(String message) {
+		send(new MessagePacket(message));
+	}
+	
+	public String getIP() {
+		return sock.getInetAddress().toString();
+	}
+	
 	@Override
 	public String toString() {
 		return username;

src/main/java/server/ClientCollection.java

@@ -3,7 +3,7 @@ package server;
 import java.util.ArrayList;
 import java.util.Optional;
 
-import common.Message;
+import common.MessagePacket;
 
 public class ClientCollection extends ArrayList<Client> {
 	/**
@@ -22,13 +22,24 @@ public class ClientCollection extends ArrayList<Client> {
 		maxClients = maxUsers;
 	}
 	
+	/**
+	 * Gets the user with specified username.
+	 * 
+	 * @param name The username of wanted user.
+	 * @return Optional containing found user.
+	 */
 	public Optional<Client> getClientByName(String name) {
 		return stream()
 				.filter(c -> c.username.equals(name))
 				.findFirst();
 	}
 	
-	void broadcast(Message mess) { //Broadcast to all
+	/**
+	 * Sends a message to all users in the collection.
+	 * 
+	 * @param mess The message object to send.
+	 */
+	void broadcast(MessagePacket mess) {
 		if (mess.validate()) {
 			for (Client c: this)
 				c.send(mess);
@@ -36,8 +47,14 @@ public class ClientCollection extends ArrayList<Client> {
 		}
 	}
 	
+	/**
+	 * Adds a user to the collection, checking that the user has not already
+	 * been added and that the the collection isn't "full".
+	 * 
+	 * @param user User to be added to collection.
+	 */
 	@Override
-	public boolean add(Client user) throws ArrayIndexOutOfBoundsException { //Add user
+	public boolean add(Client user) throws ArrayIndexOutOfBoundsException {
 		if (contains(user))
 			return true;
 		
@@ -48,26 +65,64 @@ public class ClientCollection extends ArrayList<Client> {
 		return true;
 	}
 	
-	public void remove(Client user) { //Remove without DC
+	/**
+	 * Remove the user without disconnecting them.
+	 * 
+	 * @param user User to remove.
+	 */
+	public void remove(Client user) {
 		remove(user, false);
 	}
 	
-	public void remove(Client user, boolean disconnect) { //Remove and disconnect if needed
+	/**
+	 * Removes a user from the collection.
+	 * 
+	 * @param user User to remove.
+	 * @param disconnect Should the user also be disconnected?
+	 */
+	public void remove(Client user, boolean disconnect) {
 		if (disconnect)
 			user.disconnect();
 		super.remove(user);
 	}
 	
-	public String listClients() { //String from array
-		return toString().replace(", ", "\n").replace("[", "").replace("]", "");
+	/**
+	 * Create a string containing usernames of current connected users,
+	 * separated by specified separator.
+	 * 
+	 * @param sep The char to put between the names.
+	 * @return String containing all usernames separated by separator.
+	 */
+	public String listClients(char sep) {
+		String[] names = getUsernameArray();
+		String namesString = "";
+		for (String name: names)
+			namesString += name + sep;
+		//Remove last separator
+		namesString = namesString.substring(0, namesString.length() - sep);
+		return namesString;
 	}
 	
-	public String[] listClientsArray() { //Array instead of string
-		return listClients().split("\n");
+	/**
+	 * String array representation of current users by name.
+	 * 
+	 * @return A String array containing the names of the users in the
+	 *         collection.
+	 * @see String
+	 */
+	public String[] getUsernameArray() {
+		String[] names = new String[size()];
+		for (int i = 0; i < size(); i++)
+			names[i] = this.get(i).username;
+		return names;
 	}
 	
-	public void cleanUp() { //Remove unused clients, has to be done with number iteration, otherwise unsafe
+	/**
+	 * Removes disconnected clients from the collection.
+	 */
+	public void cleanUp() {
 		for (int i = 0; i < size(); i++)
+			//Has to be done with number iteration, otherwise unsafe
 			if (!get(i).isConnected())
 				remove(i);
 	}

src/main/java/server/LocalClient.java

@@ -21,8 +21,8 @@ public class LocalClient extends Client {
 	}
 	
 	@Override
-	public void send(Object message) {
-		System.out.println(message);
+	public void send(String message) {
+		System.out.println(message.toString());
 		Server.log.log(message.toString());
 	}
 }

src/main/java/server/Server.java

@@ -8,7 +8,7 @@ import java.util.Optional;
 import util.Logger;
 import util.ServerProperties;
 
-import common.Message;
+import common.MessagePacket;
 
 public class Server {
 	static ServerProperties prop = new ServerProperties();
@@ -80,11 +80,11 @@ public class Server {
 				newClient = new Client(Server.so.accept());
 				clients.add(newClient);
 				channels.get(0).add(newClient);
-				wideBroadcast(new Message(newClient.username + " has connected."));
+				wideBroadcast(new MessagePacket(newClient.username + " has connected."));
 			} catch (IllegalArgumentException ex) {
 				
 			} catch (ArrayIndexOutOfBoundsException ex) {
-				newClient.send(new Message("Server full!"));
+				newClient.send(new MessagePacket("Server full!"));
 				newClient.disconnect(false);
 			} catch (IOException ex) {
 				if (so.isClosed())
@@ -100,29 +100,35 @@ public class Server {
 		return channels.stream().filter(c -> c.name.equals(name)).findFirst();
 	}
 	
-	public static void wideBroadcast(Message mess) {
+	public static void wideBroadcast(MessagePacket mess) {
 		clients.broadcast(mess);
 	}
 	
 	public static String[] getUsersOnline() {
-		return clients.listClientsArray();
+		return clients.getUsernameArray();
 	}
 	
-	public static String listClients() {
-		return clients.listClients();
+	public static String listClients(char c) {
+		return clients.listClients(c);
 	}
 	
 	public static Optional<Client> getUserByName(String username) {
 		return clients.getClientByName(username);
 	}
 	
-	public static void cleanUp() { //Makes sure the client gets removed from all arrays
+	/**
+	 * Removes disconnected clients from all collections on the server.
+	 */
+	public static void cleanUp() {
 		clients.cleanUp();
 		channels.forEach(c -> c.cleanUp());
 	}
 	
+	/**
+	 * Disconnects all users and closes log and socket.
+	 */
 	public static void exit() {
-		wideBroadcast(new Message("Shutting down server!"));
+		wideBroadcast(new MessagePacket("Shutting down server!"));
 		
 		for (int i = 0; i < clients.size(); i++)
 			//Has to be done with number iteration, otherwise unsafe