Aufgeräumt

src/ChatProgramm/Start.java

@@ -5,9 +5,12 @@
 
 package ChatProgramm;
 
-import ChatProgramm.controller.CommandController;
 import ChatProgramm.controller.GrafikController;
-import ChatProgramm.model.GrafikModel;
+import ChatProgramm.controller.commands.CommandConnectV2;
+import ChatProgramm.controller.commands.CommandSendV2;
+import ChatProgramm.model.ChatModel;
+import ChatProgramm.model.GrafikDaten;
+import ChatProgramm.controller.ReceiveAdapter;
 import ChatProgramm.view.ChatView;
 import ChatProgramm.view.GrafikView;
 import javax.swing.JOptionPane;
@@ -21,19 +24,24 @@ public class Start
 {
   public Start()
   {
-    GrafikModel model = new GrafikModel();
+    GrafikDaten gDaten = new GrafikDaten();
     ChatView view = new ChatView();
     GrafikView zeichenflaeche = view.getGvZeichenflaeche();
-    zeichenflaeche.setModel(model);
+    zeichenflaeche.setModel(gDaten);
     
-    GrafikController controller = new GrafikController(zeichenflaeche, model);
+    ChatModel model = new ChatModel(gDaten);
-    controller.registerEvents();
 
-    CommandController controller_commands = new CommandController(view, model, controller, zeichenflaeche);
+    GrafikController gContoller = new GrafikController(view,model);
-    controller_commands.registerEvents();
+    gContoller.registerEvents();
-    controller_commands.registerCommands();
 
+    CommandConnectV2 cConnect = new CommandConnectV2(view,model);
+    cConnect.registerEvents();
 
+    CommandSendV2 cSend = new CommandSendV2(view, model);
+    cSend.registerEvents();
+
+    ReceiveAdapter rAdapter = new ReceiveAdapter(view, model);
+    model.addSubscription(rAdapter);
 
     
     view.setVisible(true);

src/ChatProgramm/controller/CommandController.java

@@ -1,61 +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.controller;
-
-import ChatProgramm.controller.commands.CommandConnect;
-import ChatProgramm.controller.commands.CommandInvoker;
-import ChatProgramm.controller.commands.CommandSend;
-import ChatProgramm.model.GrafikModel;
-import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- *
- * @author ahren
- */
-public class CommandController implements ActionListener{
-    
-    private ChatView view;
-    private GrafikModel model;
-    private GrafikView gView;
-    private CommandInvoker invoker;
-    private GrafikController controller;
-        
-public CommandController(ChatView view, GrafikModel model, GrafikController controller, GrafikView gView){
-        this.view = view;
-        this.model = model;
-        this.gView = gView;
-        this.invoker = new CommandInvoker();
-        this.controller = controller;
-    }
-    
-    public void registerEvents(){
-        view.getBtnConnect().addActionListener(this); 
-    }
-    
-    public void registerCommands(){
-        CommandSend commandSend = new CommandSend(view.getGvZeichenflaeche(), model);
-        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend, model, gView));
-        this.controller.setCommand(commandSend);
-    }
-
-    /**
-     * Ausführen des jeweiligen Kommandos
-     * @param e Referenz auf das Event
-     */
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        Component key = (Component)e.getSource();
-        invoker.executeCommand(key);
-
-    }
-    
-}
-
-

src/ChatProgramm/controller/GrafikController.java

@@ -5,13 +5,16 @@
 
 package ChatProgramm.controller;
 
