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

fixed #49

Browse Source 
clean up
This commit is contained in:
Andrin Fassbind
2022-04-16 22:09:56 +02:00
parent a189fedd76
commit 40e3e14666
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java
+5 -5
View File
@@ -3,12 +3,11 @@ package ch.zhaw.pm2.multichat.protocol;
import java.io.EOFException;
import java.io.IOException;
import java.net.SocketException;
import java.util.Scanner;
/**
* This abstract class is the superclass for ClientConnectionHandler and ServerConnectionHandler
* It offers the DATA_TYPE Strings and a {@link State} enum for all valid connection states.
* Shared methods are implemented in this class as well {@link ConnectionHandler#sendData(String, String, DATA_TYPE, String)} {@link ConnectionHandler#processData(Scanner, StringBuilder, StringBuilder, StringBuilder, StringBuilder)}
* It offers the DATA_TYPE for message and a {@link State} enum for all valid connection states.
* Shared methods are implemented in this class as well {@link ConnectionHandler#sendData(String, String, DATA_TYPE, String)}
*/
public abstract class ConnectionHandler {
private NetworkHandler.NetworkConnection<String> connection;
@@ -21,8 +20,9 @@ public abstract class ConnectionHandler {
NEW, CONFIRM_CONNECT, CONNECTED, CONFIRM_DISCONNECT, DISCONNECTED, ERROR;
}
// DATA_TYPE of the messages
public enum DATA_TYPE {
DATA_TYPE_CONNECT, DATA_TYPE_CONFIRM, DATA_TYPE_DISCONNECT,DATA_TYPE_MESSAGE,DATA_TYPE_ERROR
DATA_TYPE_CONNECT, DATA_TYPE_CONFIRM, DATA_TYPE_DISCONNECT, DATA_TYPE_MESSAGE, DATA_TYPE_ERROR
}
/**
@@ -88,7 +88,7 @@ public abstract class ConnectionHandler {
protected void sendData(String sender, String receiver, DATA_TYPE type, String payload) {
if (connection.isAvailable()) {
try {
connection.send(new Message(type,sender,receiver,payload));
connection.send(new Message(type, sender, receiver, payload));
} catch (SocketException e) {
System.err.println("Connection closed: " + e.getMessage());
} catch (EOFException e) {
protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/Message.java
+1 -1
View File
@@ -7,7 +7,7 @@ import java.io.Serializable;
*/
public class Message implements Serializable {
private final ConnectionHandler.DATA_TYPE type;
private String sender;
private final String sender;
private final String receiver;
private final String text;