fixed Disconnecting when window is closed

#6

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

@@ -4,6 +4,8 @@ import ch.zhaw.pm2.multichat.client.ClientConnectionHandler.State;
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
 import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -39,20 +41,20 @@ public class ChatWindowController {
     public void initialize() {
         serverAddressField.setText(NetworkHandler.DEFAULT_ADDRESS.getCanonicalHostName());
         serverPortField.setText(String.valueOf(NetworkHandler.DEFAULT_PORT));
-        stateChanged(NEW);
     }
 
     public void setMessages(ClientMessageList messages) {
         this.messages = messages;
+        messageListener();
     }
 
     private void applicationClose() {
-        connectionHandler.setState(DISCONNECTED);
+        disconnect();
     }
 
     @FXML
     private void toggleConnection () {
-        if (connectionHandler == null || connectionHandler.getState() != CONNECTED) {
+        if (connectionHandler == null || connectionHandler.getStateProperty().get() != CONNECTED) {
             connect();
         } else {
             disconnect();
@@ -62,7 +64,6 @@ public class ChatWindowController {
     private void connect() {
         try {
             messages.clear(); // clear message list
-            redrawMessageList();
             startConnectionHandler();
             connectionHandler.connect();
         } catch(ChatProtocolException | IOException e) {
@@ -109,9 +110,12 @@ public class ChatWindowController {
         int serverPort = Integer.parseInt(serverPortField.getText());
         connectionHandler = new ClientConnectionHandler(
             NetworkHandler.openConnection(serverAddress, serverPort), userName,
-            this);
+            messages);
         new Thread(connectionHandler).start();
 
+        //register Listener
+        startListener();
+
         // register window close handler
         rootPane.getScene().getWindow().addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
     }
@@ -165,19 +169,8 @@ public class ChatWindowController {
         });
     }
 
-    public void addMessage(String sender, String receiver, String message) {
-        messages.addMessage(new Message(Message.MessageType.MESSAGE, sender, receiver, message));
-        this.redrawMessageList();
-    }
-
-    public void addInfo(String message) {
-        messages.addMessage(new Message(Message.MessageType.INFO, null, null, message));
-        this.redrawMessageList();
-    }
-
     public void addError(String message) {
         messages.addMessage(new Message(Message.MessageType.ERROR, null, null, message));
-        this.redrawMessageList();
     }
 
     private void redrawMessageList() {
@@ -192,4 +185,43 @@ public class ChatWindowController {
 
     }
 
+    public void startListener() {
+        connectionHandler.getStateProperty().addListener(new ChangeListener<State>() {
+            @Override
+            public void changed(ObservableValue<? extends State> observable, State oldValue, State newValue) {
+                stateChanged(newValue);
+            }
+        });
+
+        connectionHandler.getUserNameProperty().addListener(new ChangeListener<String>() {
+            @Override
+            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                setUserName(newValue);
+            }
+        });
+
+        connectionHandler.getServerAddressProperty().addListener(new ChangeListener<String>() {
+            @Override
+            public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                setServerAddress(newValue);
+            }
+        });
+
+        connectionHandler.getServerPortProperty().addListener(new ChangeListener<Number>() {
+            @Override
+            public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
+                setServerPort(newValue.intValue());
+            }
+        });
+    }
+
+    private void messageListener() {
+        messages.getChangedProperty().addListener(new ChangeListener<Boolean>() {
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                redrawMessageList();
+            }
+        });
+    }
+
 }

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

