Bisschen aufgeräumt und Logger aktualisiert

src/ChatProgramm/controller/CommandController.java

@@ -41,8 +41,9 @@ public class CommandController implements ActionListener{
     }
     
     public void registerCommands(){
-        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view));
-        invoker.addCommand(view.getTfNachricht(), new CommandSend());
+        CommandSend commandSend = new CommandSend(view);
+        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend));
+        invoker.addCommand(view.getTfNachricht(), commandSend);
     }
 
     /**

src/ChatProgramm/controller/Nachricht.java

@@ -9,10 +9,35 @@ package ChatProgramm.controller;
  *
  * @author ahren
  */
-class Nachricht 
+public class Nachricht 
 {
-  public Nachricht()
+    private String nachricht;
+    //private int id;
+    
+  public Nachricht(String nachricht)
   {
+      this.setNachricht(nachricht);
+      //this.id = id;
   
   }
+  
+
+
+    /**
+     * @return the id
+     */
+//    public int getId() {
+//        return id;
+//    }
+
+    /**
+     * @return the nachricht
+     */
+    public String getNachricht() {
+        return nachricht;
+    }
+
+    public void setNachricht(String nachricht) {
+        this.nachricht = nachricht;
+    }
 }

src/ChatProgramm/controller/ReceiveAdapter.java

@@ -2,9 +2,9 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
  */
-
 package ChatProgramm.controller;
 
+import ChatProgramm.view.ChatView;
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
 
@@ -12,30 +12,32 @@ import java.util.concurrent.Flow.Subscriber;
  *
  * @author ahren
  */
