scheinbar kacke kopiert

src/ChatProgramm/Start.java

@@ -5,12 +5,9 @@
 
 package ChatProgramm;
 
+import ChatProgramm.controller.CommandController;
 import ChatProgramm.controller.GrafikController;
-import ChatProgramm.controller.commands.CommandConnectV2;
+import ChatProgramm.model.GrafikModel;
-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;
@@ -24,26 +21,15 @@ public class Start
 {
   public Start()
   {
-    GrafikDaten gDaten = new GrafikDaten();
+    GrafikModel model = new GrafikModel();
     ChatView view = new ChatView();
     GrafikView zeichenflaeche = view.getGvZeichenflaeche();
-    zeichenflaeche.setModel(gDaten);
+    zeichenflaeche.setModel(model);
-    
+    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

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

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -0,0 +1,83 @@
+/*
+ * 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.transmitterInterface =  new Server(view);
+          } catch (IOException ex) {
+              lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
+          }
+      }
+      
+      if(rBtnClient.isSelected()){
+          lg.info("Client ausgewählt");
+          try {
+              commandSend.transmitterInterface =  new Client(view);
+          } 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

@@ -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.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

@@ -0,0 +1,17 @@
+/*
+ * 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

@@ -0,0 +1,69 @@
+/*
+ * 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

@@ -0,0 +1,85 @@
+/*
+ * 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 JTextField eingabeFeld;
+  private String nachricht;
+  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()
+  {
+    lg.info("wir sind drin");
+    Figur aktuelleFigur = model.getFiguren().getLast();
+    if(transmitterInterface != null){
+        transmitterInterface.send(aktuelleFigur);
+    }
+    else{
+        lg.info("Der Transmitter ist immernoch null");
+    }
+      //ToDo in dieser methode muss die Figur serialisiert werden und zum 
+      //übermitteln bereitgestellt werden
+      
+//      if(transmitterInterface != null && !eingabeFeld.getText().isEmpty()){
+//          transmitterInterface.send(eingabeFeld.getText());
+//          eingabeFeld.setText("");
+//      }
+  }
+
+
+  @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

@@ -1,39 +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.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

@@ -1,79 +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;
-
-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

@@ -4,12 +4,10 @@
  */
 package ChatProgramm.model;
 
-import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-
 import java.io.IOException;
 import java.net.Socket;
-import java.util.logging.Logger;
+import java.util.logging.*;
 
 /**
  * Builder Class
@@ -18,13 +16,13 @@ import java.util.logging.Logger;
  */
 public class Client extends Transmitter {
 
-    private static Logger lg = OhmLogger.getLogger();
+    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";
     
 
-    public Client(ChatView view, ChatModel model) throws IOException {
+    public Client(ChatView view) throws IOException {
-        super(view, model);
+        super(view);
         connect();
         initIO();
     }

src/ChatProgramm/model/GrafikDaten.java

@@ -1,53 +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;
-
-import ChatProgramm.util.OhmLogger;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Logger;
-import java.util.prefs.Preferences;
-
-/**
- *
- * @author le
- */
-public class GrafikDaten {
-
-    private Figur aktuelleFigur;
-    private ArrayList<Figur> figuren;
-    private Preferences pref;
-    private static Logger lg = OhmLogger.getLogger();
-
-    public GrafikDaten() {
-        aktuelleFigur = new Figur();
-        figuren = new ArrayList<>();
-    }
-
-    public void addPoint(Point p) {
-        aktuelleFigur.addPoint(p);
-    }
-
-    public void addFigure(Figur figur) {
-        figuren.add(figur);
-    }
-
-    public List<Point> getPunkte() {
-        return aktuelleFigur.getPunkte();
-    }
-
-    public List<Figur> getFiguren() {
-        return Collections.unmodifiableList(figuren);
-    }
-
-    public void endShape() {
-        figuren.add(aktuelleFigur);
-        aktuelleFigur = new Figur();
-    }
-
-}

src/ChatProgramm/model/GrafikModel.java

@@ -0,0 +1,126 @@
+/*
+ * 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 java.awt.Point;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+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
+{
+  private Figur aktuelleFigur;
+  private ArrayList<Figur> figuren;
+  private Preferences pref;
+ private static Logger lg = OhmLogger.getLogger();
+  
+  public GrafikModel()
+  {
+    aktuelleFigur = new Figur();
+    figuren = new ArrayList<>();
+  }
+  
+  public void addPoint(Point p)
+  {
+    aktuelleFigur.addPoint(p);
+  }
+
+  public List<Point> getPunkte()
+  {
+    return aktuelleFigur.getPunkte();
+  }
+  
+  public List<Figur> getFiguren(){
+    return Collections.unmodifiableList(figuren);
+  }
+  
+  
+  /**
+   * Persistenz via Serialisierung
+   * @param dateiname
+   * @throws FileNotFoundException
+   * @throws IOException 
+   */
+  public void speicherePunkte(String dateiname) throws FileNotFoundException, IOException
+  {
+    // an Preferences denken!!
+    FileOutputStream fos = new FileOutputStream(dateiname);
+    //wichtig Puffer -> Performance
+    BufferedOutputStream bos = new BufferedOutputStream(fos);
+    //Serialisierung
+    ObjectOutputStream oos = new ObjectOutputStream(bos);
+    oos.writeObject(figuren);
+    oos.flush(); // Puffer
+    oos.close();
+  }
+  
+  public void lesePunkte(String dateiname) throws FileNotFoundException, IOException, ClassNotFoundException
+  {
+    // an Preferences denken!!
+    FileInputStream fis = new FileInputStream(dateiname);
+    //wichtig Puffer -> Performance
+    BufferedInputStream bis = new BufferedInputStream(fis);
+    //Serialisierung
+    ObjectInputStream ois = new ObjectInputStream(bis);
+    Object daten = ois.readObject(); // Achtung
+//    if (daten instanceof ArrayList)
+//    {
+//      punkte = (ArrayList<Point>)daten;
+//    }
+    //eleganter
+    if (daten instanceof ArrayList liste)
+    {
+      figuren = liste;
+    }  
+ 
+  }  
+
+    public void endShape() {
+        figuren.add(aktuelleFigur);
+        aktuelleFigur = new Figur();
+    }
+    public void setFigur(Figur figur){
+        aktuelleFigur = figur;
+        figuren.add(figur);
+    }
+
+  
+    /**
+   * Bestimmt die Adresse des zuletzt besuchten Ordners
+   * @return letzter Ordner
+   */
+  public String getPref()
+  {
+        pref = Preferences.userNodeForPackage(getClass());
+        return pref.get("lastDirectory", null);
+  }
+
+  /**
+   * Setzt die Preferenz zu dem zuletzt besuchten Ordner
+   * @param lastDirectory Bezeichner "lastDirectory"
+   * @param lastAdress Adresse des zuletzt besuchten Ordners
+   */
+  public void putPref(String lastDirectory, String lastAdress)
+  {
+    pref.put(lastDirectory, lastAdress);
+  }
+}
+
+

src/ChatProgramm/model/Nachricht.java

@@ -0,0 +1,31 @@
+/*
+ * 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/ReceiveAdapter.java

@@ -2,10 +2,8 @@
  * 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;
+package ChatProgramm.model;
 
-import ChatProgramm.model.ChatModel;
-import ChatProgramm.model.Figur;
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
 import ChatProgramm.view.GrafikView;
@@ -13,6 +11,7 @@ import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.logging.Logger;
 
+
 /**
  *
  * @author ahren
@@ -22,13 +21,16 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     private static Logger lg = OhmLogger.getLogger();
 
     private ChatView view;
-    private ChatModel model;
+    private GrafikModel model;
-    
+    private GrafikView gView;
     private Flow.Subscription subscription;
 
-    public ReceiveAdapter(ChatView view, ChatModel model) {
+    public ReceiveAdapter(ChatView view, GrafikModel model, GrafikView gView) {
         this.view = view;
         this.model = model;
+        this.gView = gView;
+        
+       
     }
 
     @Override
@@ -38,8 +40,12 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     }
 
     public void onNext(Figur item) {
-        view.getGvZeichenflaeche().drawFigur();
+        
-        lg.info("Figur auf die Zeichenfläche projiziert");
+        lg.info("Figur wurde dem Grafikmodel hinzugefügt");
+        model.setFigur(item);
+        gView.drawFigur();
+        // evtl muss die Figur aber zuerst serialisiert werden
+        //view.getTxtChat().append(item.getNachricht());
         this.subscription.request(1);
     }
 

src/ChatProgramm/model/Server.java

@@ -5,12 +5,10 @@
 
 package ChatProgramm.model;
 
-import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-
 import java.io.IOException;
 import java.net.ServerSocket;
-import java.util.logging.Logger;
+import java.util.logging.*;
 
 /**
  * Builder Class
@@ -18,14 +16,9 @@ import java.util.logging.Logger;
  */
 public class Server extends Transmitter
 {
-  private static Logger lg = OhmLogger.getLogger();  
+  private static Logger lg = Logger.getLogger("netz");  
   private static final int PORT = 35000; //lt. iana port > 2¹⁵
   
-    public Server(ChatView view, ChatModel model) throws IOException {
-        super(view, model);
-        connect();
-        initIO();
-  } 
   
   public void connect() throws IOException
   {
@@ -41,5 +34,12 @@ public class Server extends Transmitter
       {
           lg.warning("Timeout"+"("+timeout/1000+"s)");
       }
+  }
+    public Server(ChatView view) throws IOException {
+        super(view);
+        connect();
+        initIO();
+
+
   }
 }

src/ChatProgramm/model/Transmitter.java

@@ -4,55 +4,69 @@
  */
 package ChatProgramm.model;
 
-import ChatProgramm.controller.ReceiveAdapter;
-import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
-
+import ChatProgramm.view.GrafikView;
-import java.io.*;
+import java.io.BufferedInputStream;
+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 {
+public abstract class Transmitter implements Runnable, Subscriber<String>, TransmitterInterface {
 
     static final int timeout = 60000;
     private static final int PORT = 35000;
 
-    private static Logger lg = OhmLogger.getLogger();
+    private static Logger lg = Logger.getLogger("netz");
 
     protected Socket socket;
     protected ObjectInputStream reader;
     protected ObjectOutputStream writer;
     
-
+    private Figur figur;
+    private String txtNachricht;
+    private boolean laufend;
     private SubmissionPublisher<Figur> figurPublisher;
     private ExecutorService eService;
-
+    private String receivedString;
-
     private ChatView view;
-    private ChatModel model;
+    private GrafikView gView;
+    private GrafikModel model;
 
     private ReceiveAdapter receiveAdapter;
     
-    public Transmitter(ChatView view, ChatModel model) {
+    public Transmitter(ChatView view)
+    {
       socket = new Socket();
       eService = null;
-
+      receiveAdapter = new ReceiveAdapter(view, model, gView);
       figurPublisher = new SubmissionPublisher<>();
-
       this.view = view;
-        this.model = model;
+      addWertSubscription(receiveAdapter);
-
+      figur = new Figur();
     }
     
-    public void addSubscription(Subscriber<Figur> subscriber) {
+     public void addWertSubscription(Subscriber<Figur> subscriber)
+    {
       figurPublisher.subscribe(subscriber);
     }
 
@@ -70,64 +84,102 @@ public abstract class Transmitter implements Runnable {
 
         lg.info("Reader / Writer Initialisierung abgeschlossen");
         startempfangen();
+        lg.info("Warte auf Nachricht");
 
+      } 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
    */
-    public void send(Figur figur) {
+  @Override
-        try {
+    public void send(Figur figur){
+      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(){
-    public Figur receive() {
-
       Object receivedObject;
-        Figur figur = new Figur();
       try {
         receivedObject = reader.readObject();
-
+        if(receivedObject instanceof Figur){
-            if (receivedObject instanceof Figur) {
           lg.info("Figur erhalten"); 
           figur = (Figur) receivedObject;
         }
-        } catch (IOException | ClassNotFoundException ex) {
-            lg.info(ex.getMessage());
-        }
 
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+      catch (ClassNotFoundException ex)
+      {
+        Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
+      }
       return figur;
-
     }
     
+//    public void disconnect (){
+//    in.close();
+//    out.close();
+//    s.close();
+//    }
     
     @Override
     public void run() {
       while (true) {
-            Figur figur = new Figur();
         lg.info("Warte auf Nachricht");
+        if(laufend) {
           figur = receive();
-            if (!figur.getPunkte().isEmpty()) {
+          if(!figur.getPunkte().isEmpty()){
               figurPublisher.submit(figur);
           }
         }
+        else{
+          break;
+        }
+      }
     }
 
 
-    private void startempfangen() {
+    @Override
-        synchronized (this) {
+    public void onSubscribe(Flow.Subscription subscription) {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
-        if (eService == null) {
+
+    @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
+    }
+
+    @Override
+    public void onComplete() {
+        throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
+    }
+
+  private void startempfangen()
+  {
+    synchronized (this){
+    laufend = true;
+    }
+    if (eService == null){
         eService = Executors.newSingleThreadExecutor();
         eService.execute(this);
     }

src/ChatProgramm/model/TransmitterInterface.java

@@ -0,0 +1,17 @@
+/*
+ * 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(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.GrafikDaten;
+import ChatProgramm.model.GrafikModel;
 import ChatProgramm.util.OhmLogger;
 
 
@@ -30,13 +30,13 @@ import ChatProgramm.util.OhmLogger;
  *
  * @author le
  */
-public class GrafikView extends JComponent
+public class GrafikView extends JComponent implements Printable
 {
   private static Logger lg = OhmLogger.getLogger();
   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 GrafikDaten model;
+  private GrafikModel 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(GrafikDaten model)
+  public void setModel(GrafikModel model)
   {
     this.model = model;
   }
@@ -66,7 +66,6 @@ public class GrafikView extends JComponent
 
     g2.dispose();  //SEEEEHHHHRRRR WICHTIG!!!!!!!
   }
-  
  public void drawPoint()
   {
     Graphics2D g2 = (Graphics2D)this.getGraphics(); // gefährlich!
@@ -77,6 +76,7 @@ public class GrafikView extends JComponent
   }
 
   
+  
   /**
    * Hier werden alle Pfade aus dem model neu gezeichnet
    * Jedes mal wenn die Maus los gelassen wird, wird dder aktuelle Pfad gespeichert
@@ -109,4 +109,44 @@ public class GrafikView extends JComponent
            
      });
   }
+  
+  
+  public void doPrint()
+  {
+    HashPrintRequestAttributeSet printSet =
+     new HashPrintRequestAttributeSet();
+    printSet.add(DialogTypeSelection.NATIVE);
+    PrinterJob pj = PrinterJob.getPrinterJob();
+    pj.setPrintable(this);
+    //Dialog
+    if (pj.printDialog(printSet))
+    {
+      try
+      {
+        pj.print(printSet);
+      }
+      catch (Exception ex)
+      {
+        JOptionPane.showMessageDialog(this, ex.toString());
+      }
+    }
+  }
+
+  @Override
+  public int print(Graphics gp, PageFormat pf, int pageIndex) throws PrinterException
+  {
+    Graphics2D g2p = (Graphics2D)gp;
+    if (pageIndex == 0)
+    {
+      g2p.translate(pf.getImageableX(), pf.getImageableY());
+      g2p.scale(pf.getImageableWidth() / this.getWidth(),
+                pf.getImageableHeight() / this.getHeight());
+      super.print(g2p);
+      return Printable.PAGE_EXISTS;
+    }
+    else
+    {
+      return Printable.NO_SUCH_PAGE; // wichtig sonst Papiervernichtung
+    }
+  }
 }

src/config.properties

@@ -1,7 +1,7 @@
 log.level=INFO
 
-# log.directory=../Aufgabe7_bandit
+log.directory=../Aufgabe7_bandit
-# log.filename=ohmLog
+log.filename=ohmLog
 
 # Beispiel f\u00fcr verschiedene Level f\u00fcr unterschiedliche Pakete
 # log.level.bandit.Zahlengenerator=FINE