Bisschen aufgeräumt und Logger aktualisiert

src/ChatProgramm/Start.java

@@ -6,6 +6,7 @@
 package ChatProgramm;
 
 import ChatProgramm.controller.CommandController;
+import ChatProgramm.model.Transmitter;
 import ChatProgramm.view.ChatView;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
@@ -18,7 +19,9 @@ public class Start
 {
   public Start()
   {
+    //Transmitter transmitter = new Transmitter();
     ChatView view = new ChatView();
+    //CommandController controller_commands = new CommandController(view, transmitter);
     CommandController controller_commands = new CommandController(view);
     controller_commands.registerEvents();
     controller_commands.registerCommands();

src/ChatProgramm/controller/CommandController.java

@@ -8,6 +8,7 @@ package ChatProgramm.controller;
 import ChatProgramm.controller.commands.CommandConnect;
 import ChatProgramm.controller.commands.CommandInvoker;
 import ChatProgramm.controller.commands.CommandSend;
+import ChatProgramm.model.Transmitter;
 import ChatProgramm.view.ChatView;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -20,8 +21,15 @@ import java.awt.event.ActionListener;
 public class CommandController implements ActionListener{
     
     private ChatView view;
+    //private Transmitter transmitter;
     private CommandInvoker invoker;
     
+//    public CommandController(ChatView view, Transmitter transmitter){
+//        this.view = view;
+//        this.transmitter = transmitter;
+//        this.invoker = new CommandInvoker();
+//    }
+    
     public CommandController(ChatView view){
         this.view = view;
         this.invoker = new CommandInvoker();

src/ChatProgramm/controller/Nachricht.java

@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author ahren
+ */
+public class 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,7 +2,7 @@
  * 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.model;
+package ChatProgramm.controller;
 
 import ChatProgramm.view.ChatView;
 import java.util.concurrent.Flow;
@@ -29,8 +29,7 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
 
     @Override
     public void onNext(Nachricht item) {
-
-        view.getTxtChat().append(item.getNachricht());
+        view.getTxtChat().setText(item.getNachricht());
         this.subscription.request(1);
     }
 
@@ -39,6 +38,6 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
     }
 
     @Override
-    public void onComplete(){
+    public void onComplete() {
     }
 }

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -10,6 +10,7 @@ import ChatProgramm.model.Server;
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
 import java.io.IOException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JDialog;
 import javax.swing.JRadioButton;
@@ -24,10 +25,12 @@ 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, CommandInterface value)
+  public CommandConnect(ChatView view, CommandInterface value)
   {
       rBtnServer = view.getBtnServer();
       rBtnClient = view.getBtnClient();

src/ChatProgramm/controller/commands/CommandInterface.java

@@ -13,5 +13,6 @@ public interface CommandInterface
 {
   public void execute();
   public void undo();
+//  public void redo();
   public boolean isUndoable();
 }

src/ChatProgramm/controller/commands/CommandSend.java

@@ -5,14 +5,17 @@
 
 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;
-import ChatProgramm.model.Nachricht;
 
 /**
  *
@@ -20,16 +23,14 @@ import ChatProgramm.model.Nachricht;
  */
 public class CommandSend implements CommandInterface
 {
-  private static Logger lg = OhmLogger.getLogger();
-  private JTextField eingabeFeld;
-  private String nachricht;
-  private ChatView view;
-  public TransmitterInterface transmitterInterface;
-  public Server server;
-  public Client client;
-
+    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)
   {
@@ -42,12 +43,11 @@ public class CommandSend implements CommandInterface
   public void execute()
   {
       if(transmitterInterface != null && !eingabeFeld.getText().isEmpty()){
-          transmitterInterface.send(eingabeFeld.getText());
+          transmitterInterface.send(new Nachricht(eingabeFeld.getText()));
           eingabeFeld.setText("");
       }
   }
 
-
   @Override
   public boolean isUndoable()
   {

src/ChatProgramm/model/Client.java

@@ -4,7 +4,9 @@
  */
 package ChatProgramm.model;
 
+import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
+
 import java.io.IOException;
 import java.net.Socket;
 import java.util.logging.*;
@@ -16,15 +18,26 @@ import java.util.logging.*;
  */
 public class Client extends Transmitter {
 
-    private static Logger lg = Logger.getLogger("netz");
-    private static final int PORT = 35000; //lt. iana port > 2¹⁵
-    private static final String IP = "127.0.0.1";
+    private static Logger lg = OhmLogger.getLogger();
 
 
     public Client(ChatView view) throws IOException {
         super(view);
         connect();
         initIO();
+
+//        out.println("Hallo Du Server - ich bin ein Client");
+//        out.flush();
+//
+//        lg.info("Client: warte auf Serverantwort");
+//
+//        String nachricht = in.readLine(); // ACHTUNG blockiert
+//        lg.info("Client: Serverbestätigung erhalten");
+//
+//        lg.info("Client: fertig");
+//        in.close();
+//        out.close();
+//        s.close();
     }
 
 
@@ -34,8 +47,11 @@ public class Client extends Transmitter {
             lg.info("Client: Verbindung wird aufgebaut");
             socket = new Socket(IP, PORT);
             lg.info("Client: Verbindung aufgebaut");
+
         } catch (java.io.InterruptedIOException e) {
             lg.warning("Timeout" + "(" + timeout / 1000 + "s)");
         }
     }
+    
+
 }

src/ChatProgramm/model/Nachricht.java

@@ -1,31 +0,0 @@
-/*
- * 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.model;
-
-/**
- *
- * @author ahren
- */
-public class Nachricht 
-{
-  private String nachricht;
-    
-  public Nachricht(String nachricht)
-  {
-    this.nachricht = nachricht;
-  }
-
-  /**
-   * @return the nachricht
-   */
-  public String getNachricht() {
-    return nachricht;
-  }
-
-  public void setNachricht(String nachricht) {
-    this.nachricht = nachricht;
-  }
-}

src/ChatProgramm/model/Server.java

@@ -2,44 +2,73 @@
  * 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;
+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 static final int PORT = 35000; //lt. iana port > 2¹⁵
+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 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);
+//    
+//    // ACHTUNG: blockiert NICHT!!!!
+//    out.println("Server an Client: Nachricht erhalten");
+//    out.flush(); // wichtig
+//    
+//    lg.info("Server: fertig");
+//    in.close();
+//    out.close();
+//    s.close();
+    }
+
+
 
-  }
 }