-import ChatProgramm.controller.commands.CommandSend;
+
-import java.awt.Point;
+import ChatProgramm.model.ChatModel;
+import ChatProgramm.util.OhmLogger;
+import ChatProgramm.view.ChatView;
+
+import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
-import ChatProgramm.model.GrafikModel;
+import java.util.logging.Logger;
-import ChatProgramm.view.GrafikView;
 
 /**
  *
@@ -19,49 +22,36 @@ import ChatProgramm.view.GrafikView;
  */
 public class GrafikController extends MouseAdapter implements MouseMotionListener
 {
-  private GrafikView view;
+  private static Logger lg = OhmLogger.getLogger();
-  private GrafikModel model;
+  private ChatView view;
-  private CommandSend commandSend;
+  private ChatModel model;
   
-  public GrafikController(GrafikView view, GrafikModel model)
+  public GrafikController(ChatView view, ChatModel model)
   {
     this.view = view;
     this.model = model;
-    commandSend = null;
   }
 
-  void setCommand(CommandSend command){
-      this.commandSend = command;
-  }
   
   public void registerEvents()
   {
-    view.addMouseMotionListener(this);
+    view.getGvZeichenflaeche().addMouseMotionListener(this);
-    view.addMouseListener(this);
+    view.getGvZeichenflaeche().addMouseListener(this);
   }
 
-
-
   @Override
   public void mouseDragged(MouseEvent evt)
   {
     Point p = evt.getPoint();
-    model.addPoint(p);
-    view.drawPoint();
-  }
 
-  @Override
+    model.getGrafikDaten().addPoint(p);
-  public void mouseMoved(MouseEvent e)
+    view.getGvZeichenflaeche().drawPoint();
-  {
   }
 
   @Override
   public void mouseReleased(MouseEvent evt)
   {
-      model.endShape();
+      model.getGrafikDaten().endShape();
-      if(commandSend != null){
-        commandSend.execute();   
-      }
 
   }
 }

src/ChatProgramm/controller/ReceiveAdapter.java

@@ -2,8 +2,10 @@
  * 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.model.ChatModel;
+import ChatProgramm.model.Figur;
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
 import ChatProgramm.view.GrafikView;
@@ -20,16 +22,13 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     private static Logger lg = OhmLogger.getLogger();
 
     private ChatView view;
-    private GrafikModel model;
+    private ChatModel model;
-    private GrafikView gView;
+    
     private Flow.Subscription subscription;
 
-    public ReceiveAdapter(ChatView view, GrafikModel model, GrafikView gView) {
+    public ReceiveAdapter(ChatView view, ChatModel model) {
         this.view = view;
         this.model = model; 
-        this.gView = gView;
-        
-       
     }
 
     @Override
@@ -39,10 +38,8 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     }
 
     public void onNext(Figur item) {
-        model.addFigure(item);
+        view.getGvZeichenflaeche().drawFigur();
-        gView.drawFigur();
+        lg.info("Figur auf die Zeichenfläche projiziert");
- 
-        lg.info("Figur wurde dem Grafikmodel hinzugefügt");
         this.subscription.request(1);
     }
 

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -1,82 +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.controller.commands;
-
-import ChatProgramm.model.Client;
-import ChatProgramm.model.GrafikModel;
-import ChatProgramm.model.Server;
-import ChatProgramm.util.OhmLogger;
-import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
-import java.io.IOException;
-import java.util.logging.Logger;
-import javax.swing.JDialog;
-import javax.swing.JRadioButton;
-
-/**
- *
- * @author ahren
- */
-public class CommandConnect implements CommandInterface
-{
-    private JRadioButton rBtnServer;
-    private JRadioButton rBtnClient;
-    private JDialog dialogFenster;
-    private static Logger lg = OhmLogger.getLogger();
-    private CommandSend commandSend;
-    private ChatView view;
-    private GrafikModel model;
-    private GrafikView gView;
-    
-    public CommandConnect(ChatView view, CommandInterface value, GrafikModel model, GrafikView gView)
-  {
-      rBtnServer = view.getBtnServer();
-      rBtnClient = view.getBtnClient();
-      dialogFenster = view.getjDialog1();
-
-      commandSend = (CommandSend) value;
-
-      this.view = view;
-      this.model = model;
-      this.gView = gView;
-  }
-
-  @Override
-  public void execute()
-  {
-      if(rBtnServer.isSelected()){
-          lg.info("Server ausgewählt");
-          try {
-              commandSend.setTransmitter(new Server(view, model, gView));
-          } catch (IOException ex) {
-              lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
-          }
-      }
-      
-      if(rBtnClient.isSelected()){
-          lg.info("Client ausgewählt");
-          try {
-              commandSend.setTransmitter(new Client(view, model, gView));
-          } catch (IOException ex) {
-              lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
-
-          }
-      }
-      
-      dialogFenster.setVisible(false);
-  }
-
-  @Override
-  public boolean isUndoable()
-  {
-    return false;
-  }
-
-  @Override
-  public void undo()
-  {
-  }
-}