-public class ReceiveAdapter implements Subscriber<Nachricht>
-{
-  public ReceiveAdapter()
-  {
-  
-  }
+public class ReceiveAdapter implements Subscriber<Nachricht> {
 
-  @Override
-  public void onSubscribe(Flow.Subscription subscription)
-  {
-  }
+    private ChatView view;
+    private Flow.Subscription subscription;
 
-  @Override
-  public void onNext(Nachricht item)
-  {
-  }
+    public ReceiveAdapter(ChatView view) {
+        this.view = view;
+    }
 
-  @Override
-  public void onError(Throwable throwable)
-  {
-  }
+    @Override
+    public void onSubscribe(Flow.Subscription subscription) {
+        this.subscription = subscription;
+        this.subscription.request(1);
+    }
 
-  @Override
-  public void onComplete()
-  {
-  }
+    @Override
+    public void onNext(Nachricht item) {
+        view.getTxtChat().setText(item.getNachricht());
+        this.subscription.request(1);
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+    }
+
+    @Override
+    public void onComplete() {
+    }
 }

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -25,12 +25,20 @@ public class CommandConnect implements CommandInterface
     private JRadioButton rBtnClient;
     private JDialog dialogFenster;
     private static Logger lg = OhmLogger.getLogger();
+
+    private CommandSend commandSend;
+
+    private ChatView view;
     
-  public CommandConnect(ChatView view)
+  public CommandConnect(ChatView view, CommandInterface value)
   {
       rBtnServer = view.getBtnServer();
       rBtnClient = view.getBtnClient();
       dialogFenster = view.getjDialog1();
+
+      commandSend = (CommandSend) value;
+
+      this.view = view;
   }
 
   @Override
@@ -39,7 +47,7 @@ public class CommandConnect implements CommandInterface
       if(rBtnServer.isSelected()){
           lg.info("Server ausgewählt");
           try {
-              new Server();
+             commandSend.transmitterInterface =  new Server(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
           }
@@ -48,7 +56,7 @@ public class CommandConnect implements CommandInterface
       if(rBtnClient.isSelected()){
           lg.info("Client ausgewählt");
           try {
-              new Client();
+              commandSend.transmitterInterface =  new Client(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
 

src/ChatProgramm/controller/commands/CommandSend.java

@@ -5,20 +5,47 @@
 
 package ChatProgramm.controller.commands;
 
+import ChatProgramm.controller.Nachricht;
+import ChatProgramm.model.Client;
+import ChatProgramm.model.Server;
+import ChatProgramm.model.Transmitter;
+import ChatProgramm.model.TransmitterInterface;
+import ChatProgramm.util.OhmLogger;
+import ChatProgramm.view.ChatView;
+
+import java.util.Objects;
+import java.util.logging.Logger;
+import javax.swing.JTextField;
+
 /**
  *
  * @author ahren
  */
 public class CommandSend implements CommandInterface
 {
-  public CommandSend()
+    private static Logger lg = OhmLogger.getLogger();
+    
+    private ChatView view;
+    public TransmitterInterface transmitterInterface;
+    private JTextField eingabeFeld;
+    
+    public Server server;
+    public Client client;
+    
+  public CommandSend(ChatView view)
   {
-  
+      this.view = view;
+      this.eingabeFeld = view.getTfNachricht();
+      transmitterInterface = null;
   }
 
   @Override
   public void execute()
   {
+      if(transmitterInterface != null && !eingabeFeld.getText().isEmpty()){
+          transmitterInterface.send(new Nachricht(eingabeFeld.getText()));
+          eingabeFeld.setText("");
+      }
   }
 
   @Override

src/ChatProgramm/model/Client.java

@@ -4,14 +4,10 @@
  */
 package ChatProgramm.model;
 
-import java.io.BufferedReader;
+import ChatProgramm.util.OhmLogger;
+import ChatProgramm.view.ChatView;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.logging.*;
 
@@ -22,17 +18,13 @@ import java.util.logging.*;
  */
 public class Client extends Transmitter {
 
-    private static Logger lg = Logger.getLogger("netz");
+    private static Logger lg = OhmLogger.getLogger();
 
-    private Socket socket;
-    private BufferedReader reader;
-    private PrintWriter writer;
 
-    private static final int PORT = 35000; //lt. iana port > 2¹⁵
-    private static final String IP = "127.0.0.1";
-
-    public Client() throws IOException {
+    public Client(ChatView view) throws IOException {
+        super(view);
         connect();
+        initIO();
 
 //        out.println("Hallo Du Server - ich bin ein Client");
 //        out.flush();
@@ -48,16 +40,6 @@ public class Client extends Transmitter {
 //        s.close();
     }
 
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-        try {
-            new Client();
-        } catch (IOException ex) {
-            Logger.getLogger(Client.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
 
     @Override
     public void connect() throws IOException {
@@ -66,21 +48,10 @@ public class Client extends Transmitter {
             socket = new Socket(IP, PORT);
             lg.info("Client: Verbindung aufgebaut");
 
-            lg.info("Client: initialisiere reader und writer");
-            InputStream is = socket.getInputStream();
-            OutputStream os = socket.getOutputStream();
-
-            InputStreamReader isr = new InputStreamReader(is, "UTF-8");
-            OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
-
-            reader = new BufferedReader(isr);
-            writer = new PrintWriter(osr);
-            lg.info("Client: Initialisierung abgeschlossen");
-
-            lg.info("Client: warte auf Nachricht");
-
         } catch (java.io.InterruptedIOException e) {
             lg.warning("Timeout" + "(" + timeout / 1000 + "s)");
         }
     }
+    
+
 }

src/ChatProgramm/model/Server.java

@@ -2,10 +2,12 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Main.java to edit this template
  */
-
 package ChatProgramm.model;
 
 import ChatProgramm.model.Transmitter;
+import ChatProgramm.util.OhmLogger;
+import ChatProgramm.view.ChatView;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,58 +15,46 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.ArrayList;
+import java.util.concurrent.Flow;
+import java.util.concurrent.SubmissionPublisher;
 import java.util.logging.*;
 
 /**
  * Builder Class
+ *
  * @author le
  */
-public class Server extends Transmitter
-{
-  private static Logger lg = Logger.getLogger("netz");
-  
-  private Socket socket;
-  private BufferedReader reader;
-  private PrintWriter writer;
-  
-  private static final int PORT = 35000; //lt. iana port > 2¹⁵
-  
-  public void connect() throws IOException
-  {
-      try
-      {
-          ServerSocket sSocket = new ServerSocket(PORT);
-          sSocket.setSoTimeout(timeout);
-          lg.info("Server: warte auf Verbindung");
-          socket = sSocket.accept();
-          lg.info("Server: Verbindung akzeptiert");
-          
-          lg.info("Server: initialisiere reader und writer");
-          InputStream is = socket.getInputStream();
-          OutputStream os = socket.getOutputStream();
-          
-          InputStreamReader isr = new InputStreamReader(is, "UTF-8");
-          OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
-          
-          reader = new BufferedReader(isr);
-          writer = new PrintWriter(osr);
-          lg.info("Server: Initialisierung abgeschlossen");
-          
-          lg.info("Server: warte auf Nachricht");
- 
-      }
-      catch ( java.io.InterruptedIOException e )
-      {
-          lg.warning("Timeout"+"("+timeout/1000+"s)");
-      }
-      
-  }
-  public Server() throws IOException
-  {
-      connect();
-    
+public class Server extends Transmitter {
+
+    private static Logger lg = OhmLogger.getLogger();
+
+
+    @Override
+    public void connect() throws IOException {
+        try {
+            ServerSocket sSocket = new ServerSocket(PORT);
+            sSocket.setSoTimeout(timeout);
+            lg.info("Server: warte auf Verbindung");
+            socket = sSocket.accept();
+            lg.info("Server: Verbindung akzeptiert");
+
+        } catch (java.io.InterruptedIOException e) {
+            lg.warning("Timeout" + "(" + timeout / 1000 + "s)");
+        }
+
+    }
+
+
+
+    public Server(ChatView view) throws IOException {
+        super(view);
+        connect();
+        initIO();
+
 //    String nachricht = in.readLine(); // ACHTUNG blockiert
 //    lg.info("Server: Nachricht erhalten");
 //    System.out.println("Server: NACHRICHT = " + nachricht);
@@ -77,20 +67,8 @@ public class Server extends Transmitter
 //    in.close();
 //    out.close();
 //    s.close();
-  }
+    }
+
+
 
-  /**
-   * @param args the command line arguments
-   */
-  public static void main(String[] args) 
-  {
-    try
-    {
-      new Server();
-    }
-    catch (IOException ex)
-    {
-      Logger.getLogger(Server.class.getName()).log(Level.SEVERE, null, ex);
-    }
-  }
 }

src/ChatProgramm/model/Transmitter.java

@@ -4,6 +4,11 @@
  */
 package ChatProgramm.model;
 
+import ChatProgramm.controller.Nachricht;
+import ChatProgramm.controller.ReceiveAdapter;
+import ChatProgramm.util.OhmLogger;
+import ChatProgramm.view.ChatView;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,11 +16,12 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.SubmissionPublisher;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -23,23 +29,42 @@ import java.util.logging.Logger;
  *
  * @author ahren
  */
-public abstract class Transmitter implements Runnable, Subscriber<String> {
+public abstract class Transmitter implements Runnable, Subscriber<Nachricht>, TransmitterInterface {
 
-    static final int timeout = 60000;
-    private static final int PORT = 35000;
+    static final int timeout = 30000;
+    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();
 
-    private Socket socket;
-    private BufferedReader reader;
-    private PrintWriter writer;
+    protected Socket socket;
+    protected BufferedReader reader;
+    protected PrintWriter writer;
 
-    public Transmitter() {
+    private SubmissionPublisher<Nachricht> textPublisher;
+    private ExecutorService eService;
+    private boolean laufend = false;
 
+    private ChatView view;
+
+    private ReceiveAdapter receiveAdapter;
+
+    public Transmitter(ChatView view) {
+        socket = new Socket();
+        eService = null;
+        this.view = view;
+        textPublisher = new SubmissionPublisher<>();
+
+        receiveAdapter = new ReceiveAdapter(view);
+        addWertSubscription(receiveAdapter);
     }
 
     public abstract void connect() throws IOException;
 
+    public void addWertSubscription(Subscriber<Nachricht> subscriber) {
+        textPublisher.subscribe(subscriber);
+    }
+
     public void initIO() {
         try {
             lg.info("Initialisiere reader und writer");
@@ -51,19 +76,72 @@ public abstract class Transmitter implements Runnable, Subscriber<String> {
 
             reader = new BufferedReader(isr);
             writer = new PrintWriter(osr);
-            lg.info("Server: Initialisierung abgeschlossen");
+            lg.info("Initialisierung abgeschlossen");
 
-            lg.info("Server: warte auf Nachricht");
+            start();
 
-        } catch (UnsupportedEncodingException ex) {
-            Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
         } catch (IOException ex) {
             Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
 
+    public void start(){
+        synchronized (this){
+            laufend = true;
+        }
+
+        if (eService == null){
+            eService = Executors.newSingleThreadExecutor();
+            eService.execute(this);
+        }
+
+        lg.info("Starte Chat");
+    }
+
+    public void send(Nachricht nachricht) {
+        lg.info("Nachricht wird gesendet");
+        writer.println(nachricht.getNachricht());
+        writer.flush();
+
+        lg.info("Nachricht wird angezeigt");
+        textPublisher.submit(nachricht);
+    }
+
+    public Nachricht receive(){
+        Nachricht nachricht = new Nachricht("");
+        try {
+            String txtNachricht = reader.readLine();
+            if(!txtNachricht.isEmpty()){
+                lg.info("Nachricht erhalten");
+                nachricht.setNachricht(txtNachricht);
+                return nachricht;
+            }
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+
+        return nachricht;
+    }
+
+
     @Override
     public void run() {
+        while (true) {
+            lg.info("Warte auf Nachricht");
+            if(laufend) {
+                Nachricht eingehendeNachricht = receive();
+
+                if(!eingehendeNachricht.getNachricht().isEmpty()){
+                    textPublisher.submit(eingehendeNachricht);
+                }
+
+            }
+            else{
+                break;
+            }
+        }
     }
 
     @Override
@@ -71,11 +149,6 @@ public abstract class Transmitter implements Runnable, Subscriber<String> {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
 
-    @Override
-    public void onNext(String item) {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
     @Override
     public void onError(Throwable throwable) {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
@@ -86,4 +159,9 @@ public abstract class Transmitter implements Runnable, Subscriber<String> {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
 
+    @Override
+    public void onNext(Nachricht item) {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
 }

src/ChatProgramm/model/TransmitterInterface.java

@@ -0,0 +1,8 @@
+package ChatProgramm.model;
+
+import ChatProgramm.controller.Nachricht;
+
+public interface TransmitterInterface{
+    public void send(Nachricht nachricht);
+    public Nachricht receive();
+}