@@ -2,6 +2,9 @@ package ch.zhaw.pm2.multichat.client;
 
 import ch.zhaw.pm2.multichat.protocol.ChatProtocolException;
 import ch.zhaw.pm2.multichat.protocol.NetworkHandler;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -14,7 +17,6 @@ import static ch.zhaw.pm2.multichat.client.ClientConnectionHandler.State.*;
 
 public class ClientConnectionHandler implements Runnable {
     private final NetworkHandler.NetworkConnection<String> connection;
-    private final ChatWindowController controller;
 
     // Data types used for the Chat Protocol
     private static final String DATA_TYPE_CONNECT = "CONNECT";
@@ -28,8 +30,11 @@ public class ClientConnectionHandler implements Runnable {
 
     private final Pattern messagePattern = Pattern.compile( "^(?:@(\\w*))?\\s*(.*)$" );
 
-    private String userName = USER_NONE;
-    private State state = NEW;
+    private SimpleStringProperty userName;
+    private SimpleObjectProperty<State> state;
+    private ClientMessageList messages;
+    private SimpleStringProperty serverAddress;
+    private SimpleIntegerProperty serverPort;
 
     enum State {
         NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED;
@@ -37,19 +42,28 @@ public class ClientConnectionHandler implements Runnable {
 
     public ClientConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
                                    String userName,
-                                   ChatWindowController controller)  {
+                                   ClientMessageList messages)  {
         this.connection = connection;
-        this.userName = (userName == null || userName.isBlank())? USER_NONE : userName;
-        this.controller = controller;
+        this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName);
+        this.messages = messages;
+        state = new SimpleObjectProperty<>(NEW);
+        serverAddress = new SimpleStringProperty();
+        serverPort = new SimpleIntegerProperty();
     }
 
-    public State getState() {
+    public SimpleStringProperty getServerAddressProperty() { return serverAddress; }
+
+    public SimpleIntegerProperty getServerPortProperty() { return serverPort; }
+
+    public SimpleObjectProperty<State> getStateProperty() {
         return this.state;
     }
 
+    public SimpleStringProperty getUserNameProperty() { return userName; }
+
     public void setState (State newState) {
-        this.state = newState;
-        controller.stateChanged(newState);
+        state.set(newState);
+
     }
 
     public void run () {
@@ -123,45 +137,44 @@ public class ClientConnectionHandler implements Runnable {
             if (type.equals(DATA_TYPE_CONNECT)) {
                 System.err.println("Illegal connect request from server");
             } else if (type.equals(DATA_TYPE_CONFIRM)) {
-                if (state == CONFIRM_CONNECT) {
-                    this.userName = reciever;
-                    controller.setUserName(userName);
-                    controller.setServerPort(connection.getRemotePort());
-                    controller.setServerAddress(connection.getRemoteHost());
-                    controller.addInfo(payload);
+                if (state.get() == CONFIRM_CONNECT) {
+                    this.userName.set(reciever);
+                    this.serverPort.set(connection.getRemotePort());
+                    this.serverAddress.set(connection.getRemoteHost());
+                    messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
                     System.out.println("CONFIRM: " + payload);
                     this.setState(CONNECTED);
-                } else if (state == CONFIRM_DISCONNECT) {
-                    controller.addInfo(payload);
+                } else if (state.get() == CONFIRM_DISCONNECT) {
+                    messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
                     System.out.println("CONFIRM: " + payload);
                     this.setState(DISCONNECTED);
                 } else {
                     System.err.println("Got unexpected confirm message: " + payload);
                 }
             } else if (type.equals(DATA_TYPE_DISCONNECT)) {
-                if (state == DISCONNECTED) {
+                if (state.get() == DISCONNECTED) {
                     System.out.println("DISCONNECT: Already in disconnected: " + payload);
                     return;
                 }
-                controller.addInfo(payload);
+                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)) {
-                if (state != CONNECTED) {
+                if (state.get() != CONNECTED) {
                     System.out.println("MESSAGE: Illegal state " + state + " for message: " + payload);
                     return;
                 }
-                controller.addMessage(sender, reciever, payload);
+                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)) {
-                controller.addError(payload);
+                messages.addMessage(new Message(Message.MessageType.ERROR,sender,reciever,payload));
                 System.out.println("ERROR: " + payload);
             } else {
                 System.out.println("Unknown data type received: " + type);
             }
         } catch (ChatProtocolException e) {
             System.err.println("Error while processing data: " + e.getMessage());
-            sendData(USER_NONE, userName, DATA_TYPE_ERROR, e.getMessage());
+            sendData(USER_NONE, userName.get(), DATA_TYPE_ERROR, e.getMessage());
         }
     }
 
@@ -187,19 +200,19 @@ public class ClientConnectionHandler implements Runnable {
     }
 
     public void connect() throws ChatProtocolException {
-        if (state != NEW) throw new ChatProtocolException("Illegal state for connect: " + state);
-        this.sendData(userName, USER_NONE, DATA_TYPE_CONNECT,null);
+        if (state.get() != NEW) throw new ChatProtocolException("Illegal state for connect: " + state);
+        this.sendData(userName.get(), USER_NONE, DATA_TYPE_CONNECT,null);
         this.setState(CONFIRM_CONNECT);
     }
 
     public void disconnect() throws ChatProtocolException {
-        if (state != NEW && state != CONNECTED) throw new ChatProtocolException("Illegal state for disconnect: " + state);
-        this.sendData(userName, USER_NONE, DATA_TYPE_DISCONNECT,null);
+        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.setState(CONFIRM_DISCONNECT);
     }
 
     public boolean message(String messageString) throws ChatProtocolException {
-        if (state != CONNECTED) throw new ChatProtocolException("Illegal state for message: " + state);
+        if (state.get() != CONNECTED) throw new ChatProtocolException("Illegal state for message: " + state);
 
         Matcher matcher = messagePattern.matcher(messageString);
         if (matcher.find()) {
@@ -209,7 +222,7 @@ public class ClientConnectionHandler implements Runnable {
                 return false;
             }
             if (receiver == null || receiver.isBlank()) receiver = ClientConnectionHandler.USER_ALL;
-            this.sendData(userName, receiver, DATA_TYPE_MESSAGE,message);
+            this.sendData(userName.get(), receiver, DATA_TYPE_MESSAGE,message);
             return true;
         } else {
             return false;

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

@@ -1,14 +1,17 @@
 package ch.zhaw.pm2.multichat.client;
 
+import javafx.beans.property.SimpleBooleanProperty;
+
 import java.util.ArrayList;
 import java.util.List;
 
 public class ClientMessageList {
     private List<Message> messages = new ArrayList<>();
-
+    private SimpleBooleanProperty changed = new SimpleBooleanProperty(false);
 
     public void addMessage(Message message) {
 	    messages.add(message);
+	    changed.set(!changed.get());
     }
 
 	public String getFilteredMessages(String filter) {
@@ -30,6 +33,9 @@ public class ClientMessageList {
 
     public void clear() {
         messages = new ArrayList<>();
+        changed.set(!changed.get());
     }
 
+    public SimpleBooleanProperty getChangedProperty() { return changed; }
+
 }

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();
-                 System.out.println(String.format("Connected new Client %s with IP:Port <%s:%d>",
-                     connectionHandler.getUserName(),
-                     connection.getRemoteHost(),
-                     connection.getRemotePort()
-                 ));
+                 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

@@ -11,6 +11,8 @@ 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.*;
 
@@ -30,6 +32,10 @@ public class ServerConnectionHandler implements Runnable{
     private static final String USER_NONE = "";
     private static final String USER_ALL = "*";
 
+    private ReentrantLock mutex;
+
+    private Condition nameComplete;
+
     private String userName = "Anonymous-"+connectionId;
     private State state = NEW;
 
@@ -43,11 +49,13 @@ public class ServerConnectionHandler implements Runnable{
     }
 
     public ServerConnectionHandler(NetworkHandler.NetworkConnection<String> connection,
-                                   Map<String,ServerConnectionHandler> registry) {
+                                   Map<String,ServerConnectionHandler> registry, ReentrantLock mutex, Condition nameComplete) {
         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() {
@@ -55,28 +63,29 @@ public class ServerConnectionHandler implements Runnable{
     }
 
     public void startReceiving() {
-        System.out.println("Starting Connection Handler for " + userName);
-        try {
-            System.out.println("Start receiving data...");
-            while (connection.isAvailable()) {
-                String data = connection.receive();
-                processData(data);
+            System.out.println("Starting Connection Handler for new User");
+            try {
+                System.out.println("Start receiving data...");
+                while (connection.isAvailable()) {
+                    String data = connection.receive();
+                    processData(data);
+                }
+                System.out.println("Stopped recieving data");
+            } catch (SocketException e) {
+                System.out.println("Connection terminated locally");
+                connectionRegistry.remove(userName);
+                System.out.println("Unregistered because client connection terminated: " + userName + " " + e.getMessage());
+            } catch (EOFException e) {
+                System.out.println("Connection terminated by remote");
+                connectionRegistry.remove(userName);
+                System.out.println("Unregistered because client connection terminated: " + userName + " " + e.getMessage());
+            } catch (IOException e) {
+                System.err.println("Communication error: " + e);
+            } catch (ClassNotFoundException e) {
+                System.err.println("Received object of unknown type: " + e.getMessage());
             }
-            System.out.println("Stopped recieving data");
-        } catch (SocketException e) {
-            System.out.println("Connection terminated locally");
-            connectionRegistry.remove(userName);
-            System.out.println("Unregistered because client connection terminated: " + userName + " " + e.getMessage());
-        } catch (EOFException e) {
-            System.out.println("Connection terminated by remote");
-            connectionRegistry.remove(userName);
-            System.out.println("Unregistered because client connection terminated: " + userName + " " + e.getMessage());
-        } catch(IOException e) {
-            System.err.println("Communication error: " + e);
-        } catch(ClassNotFoundException e) {
-            System.err.println("Received object of unknown type: " + e.getMessage());
-        }
-        System.out.println("Stopping Connection Handler for " + userName);
+            System.out.println("Stopping Connection Handler for " + userName);
+
     }
 
     public void stopReceiving() {
@@ -124,7 +133,14 @@ public class ServerConnectionHandler implements Runnable{
                 if (sender == null || sender.isBlank()) sender = this.userName;
                 if (connectionRegistry.containsKey(sender))
                     throw new ChatProtocolException("User name already taken: " + sender);
-                this.userName = 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);
                 this.state = CONNECTED;
@@ -149,6 +165,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);
                     }