src/ChatProgramm/controller/commands/CommandConnectV2.java

@@ -0,0 +1,61 @@
+/*
+ * 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.commands;
+
+import ChatProgramm.model.ChatModel;
+import ChatProgramm.model.Client;
+import ChatProgramm.model.Server;
+import ChatProgramm.util.OhmLogger;
+import ChatProgramm.view.ChatView;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Js-Sc
+ */
+public class CommandConnectV2 implements ActionListener {
+
+    private static Logger lg = OhmLogger.getLogger();
+    private ChatView view;
+    private ChatModel model;
+
+    public CommandConnectV2(ChatView view, ChatModel model) {
+        this.view = view;
+        this.model = model;
+    }
+
+    public void registerEvents() {
+        view.getBtnConnect().addActionListener(this);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        if (view.getBtnServer().isSelected()) {
+            lg.info("Server ausgewählt");
+            try {
+                model.setTransmitter(new Server(view, model));
+            } catch (IOException ex) {
+                lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
+            }
+        }
+
+        if (view.getBtnClient().isSelected()) {
+            lg.info("Client ausgewählt");
+            try {
+                model.setTransmitter(new Client(view, model));
+            } catch (IOException ex) {
+                lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
+
+            }
+        }
+
+        view.getjDialog1().setVisible(false);
+    }
+
+}

src/ChatProgramm/controller/commands/CommandInterface.java

@@ -1,17 +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.controller.commands;
-
-/**
- *
- * @author ahren
- */
-public interface CommandInterface
-{
-  public void execute();
-  public void undo();
-  public boolean isUndoable();
-}

src/ChatProgramm/controller/commands/CommandInvoker.java

@@ -1,69 +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.controller.commands;
-
-import java.awt.Component;
-import java.util.HashMap;
-import java.util.Stack;
-
-/**
- *
- * @author ahren
- */
-public class CommandInvoker {
-    
-    private HashMap<Component, CommandInterface> commands;
-    private Stack <CommandInterface> undoStack;
-    
-    public CommandInvoker(){
-        commands = new HashMap<>();
-        undoStack = new Stack();  
-    }
-    
-    /**
-    * Fügt ein Kommando zur Kommando-"Datenbank" = HashMap hinzu
-    * @param key Quelle des Events
-    * @param value Referenz auf das zugehörige Kommando-Objekt
-    */
-    public void addCommand(Component key, CommandInterface value){
-        commands.put(key, value);
-    }
-    
-    /**
-    * Führt Kommando der Eventquelle "key" aus und legt die Referenz
-    * des Kommando in den Undo-Stack
-    * @param key Referenz auf die Eventquelle
-    */
-    public void executeCommand(Component key){
-      CommandInterface command = commands.get(key);
-      command.execute();
-      if (command.isUndoable())
-      {
-        undoStack.push(command);
-      }
-    }
-    /**
-    * Falls der Stack Elemente enthält, wird das oberste Element geholt
-    * und die Methode "undo" des Commands aufgerufen
-    */
-    public void undoCommand()
-    {
-      if (!undoStack.isEmpty())
-      {
-        undoStack.pop().undo();
-      }
-    }
-
-    /**
-     * Löscht bei Öffnen einer neuen Datei den Stack
-     */
-    public void deleteStack()
-    {
-      while(!undoStack.isEmpty())
-        undoStack.pop();
-    }
-    
-}

