fixed Issue #28 by checking if username contains space before starting connection

fixed Problem "private Messages are visible for sender"

client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java

@@ -106,18 +106,22 @@ public class ChatWindowController {
 
     private void startConnectionHandler() throws IOException {
         String userName = userNameField.getText();
-        String serverAddress = serverAddressField.getText();
-        int serverPort = Integer.parseInt(serverPortField.getText());
-        connectionHandler = new ClientConnectionHandler(
-            NetworkHandler.openConnection(serverAddress, serverPort), userName,
-            messages);
-        new Thread(connectionHandler).start();
+        if(!userName.contains(" ")) {
+            String serverAddress = serverAddressField.getText();
+            int serverPort = Integer.parseInt(serverPortField.getText());
+            connectionHandler = new ClientConnectionHandler(
+                    NetworkHandler.openConnection(serverAddress, serverPort), userName,
+                    messages);
+            new Thread(connectionHandler).start();
 
-        //register Listener
-        startListener();
+            //register Listener
+            startListener();
 
-        // register window close handler
-        rootPane.getScene().getWindow().addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
+            // register window close handler
+            rootPane.getScene().getWindow().addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
+        } else {
+            addError("It is not allowed to have spaces in username!");
+        }
     }
 
     private void terminateConnectionHandler() {

client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java

@@ -28,7 +28,7 @@ public class ClientConnectionHandler implements Runnable {
     public static final String USER_NONE = "";
     public static final String USER_ALL = "*";
 
-    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\w*))?\\s*(.*)$" );
+    private final Pattern messagePattern = Pattern.compile( "^(?:@(\\S*))?\\s*(.*)$" );
 
     private SimpleStringProperty userName;
     private SimpleObjectProperty<State> state;
@@ -63,7 +63,6 @@ public class ClientConnectionHandler implements Runnable {
 
     public void setState (State newState) {
         state.set(newState);
-
     }
 
     public void run () {

server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java

@@ -149,6 +149,9 @@ public class ServerConnectionHandler implements Runnable{
                     ServerConnectionHandler handler = connectionRegistry.get(reciever);
                     if (handler != null) {
                         handler.sendData(sender, reciever, type, payload);
+                        if(!reciever.equals(sender)){
+                            sendData(sender, reciever, type, payload); //send message to sender if it's a direct message and sender is not receiver.
+                        }
                     } else {
                         this.sendData(USER_NONE, userName, DATA_TYPE_ERROR, "Unknown User: " + reciever);
                     }