removed Enum State from ServerConnectionHandler.java because it's in ConnectionHandler.java now.

# Conflicts:
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java

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

@@ -1,7 +1,8 @@
 package ch.zhaw.pm2.multichat.client;
 
-import ch.zhaw.pm2.multichat.client.ClientConnectionHandler.State;
+import ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State;
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
+import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -15,10 +16,8 @@ import javafx.scene.layout.Pane;
 import javafx.stage.WindowEvent;
 
 import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import static ch.zhaw.pm2.multichat.client.ClientConnectionHandler.State.*;
+import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*;
 
 public class ChatWindowController {
     private ClientConnectionHandler connectionHandler;
@@ -48,8 +47,12 @@ public class ChatWindowController {
         messageListener();
     }
 
+    public void setConnectionHandler(ClientConnectionHandler connectionHandler){
+        this.connectionHandler = connectionHandler;
+    }
+
     private void applicationClose() {
-        connectionHandler.setState(DISCONNECTED);
+        disconnect();
     }
 
     @FXML
@@ -109,9 +112,7 @@ public class ChatWindowController {
         if(!userName.contains(" ")) {
             String serverAddress = serverAddressField.getText();
             int serverPort = Integer.parseInt(serverPortField.getText());
-            connectionHandler = new ClientConnectionHandler(
+            connectionHandler.initialize(serverAddress, serverPort, userName);
-                    NetworkHandler.openConnection(serverAddress, serverPort), userName,
-                    messages);
             new Thread(connectionHandler).start();
 
             //register Listener
@@ -124,15 +125,6 @@ public class ChatWindowController {
         }
     }
 
-    private void terminateConnectionHandler() {
-        // unregister window close handler
-        rootPane.getScene().getWindow().removeEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
-        if (connectionHandler != null) {
-            connectionHandler.stopReceiving();
-            connectionHandler = null;
-        }
-    }
-
     public void stateChanged(State newState) {
         // update UI (need to be run in UI thread: see Platform.runLater())
         Platform.runLater(new Runnable() {
@@ -141,8 +133,8 @@ public class ChatWindowController {
                 connectButton.setText((newState == CONNECTED || newState == CONFIRM_DISCONNECT) ? "Disconnect" : "Connect");
             }
         });
-        if (newState == DISCONNECTED) {
+        if(newState == DISCONNECTED){
-            terminateConnectionHandler();
+            connectionHandler.stopReceiving();
         }
     }
 

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

@@ -1,6 +1,7 @@
 package ch.zhaw.pm2.multichat.client;
 
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
+import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -12,21 +13,9 @@ import java.net.SocketException;
 import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*;
 
-import static ch.zhaw.pm2.multichat.client.ClientConnectionHandler.State.*;
+public class ClientConnectionHandler extends ConnectionHandler implements Runnable {
-
-public class ClientConnectionHandler implements Runnable {
-    private final NetworkHandler.NetworkConnection<String> connection;
-
-    // Data types used for the Chat Protocol
-    private static final String DATA_TYPE_CONNECT = "CONNECT";
-    private static final String DATA_TYPE_CONFIRM = "CONFIRM";
-    private static final String DATA_TYPE_DISCONNECT = "DISCONNECT";
-    private static final String DATA_TYPE_MESSAGE = "MESSAGE";
-    private static final String DATA_TYPE_ERROR = "ERROR";
-
-    public static final String USER_NONE = "";
-    public static final String USER_ALL = "*";
 
     private final Pattern messagePattern = Pattern.compile( "^(?:@(\\S*))?\\s*(.*)$" );
 
@@ -36,21 +25,20 @@ public class ClientConnectionHandler implements Runnable {
     private SimpleStringProperty serverAddress;
     private SimpleIntegerProperty serverPort;
 
-    enum State {
+    public ClientConnectionHandler(ClientMessageList messages)  {
-        NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED;
+        super();
-    }
-
-    public ClientConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
-                                   String userName,
-                                   ClientMessageList messages)  {
-        this.connection = connection;
-        this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName);
         this.messages = messages;
-        state = new SimpleObjectProperty<>(NEW);
+        state = new SimpleObjectProperty<>(State.NEW);
         serverAddress = new SimpleStringProperty();
         serverPort = new SimpleIntegerProperty();
     }
 
+    public void initialize(String serverAddress, int serverPort, String userName) throws IOException {
+        state = new SimpleObjectProperty<>(NEW);
+        setConnection(NetworkHandler.openConnection(serverAddress, serverPort));
+        this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName);
+    }
+
     public SimpleStringProperty getServerAddressProperty() { return serverAddress; }
 
     public SimpleIntegerProperty getServerPortProperty() { return serverPort; }
@@ -69,12 +57,12 @@ public class ClientConnectionHandler implements Runnable {
         startReceiving();
     }
 
-    public void startReceiving() {
+    private void startReceiving() {
         System.out.println("Starting Connection Handler");
         try {
             System.out.println("Start receiving data...");
-            while (connection.isAvailable()) {
+            while (getConnection().isAvailable()) {
-                String data = connection.receive();
+                String data = getConnection().receive();
                 processData(data);
             }
             System.out.println("Stopped recieving data");
@@ -98,7 +86,7 @@ public class ClientConnectionHandler implements Runnable {
         System.out.println("Closing Connection Handler to Server");
         try {
             System.out.println("Stop receiving data...");
-            connection.close();
+            getConnection().close();
             System.out.println("Stopped receiving data.");
         } catch (IOException e) {
             System.err.println("Failed to close connection." + e.getMessage());
@@ -133,13 +121,13 @@ public class ClientConnectionHandler implements Runnable {
                 payload = scanner.nextLine();
             }
             // dispatch operation based on type parameter
-            if (type.equals(DATA_TYPE_CONNECT)) {
+            if (type.equals(getDataTypeConnect())) {
                 System.err.println("Illegal connect request from server");
-            } else if (type.equals(DATA_TYPE_CONFIRM)) {
+            } else if (type.equals(getDataTypeConfirm())) {
                 if (state.get() == CONFIRM_CONNECT) {
                     this.userName.set(reciever);
-                    this.serverPort.set(connection.getRemotePort());
+                    this.serverPort.set(getConnection().getRemotePort());
-                    this.serverAddress.set(connection.getRemoteHost());
+                    this.serverAddress.set(getConnection().getRemoteHost());
                     messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
                     System.out.println("CONFIRM: " + payload);
                     this.setState(CONNECTED);
@@ -150,7 +138,7 @@ public class ClientConnectionHandler implements Runnable {
                 } else {
                     System.err.println("Got unexpected confirm message: " + payload);
                 }
-            } else if (type.equals(DATA_TYPE_DISCONNECT)) {
+            } else if (type.equals(getDataTypeDisconnect())) {
                 if (state.get() == DISCONNECTED) {
                     System.out.println("DISCONNECT: Already in disconnected: " + payload);
                     return;
@@ -158,14 +146,14 @@ public class ClientConnectionHandler implements Runnable {
                 messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
                 System.out.println("DISCONNECT: " + payload);
                 this.setState(DISCONNECTED);
-            } else if (type.equals(DATA_TYPE_MESSAGE)) {
+            } else if (type.equals(getDataTypeMessage())) {
                 if (state.get() != CONNECTED) {
                     System.out.println("MESSAGE: Illegal state " + state + " for message: " + payload);
                     return;
                 }
                 messages.addMessage(new Message(Message.MessageType.MESSAGE,sender,reciever,payload));
                 System.out.println("MESSAGE: From " + sender + " to " + reciever + ": "+  payload);
-            } else if (type.equals(DATA_TYPE_ERROR)) {
+            } else if (type.equals(getDataTypeError())) {
                 messages.addMessage(new Message(Message.MessageType.ERROR,sender,reciever,payload));
                 System.out.println("ERROR: " + payload);
             } else {
@@ -173,12 +161,12 @@ public class ClientConnectionHandler implements Runnable {
             }
         } catch (ChatProtocolException e) {
             System.err.println("Error while processing data: " + e.getMessage());
-            sendData(USER_NONE, userName.get(), DATA_TYPE_ERROR, e.getMessage());
+            sendData(USER_NONE, userName.get(), getDataTypeError(), e.getMessage());
         }
     }
 
-    public void sendData(String sender, String receiver, String type, String payload) {
+    private void sendData(String sender, String receiver, String type, String payload) {
-        if (connection.isAvailable()) {
+        if (getConnection().isAvailable()) {
             new StringBuilder();
             String data = new StringBuilder()
                 .append(sender+"\n")
@@ -187,7 +175,7 @@ public class ClientConnectionHandler implements Runnable {
                 .append(payload+"\n")
                 .toString();
             try {
-                connection.send(data);
+                getConnection().send(data);
             } catch (SocketException e) {
                 System.err.println("Connection closed: " + e.getMessage());
             } catch (EOFException e) {
@@ -200,13 +188,13 @@ public class ClientConnectionHandler implements Runnable {
 
     public void connect() throws ChatProtocolException {
         if (state.get() != NEW) throw new ChatProtocolException("Illegal state for connect: " + state);
-        this.sendData(userName.get(), USER_NONE, DATA_TYPE_CONNECT,null);
+        this.sendData(userName.get(), USER_NONE, getDataTypeConnect(),null);
         this.setState(CONFIRM_CONNECT);
     }
 
     public void disconnect() throws ChatProtocolException {
         if (state.get() != NEW && state.get() != CONNECTED) throw new ChatProtocolException("Illegal state for disconnect: " + state);
-        this.sendData(userName.get(), USER_NONE, DATA_TYPE_DISCONNECT,null);
+        this.sendData(userName.get(), USER_NONE, getDataTypeDisconnect(),null);
         this.setState(CONFIRM_DISCONNECT);
     }
 
@@ -221,7 +209,7 @@ public class ClientConnectionHandler implements Runnable {
                 return false;
             }
             if (receiver == null || receiver.isBlank()) receiver = ClientConnectionHandler.USER_ALL;
-            this.sendData(userName.get(), receiver, DATA_TYPE_MESSAGE,message);
+            this.sendData(userName.get(), receiver, getDataTypeMessage(),message);
             return true;
         } else {
             return false;

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

@@ -8,6 +8,7 @@ import javafx.stage.Stage;
 
 public class ClientUI extends Application {
     private ClientMessageList clientMessageList = new ClientMessageList();
+    private ClientConnectionHandler connectionHandler = new ClientConnectionHandler(clientMessageList);
 
     @Override
     public void start(Stage primaryStage) {
@@ -21,6 +22,7 @@ public class ClientUI extends Application {
 
             ChatWindowController chatWindowController = loader.getController();
             chatWindowController.setMessages(clientMessageList);
+            chatWindowController.setConnectionHandler(connectionHandler);
 
             // fill in scene and stage setup
             Scene scene = new Scene(rootPane);

protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java

@@ -0,0 +1,47 @@
+package ch.zhaw.pm2.multichat.protocol;
+
+public abstract class ConnectionHandler {
+    private NetworkHandler.NetworkConnection<String> connection;
+
+    // Data types used for the Chat Protocol
+    private static final String DATA_TYPE_CONNECT = "CONNECT";
+    private static final String DATA_TYPE_CONFIRM = "CONFIRM";
+    private static final String DATA_TYPE_DISCONNECT = "DISCONNECT";
+    private static final String DATA_TYPE_MESSAGE = "MESSAGE";
+    private static final String DATA_TYPE_ERROR = "ERROR";
+
+    public static final String USER_NONE = "";
+    public static final String USER_ALL = "*";
+
+    public enum State {
+        NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED;
+    }
+
+    public static String getDataTypeConnect() {
+        return DATA_TYPE_CONNECT;
+    }
+
+    public static String getDataTypeConfirm() {
+        return DATA_TYPE_CONFIRM;
+    }
+
+    public static String getDataTypeDisconnect() {
+        return DATA_TYPE_DISCONNECT;
+    }
+
+    public static String getDataTypeMessage() {
+        return DATA_TYPE_MESSAGE;
+    }
+
+    public static String getDataTypeError() {
+        return DATA_TYPE_ERROR;
+    }
+
+    public NetworkHandler.NetworkConnection<String> getConnection() {
+        return connection;
+    }
+
+    protected void setConnection(NetworkHandler.NetworkConnection<String> connection) {
+        this.connection = connection;
+    }
+}

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

@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
 
 
 public class Server {
@@ -62,23 +64,34 @@ public class Server {
     }
 
     private void start() {
+        ReentrantLock mutex = new ReentrantLock();
+        Condition nameComplete = mutex.newCondition();
         System.out.println("Server started.");
         try {
             while (true) {
                  NetworkHandler.NetworkConnection<String> connection = networkServer.waitForConnection();
-                 ServerConnectionHandler connectionHandler = new ServerConnectionHandler(connection, connections);
+                 ServerConnectionHandler connectionHandler = new ServerConnectionHandler(connection, connections, mutex, nameComplete);
                  new Thread(connectionHandler).start();
+                 mutex.lock();
+                 try {
+                     nameComplete.await();
                      System.out.println(String.format("Connected new Client %s with IP:Port <%s:%d>",
                              connectionHandler.getUserName(),
                              connection.getRemoteHost(),
                              connection.getRemotePort()
                      ));
                  }
+                finally {
+                     mutex.unlock();
+                 }
+            }
         } catch(SocketException e) {
             System.out.println("Server connection terminated");
         }
         catch (IOException e) {
             System.err.println("Communication error " + e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         }
         // close server
         System.out.println("Server Stopped.");

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

@@ -1,6 +1,8 @@
 package ch.zhaw.pm2.multichat.server;
 
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
+import ch.zhaw.pm2.multichat.protocol.ConnectionHandler;
+import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 
 import java.io.EOFException;
@@ -11,24 +13,19 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Scanner;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
 
-import static ch.zhaw.pm2.multichat.server.ServerConnectionHandler.State.*;
 
-public class ServerConnectionHandler implements Runnable{
+
+public class ServerConnectionHandler extends ConnectionHandler implements Runnable{
     private static final AtomicInteger connectionCounter = new AtomicInteger(0);
     private final int connectionId = connectionCounter.incrementAndGet();
-    private final NetworkHandler.NetworkConnection<String> connection;
     private final Map<String,ServerConnectionHandler> connectionRegistry;
 
-    // Data types used for the Chat Protocol
+    private ReentrantLock mutex;
-    private static final String DATA_TYPE_CONNECT = "CONNECT";
-    private static final String DATA_TYPE_CONFIRM = "CONFIRM";
-    private static final String DATA_TYPE_DISCONNECT = "DISCONNECT";
-    private static final String DATA_TYPE_MESSAGE = "MESSAGE";
-    private static final String DATA_TYPE_ERROR = "ERROR";
 
-    private static final String USER_NONE = "";
+    private Condition nameComplete;
-    private static final String USER_ALL = "*";
 
     private String userName = "Anonymous-"+connectionId;
     private State state = NEW;
@@ -38,28 +35,27 @@ public class ServerConnectionHandler implements Runnable{
         startReceiving();
     }
 
-    enum State {
-        NEW, CONNECTED, DISCONNECTED;
-    }
-
     public ServerConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
-                                   Map<String,ServerConnectionHandler> registry) {
+                                   Map<String,ServerConnectionHandler> registry, ReentrantLock mutex, Condition nameComplete) {
+        super();
+        setConnection(connection);
         Objects.requireNonNull(connection, "Connection must not be null");
         Objects.requireNonNull(registry, "Registry must not be null");
-        this.connection = connection;
         this.connectionRegistry = registry;
+        this.mutex = mutex;
+        this.nameComplete = nameComplete;
     }
 
     public String getUserName() {
         return this.userName;
     }
 
-    public void startReceiving() {
+    private void startReceiving() {
             System.out.println("Starting Connection Handler for new User");
             try {
                 System.out.println("Start receiving data...");
-            while (connection.isAvailable()) {
+                while (getConnection().isAvailable()) {
-                String data = connection.receive();
+                    String data = getConnection().receive();
                     processData(data);
                 }
                 System.out.println("Stopped recieving data");
@@ -71,19 +67,20 @@ public class ServerConnectionHandler implements Runnable{
                 System.out.println("Connection terminated by remote");
                 connectionRegistry.remove(userName);
                 System.out.println("Unregistered because client connection terminated: " + userName + " " + e.getMessage());
-        } catch(IOException e) {
+            } catch (IOException e) {
                 System.err.println("Communication error: " + e);
-        } catch(ClassNotFoundException e) {
+            } catch (ClassNotFoundException e) {
                 System.err.println("Received object of unknown type: " + e.getMessage());
             }
             System.out.println("Stopping Connection Handler for " + userName);
+
     }
 
-    public void stopReceiving() {
+    private void stopReceiving() {
         System.out.println("Closing Connection Handler for " + userName);
         try {
             System.out.println("Stop receiving data...");
-            connection.close();
+            getConnection().close();
             System.out.println("Stopped receiving data.");
         } catch (IOException e) {
             System.err.println("Failed to close connection." + e);
@@ -119,27 +116,34 @@ public class ServerConnectionHandler implements Runnable{
             }
 
             // dispatch operation based on type parameter
-            if (type.equals(DATA_TYPE_CONNECT)) {
+            if (type.equals(getDataTypeConnect())) {
                 if (this.state != NEW) throw new ChatProtocolException("Illegal state for connect request: " + state);
                 if (sender == null || sender.isBlank()) sender = this.userName;
                 if (connectionRegistry.containsKey(sender))
                     throw new ChatProtocolException("User name already taken: " + sender);
+                mutex.lock();
+                try {
                     this.userName = sender;
+                    nameComplete.signal();
+                }
+                finally {
+                    mutex.unlock();
+                }
                 connectionRegistry.put(userName, this);
-                sendData(USER_NONE, userName, DATA_TYPE_CONFIRM, "Registration successfull for " + userName);
+                sendData(USER_NONE, userName, getDataTypeConfirm(), "Registration successfull for " + userName);
                 this.state = CONNECTED;
-            } else if (type.equals(DATA_TYPE_CONFIRM)) {
+            } else if (type.equals(getDataTypeConfirm())) {
                 System.out.println("Not expecting to receive a CONFIRM request from client");
-            } else if (type.equals(DATA_TYPE_DISCONNECT)) {
+            } else if (type.equals(getDataTypeDisconnect())) {
                 if (state == DISCONNECTED)
                     throw new ChatProtocolException("Illegal state for disconnect request: " + state);
                 if (state == CONNECTED) {
                     connectionRegistry.remove(this.userName);
                 }
-                sendData(USER_NONE, userName, DATA_TYPE_CONFIRM, "Confirm disconnect of " + userName);
+                sendData(USER_NONE, userName, getDataTypeConfirm(), "Confirm disconnect of " + userName);
                 this.state = DISCONNECTED;
                 this.stopReceiving();
-            } else if (type.equals(DATA_TYPE_MESSAGE)) {
+            } else if (type.equals(getDataTypeMessage())) {
                 if (state != CONNECTED) throw new ChatProtocolException("Illegal state for message request: " + state);
                 if (USER_ALL.equals(reciever)) {
                     for (ServerConnectionHandler handler : connectionRegistry.values()) {
@@ -153,10 +157,10 @@ public class ServerConnectionHandler implements Runnable{
                             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);
+                        this.sendData(USER_NONE, userName, getDataTypeError(), "Unknown User: " + reciever);
                     }
                 }
-            } else if (type.equals(DATA_TYPE_ERROR)) {
+            } else if (type.equals(getDataTypeError())) {
                 System.err.println("Received error from client (" + sender + "): " + payload);
             } else {
                 System.err.println("Unknown data type received: " + type);
@@ -164,12 +168,12 @@ public class ServerConnectionHandler implements Runnable{
             }
         } catch(ChatProtocolException e) {
             System.out.println("Error while processing data" + e.getMessage());
-            sendData(USER_NONE, userName, DATA_TYPE_ERROR, e.getMessage());
+            sendData(USER_NONE, userName, getDataTypeError(), e.getMessage());
         }
     }
 
-    public void sendData(String sender, String receiver, String type, String payload) {
+    private void sendData(String sender, String receiver, String type, String payload) {
-        if (connection.isAvailable()) {
+        if (getConnection().isAvailable()) {
             new StringBuilder();
             String data = new StringBuilder()
                 .append(sender+"\n")
@@ -178,7 +182,7 @@ public class ServerConnectionHandler implements Runnable{
                 .append(payload+"\n")
                 .toString();
             try {
-                connection.send(data);
+                getConnection().send(data);
             } catch (SocketException e) {
                 System.out.println("Connection closed: " + e.getMessage());
             } catch (EOFException e) {