src/ChatProgramm/controller/commands/CommandSend.java

@@ -1,83 +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.controller.commands;
-
-import ChatProgramm.model.Client;
-import ChatProgramm.model.Figur;
-import ChatProgramm.model.GrafikModel;
-import ChatProgramm.model.Server;
-import ChatProgramm.model.TransmitterInterface;
-import ChatProgramm.util.OhmLogger;
-import ChatProgramm.view.ChatView;
-import java.util.logging.Logger;
-import javax.swing.JTextField;
-import ChatProgramm.view.GrafikView;
-
-/**
- *
- * @author ahren
- */
-public class CommandSend implements CommandInterface
-{
-  private static Logger lg = OhmLogger.getLogger();
-  
-  private GrafikView view;
-  private GrafikModel model;
-  
-  public TransmitterInterface transmitterInterface;
-  public Server server;
-  public Client client;
-
-
-  
-    
-  public CommandSend(GrafikView view, GrafikModel model)
-  {
-      this.view = view;
-      this.model = model;
-      //ToDo: Hier muss auch der gFrame referenziert werden
-      //this.eingabeFeld = view.getTfNachricht();
-      transmitterInterface = null;
-  }
-
-  @Override
-  public void execute()
-  {
-    Figur aktuelleFigur = model.getFiguren().getLast();
-    try
-    {
-        transmitterInterface.send(aktuelleFigur);
-        
-    }
-    catch(Exception NullPointerExeption)
-    {
-        lg.info("Der Transmitter ist null");
-    }
-  }
-
-
-  @Override
-  public boolean isUndoable()
-  {
-    return false;
-  }
-
-  @Override
-  public void undo()
-  {
-  }
-
-    void setTransmitter(TransmitterInterface transmitter) {
-        lg.info("Transmitter wird gesetzt");
-        if(transmitter != null){
-            this.transmitterInterface = transmitter;
-            
-        }
-        else{
-            lg.info("der transmitter kommt hier als null an");
-        }
-    }
-}

src/ChatProgramm/controller/commands/CommandSendV2.java

@@ -0,0 +1,39 @@
+/*
+ * 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.commands;
+
+import ChatProgramm.model.ChatModel;
+import ChatProgramm.util.OhmLogger;
+import ChatProgramm.view.ChatView;
+
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Js-Sc
+ */
+public class CommandSendV2 extends MouseAdapter implements MouseMotionListener {
+
+    private static Logger lg = OhmLogger.getLogger();
+    private ChatView view;
+    private ChatModel model;
+
+    public CommandSendV2(ChatView view, ChatModel model) {
+        this.view = view;
+        this.model = model;
+    }
+
+    public void registerEvents() {
+        view.getGvZeichenflaeche().addMouseListener(this);
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+        model.sendFigur();
+    }
+}

src/ChatProgramm/model/ChatModel.java

