ZHAW-IT21b_WIN/Uebung-hk1-Schrom01-Fassband-Brandleo
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into Refactoring_ClientConnectionHandler

Browse Source 
# Conflicts:
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
This commit is contained in:
schrom01
2022-04-14 22:02:39 +02:00
parent 615b3844e3 6e8e560d73
commit d8dbd93c15
4 changed files with 111 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
+15 -12
View File
@@ -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;
@@ -110,16 +109,20 @@ public class ChatWindowController {
private void startConnectionHandler() throws IOException {
String userName = userNameField.getText();
String serverAddress = serverAddressField.getText();
int serverPort = Integer.parseInt(serverPortField.getText());
connectionHandler.initialize(serverAddress, serverPort, userName);
new Thread(connectionHandler).start();
if(!userName.contains(" ")) {
String serverAddress = serverAddressField.getText();
int serverPort = Integer.parseInt(serverPortField.getText());
connectionHandler.initialize(serverAddress, serverPort, userName);
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!");
}
}
public void stateChanged(State newState) {
client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
+25 -40
View File
@@ -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,23 +13,11 @@ 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 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( "^(?:@(\\w*))?\\s*(.*)$" );
private final Pattern messagePattern = Pattern.compile( "^(?:@(\\S*))?\\s*(.*)$" );
private SimpleStringProperty userName;
private SimpleObjectProperty<State> state;
@@ -36,20 +25,17 @@ public class ClientConnectionHandler implements Runnable {
private SimpleStringProperty serverAddress;
private SimpleIntegerProperty serverPort;
enum State {
NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED;
}
public ClientConnectionHandler(ClientMessageList messages) {
super();
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);
this.connection = NetworkHandler.openConnection(serverAddress, serverPort);
setConnection(NetworkHandler.openConnection(serverAddress, serverPort));
this.userName = new SimpleStringProperty((userName == null || userName.isBlank())? USER_NONE : userName);
}
@@ -65,19 +51,18 @@ public class ClientConnectionHandler implements Runnable {
public void setState (State newState) {
state.set(newState);
}
public void run () {
startReceiving();
}
public void startReceiving() {
private void startReceiving() {
System.out.println("Starting Connection Handler");
try {
System.out.println("Start receiving data...");
while (connection.isAvailable()) {
String data = connection.receive();
while (getConnection().isAvailable()) {
String data = getConnection().receive();
processData(data);
}
System.out.println("Stopped recieving data");
@@ -101,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());
@@ -136,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.serverAddress.set(connection.getRemoteHost());
this.serverPort.set(getConnection().getRemotePort());
this.serverAddress.set(getConnection().getRemoteHost());
messages.addMessage(new Message(Message.MessageType.INFO,sender,reciever,payload));
System.out.println("CONFIRM: " + payload);
this.setState(CONNECTED);
@@ -153,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;
@@ -161,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 {
@@ -176,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) {
if (connection.isAvailable()) {
private void sendData(String sender, String receiver, String type, String payload) {
if (getConnection().isAvailable()) {
new StringBuilder();
String data = new StringBuilder()
.append(sender+"\n")
@@ -190,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) {
@@ -203,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);
}
@@ -224,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;