From a25f1617c8463b9238d701a2f50db1a4c01176c5 Mon Sep 17 00:00:00 2001 From: Js_Sman Date: Tue, 12 Dec 2023 20:23:25 +0100 Subject: [PATCH] =?UTF-8?q?Bisschen=20aufger=C3=A4umt=20und=20Logger=20akt?= =?UTF-8?q?ualisiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ChatProgramm/controller/commands/CommandSend.java | 1 - src/ChatProgramm/model/Client.java | 3 ++- src/ChatProgramm/model/Server.java | 3 ++- src/ChatProgramm/model/Transmitter.java | 11 +++++------ src/ChatProgramm/model/TransmitterInterface.java | 4 +--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/ChatProgramm/controller/commands/CommandSend.java b/src/ChatProgramm/controller/commands/CommandSend.java index 6665020..dd12f76 100644 --- a/src/ChatProgramm/controller/commands/CommandSend.java +++ b/src/ChatProgramm/controller/commands/CommandSend.java @@ -43,7 +43,6 @@ public class CommandSend implements CommandInterface public void execute() { if(transmitterInterface != null && !eingabeFeld.getText().isEmpty()){ - lg.info("Sende Nachricht"); transmitterInterface.send(new Nachricht(eingabeFeld.getText())); eingabeFeld.setText(""); } diff --git a/src/ChatProgramm/model/Client.java b/src/ChatProgramm/model/Client.java index 3474087..fb13d50 100644 --- a/src/ChatProgramm/model/Client.java +++ b/src/ChatProgramm/model/Client.java @@ -4,6 +4,7 @@ */ package ChatProgramm.model; +import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; import java.io.IOException; @@ -17,7 +18,7 @@ import java.util.logging.*; */ public class Client extends Transmitter { - private static Logger lg = Logger.getLogger("netz"); + private static Logger lg = OhmLogger.getLogger(); public Client(ChatView view) throws IOException { diff --git a/src/ChatProgramm/model/Server.java b/src/ChatProgramm/model/Server.java index 0499099..4ef2ae7 100644 --- a/src/ChatProgramm/model/Server.java +++ b/src/ChatProgramm/model/Server.java @@ -5,6 +5,7 @@ package ChatProgramm.model; import ChatProgramm.model.Transmitter; +import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; import java.io.BufferedReader; @@ -29,7 +30,7 @@ import java.util.logging.*; */ public class Server extends Transmitter { - private static Logger lg = Logger.getLogger("netz"); + private static Logger lg = OhmLogger.getLogger(); @Override diff --git a/src/ChatProgramm/model/Transmitter.java b/src/ChatProgramm/model/Transmitter.java index fecaa34..82a46a9 100644 --- a/src/ChatProgramm/model/Transmitter.java +++ b/src/ChatProgramm/model/Transmitter.java @@ -6,6 +6,7 @@ package ChatProgramm.model; import ChatProgramm.controller.Nachricht; import ChatProgramm.controller.ReceiveAdapter; +import ChatProgramm.util.OhmLogger; import ChatProgramm.view.ChatView; import java.io.BufferedReader; @@ -15,7 +16,6 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; import java.net.Socket; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -35,7 +35,7 @@ public abstract class Transmitter implements Runnable, Subscriber, Tr protected static final int PORT = 35000; protected static final String IP = "127.0.0.1"; - private static Logger lg = Logger.getLogger("netz"); + private static Logger lg = OhmLogger.getLogger(); protected Socket socket; protected BufferedReader reader; @@ -104,11 +104,10 @@ public abstract class Transmitter implements Runnable, Subscriber, Tr writer.flush(); lg.info("Nachricht wird angezeigt"); - lg.info(nachricht.getNachricht()); textPublisher.submit(nachricht); } - public Nachricht recieve(){ + public Nachricht receive(){ Nachricht nachricht = new Nachricht(""); try { String txtNachricht = reader.readLine(); @@ -130,9 +129,9 @@ public abstract class Transmitter implements Runnable, Subscriber, Tr @Override public void run() { while (true) { - lg.info("running"); + lg.info("Warte auf Nachricht"); if(laufend) { - Nachricht eingehendeNachricht = recieve(); + Nachricht eingehendeNachricht = receive(); if(!eingehendeNachricht.getNachricht().isEmpty()){ textPublisher.submit(eingehendeNachricht); diff --git a/src/ChatProgramm/model/TransmitterInterface.java b/src/ChatProgramm/model/TransmitterInterface.java index d500f22..d5a7574 100644 --- a/src/ChatProgramm/model/TransmitterInterface.java +++ b/src/ChatProgramm/model/TransmitterInterface.java @@ -2,9 +2,7 @@ package ChatProgramm.model; import ChatProgramm.controller.Nachricht; -import java.util.concurrent.Flow; - public interface TransmitterInterface{ public void send(Nachricht nachricht); - public Nachricht recieve(); + public Nachricht receive(); }