@@ -0,0 +1,79 @@
+/*
+ * 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;
+
+import ChatProgramm.util.OhmLogger;
+
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.SubmissionPublisher;
+import java.util.logging.Logger;
+
+/**
+ * @author Js-Sc
+ */
+public class ChatModel implements Subscriber<Figur> {
+
+    private static Logger lg = OhmLogger.getLogger();
+    private SubmissionPublisher<Figur> figurPublisher;
+    private Flow.Subscription subscription;
+
+    private Transmitter transmitter;
+    private GrafikDaten grafikDaten;
+
+
+
+    public ChatModel(GrafikDaten gDaten) {
+        this.grafikDaten = gDaten;
+        this.transmitter = null;
+
+        this.figurPublisher = new SubmissionPublisher<>();
+    }
+
+    public void setTransmitter(Transmitter transmitter) {
+        this.transmitter = transmitter;
+        this.transmitter.addSubscription(this);
+    }
+
+
+    public void addSubscription(Subscriber<Figur> subscriber) {
+        figurPublisher.subscribe(subscriber);
+    }
+
+
+    @Override
+    public void onSubscribe(Flow.Subscription subscription) {
+        this.subscription = subscription;
+        this.subscription.request(1);
+    }
+
+    @Override
+    public void onNext(Figur item) {
+        grafikDaten.addFigure(item);
+        lg.info("Figur wurde dem Grafikmodel hinzugefügt");
+        figurPublisher.submit(item);
+        this.subscription.request(1);
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+    @Override
+    public void onComplete() {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+    public GrafikDaten getGrafikDaten() {
+        return grafikDaten;
+    }
+
+    public void sendFigur() {
+        lg.info("Sende aktuelle Figur");
+        transmitter.send(grafikDaten.getFiguren().getLast());
+    }
+
+}

src/ChatProgramm/model/Client.java

@@ -6,10 +6,10 @@ package ChatProgramm.model;
 
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
+
 import java.io.IOException;
 import java.net.Socket;
-import java.util.logging.*;
+import java.util.logging.Logger;
 
 /**
  * Builder Class
@@ -23,8 +23,8 @@ public class Client extends Transmitter {
     private static final String IP = "127.0.0.1";
     
 
-    public Client(ChatView view, GrafikModel model, GrafikView gView) throws IOException {
+    public Client(ChatView view, ChatModel model) throws IOException {
-        super(view, model, gView);
+        super(view, model);
         connect();
         initIO();
     }

src/ChatProgramm/model/GrafikDaten.java

@@ -4,34 +4,27 @@
  */
 package ChatProgramm.model;
 
-import java.awt.Point;
+import ChatProgramm.util.OhmLogger;
-import java.io.BufferedInputStream;
+
-import java.io.BufferedOutputStream;
+import java.awt.*;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 import java.util.prefs.Preferences;
-import ChatProgramm.util.OhmLogger;
 
 /**
  *
  * @author le
  */
-public class GrafikModel {
+public class GrafikDaten {
 
     private Figur aktuelleFigur;
     private ArrayList<Figur> figuren;
     private Preferences pref;
     private static Logger lg = OhmLogger.getLogger();
 
-    public GrafikModel() {
+    public GrafikDaten() {
         aktuelleFigur = new Figur();
         figuren = new ArrayList<>();
     }

src/ChatProgramm/model/Server.java

@@ -7,10 +7,10 @@ package ChatProgramm.model;
 
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
+
 import java.io.IOException;
 import java.net.ServerSocket;
-import java.util.logging.*;
+import java.util.logging.Logger;
 
 /**
  * Builder Class
@@ -21,8 +21,8 @@ public class Server extends Transmitter
   private static Logger lg = OhmLogger.getLogger();  
   private static final int PORT = 35000; //lt. iana port > 2¹⁵
   
-    public Server(ChatView view, GrafikModel model, GrafikView gView) throws IOException {
+    public Server(ChatView view, ChatModel model) throws IOException {
-        super(view, model, gView);
+        super(view, model);
         connect();
         initIO();
   } 

src/ChatProgramm/model/Transmitter.java

@@ -4,65 +4,55 @@
  */
 package ChatProgramm.model;
 
+import ChatProgramm.controller.ReceiveAdapter;
+import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
+
-import java.io.BufferedInputStream;
+import java.io.*;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-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;
-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;
 
 /**
- *
  * @author ahren
  */
-public abstract class Transmitter implements Runnable, Subscriber<Figur>, TransmitterInterface {
+public abstract class Transmitter implements Runnable {
 
     static final int timeout = 60000;
     private static final int PORT = 35000;
 
-    private static Logger lg = Logger.getLogger("netz");
+    private static Logger lg = OhmLogger.getLogger();
 
     protected Socket socket;
     protected ObjectInputStream reader;
     protected ObjectOutputStream writer;
 
-    private Figur figur;
+
     private SubmissionPublisher<Figur> figurPublisher;
     private ExecutorService eService;
-    private String receivedString;
+
+
     private ChatView view;
-    private GrafikModel model;
+    private ChatModel model;
+
     private ReceiveAdapter receiveAdapter;
 
-    public Transmitter(ChatView view, GrafikModel model, GrafikView gView)
+    public Transmitter(ChatView view, ChatModel model) {
-    {
         socket = new Socket();
         eService = null;
-      receiveAdapter = new ReceiveAdapter(view, model, gView);
+
         figurPublisher = new SubmissionPublisher<>();
+
         this.view = view;
-      addWertSubscription(receiveAdapter);
+        this.model = model;
-      figur = new Figur();
+
     }
 
-     public void addWertSubscription(Subscriber<Figur> subscriber)
+    public void addSubscription(Subscriber<Figur> subscriber) {
-    {
         figurPublisher.subscribe(subscriber);
     }
 
@@ -81,35 +71,30 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
             lg.info("Reader / Writer Initialisierung abgeschlossen");
             startempfangen();
 
-      } 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);
         }
     }
 
     /**
-   *
      * @param figur
      * @throws IOException
      */
-  @Override
     public void send(Figur figur) {
-      try
+        try {
-      {
             writer.writeObject(figur);
             writer.flush();
-      }
+        } catch (IOException ex) {
-      catch (IOException ex)
-      {
             Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
         }
         lg.info("Nachricht gesendet");
         figurPublisher.submit(figur);
     }
+
     public Figur receive() {
 
         Object receivedObject;
+        Figur figur = new Figur();
         try {
             receivedObject = reader.readObject();
 
@@ -117,21 +102,19 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
                 lg.info("Figur erhalten");
                 figur = (Figur) receivedObject;
             }
-        } catch (IOException ex) {
+        } catch (IOException | ClassNotFoundException ex) {
-            Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
+            lg.info(ex.getMessage());
-        } catch (ClassNotFoundException ex) {
-            Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
         }
 
-
         return figur;
-    }
 
+    }
 
 
     @Override
     public void run() {
         while (true) {
+            Figur figur = new Figur();
             lg.info("Warte auf Nachricht");
             figur = receive();
             if (!figur.getPunkte().isEmpty()) {
@@ -141,28 +124,7 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
     }
 
 
-    @Override
+    private void startempfangen() {
-    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(Figur 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
-    }
-
-    @Override
-    public void onComplete() {
-        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
-  private void startempfangen()
-  {
         synchronized (this) {
         }
         if (eService == null) {

src/ChatProgramm/model/TransmitterInterface.java

@@ -1,16 +0,0 @@
-/*
- * 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;
-
-/**
- *
- * @author ahren
- */
-public interface TransmitterInterface
-{
-    public void send(Figur figur);
-    public Figur receive();
-
-}

src/ChatProgramm/view/GrafikView.java

@@ -22,7 +22,7 @@ import javax.print.attribute.HashPrintRequestAttributeSet;
 import javax.print.attribute.standard.DialogTypeSelection;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
-import ChatProgramm.model.GrafikModel;
+import ChatProgramm.model.GrafikDaten;
 import ChatProgramm.util.OhmLogger;
 
 
@@ -36,7 +36,7 @@ public class GrafikView extends JComponent
   private static Dimension EINS = new Dimension(1, 1); // Dimension ist eine Klasse die width udn height hält
   private Rectangle2D.Float pixel;
   private Line2D.Float line;
-  private GrafikModel model;
+  private GrafikDaten model;
   
   private Point from = null;
   private Point to = null;
@@ -47,7 +47,7 @@ public class GrafikView extends JComponent
     line = new Line2D.Float();
   }
 
-  public void setModel(GrafikModel model)
+  public void setModel(GrafikDaten model)
   {
     this.model = model;
   }