University-of-Basel-Studentprojects/Programmierprojekt
Archived
1
0
Fork 0
Code Issues 17 Pull Requests Actions Wiki Activity

Fix: Resolving Git Merge Conflicts #253

Merged
j.kropff merged 69 commits from chore/ui-checkstyle-fixes into main 2026-04-11 15:10:58 +02:00
Conversation 9 Commits 69 Files Changed 50
+1 -11
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87e9305e82 - Show all commits
src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+1 -11
View File
@@ -17,8 +17,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message; import ch.unibas.dmi.dbis.cs108.casono.client.chat.Message;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/** /**
@@ -30,14 +28,10 @@ public class ClientService {
private final TcpTransport clienttcptransport; private final TcpTransport clienttcptransport;
private final Socket socket; private final Socket socket;
private final String ip;
private final int port;
private final ExecutorService executor; private final ExecutorService executor;
public static ArrayList<String> response; public static ArrayList<String> response;
private final AtomicInteger idGenerator; private final AtomicInteger idGenerator;
private final Logger logger;
/** /**
* Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses. * Creates a new ClientSession with a Socket, a Reader and Writer of the Input- and the Outputstream and a pool of threads to send requests and receive responses.
@@ -47,14 +41,10 @@ public class ClientService {
public ClientService(String ip, int port) { public ClientService(String ip, int port) {
this.ip = ip;
this.port = port;
this.idGenerator = new AtomicInteger(0); this.idGenerator = new AtomicInteger(0);
this.logger = LogManager.getLogger(NetworkManager.class);
try { try {
socket = new Socket(this.ip, this.port); socket = new Socket(ip, port);
logger.info("Connected at port " + this.port);
clienttcptransport = new TcpTransport(socket); clienttcptransport = new TcpTransport(socket);
} }
catch (IOException i) { catch (IOException i) {