src/ChatProgramm/model/Transmitter.java

@@ -4,7 +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;
@@ -12,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;
@@ -26,122 +29,126 @@ import java.util.logging.Logger;
  *
  * @author ahren
  */
-public abstract class Transmitter implements Runnable, Subscriber<String>, TransmitterInterface {
+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();
 
     protected Socket socket;
     protected BufferedReader reader;
     protected PrintWriter writer;
 
-    private Nachricht nachricht;
-    private String txtNachricht;
-    private boolean laufend;
     private SubmissionPublisher<Nachricht> textPublisher;
     private ExecutorService eService;
-    private String receivedString;
+    private boolean laufend = false;
+
     private ChatView view;
+
     private ReceiveAdapter receiveAdapter;
 
-    public Transmitter(ChatView view)
-    {
-      socket = new Socket();
-      eService = null;
-      receiveAdapter = new ReceiveAdapter(view);
-      textPublisher = new SubmissionPublisher<>();
-      this.view = view;
-      addWertSubscription(receiveAdapter);
-      nachricht = new Nachricht("");
-    }
+    public Transmitter(ChatView view) {
+        socket = new Socket();
+        eService = null;
+        this.view = view;
+        textPublisher = new SubmissionPublisher<>();
 
-     public void addWertSubscription(Subscriber<Nachricht> subscriber)
-    {
-      textPublisher.subscribe(subscriber);
+        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");
-        InputStream is = socket.getInputStream();
-        OutputStream os = socket.getOutputStream();
+        try {
+            lg.info("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");
+            InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+            OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
 
-        reader = new BufferedReader(isr);
-        writer = new PrintWriter(osr);
-        lg.info("Reader / Writer Initialisierung abgeschlossen");
-        startempfangen();
-        lg.info("Warte auf Nachricht");
+            reader = new BufferedReader(isr);
+            writer = new PrintWriter(osr);
+            lg.info("Initialisierung abgeschlossen");
 
-      } 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);
-      }
+            start();
+
+        } catch (IOException ex) {
+            Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
+        }
     }
 
-    public void send(String txtNachricht){
-
-        writer.println(txtNachricht);
-        writer.flush();
-        lg.info("Nachricht gesendet");
-        nachricht.setNachricht("\nDu: " + txtNachricht);
-        textPublisher.submit(nachricht);
-    }
-    public Nachricht receive(){
-      try {
-        txtNachricht = reader.readLine();
-        if(!txtNachricht.isEmpty()){
-          lg.info("Nachricht erhalten");
-          nachricht.setNachricht("\nEr / Sie: " + txtNachricht);
-          return nachricht;
+    public void start(){
+        synchronized (this){
+            laufend = true;
         }
 
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-      return nachricht;
+        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;
     }
 
-//    public void disconnect (){
-//    in.close();
-//    out.close();
-//    s.close();
-//    }
 
     @Override
     public void run() {
-      while (true) {
-        lg.info("Warte auf Nachricht");
-        if(laufend) {
-          nachricht = receive();
-          if(!nachricht.getNachricht().isEmpty()){
-              textPublisher.submit(nachricht);
-          }
-        }
-        else{
-          break;
-        }
-      }
-    }
+        while (true) {
+            lg.info("Warte auf Nachricht");
+            if(laufend) {
+                Nachricht eingehendeNachricht = receive();
 
+                if(!eingehendeNachricht.getNachricht().isEmpty()){
+                    textPublisher.submit(eingehendeNachricht);
+                }
+
+            }
+            else{
+                break;
+            }
+        }
+    }
 
     @Override
     public void onSubscribe(Flow.Subscription subscription) {
         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
@@ -152,15 +159,9 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
 
-  private void startempfangen()
-  {
-    synchronized (this){
-    laufend = true;
+    @Override
+    public void onNext(Nachricht item) {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
-    if (eService == null){
-        eService = Executors.newSingleThreadExecutor();
-        eService.execute(this);
-    }
-    lg.info("Starte Chat");
-  }
+
 }

src/ChatProgramm/model/TransmitterInterface.java

@@ -1,17 +1,8 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Interface.java to edit this template
- */
 package ChatProgramm.model;
 
-import ChatProgramm.model.Nachricht;
-/**
- *
- * @author ahren
- */
-public interface TransmitterInterface
-{
-    public void send(String txtNachricht);
-    public Nachricht receive();
+import ChatProgramm.controller.Nachricht;
 
+public interface TransmitterInterface{
+    public void send(Nachricht nachricht);
+    public Nachricht receive();
 }