scheinbar kacke kopiert

nbproject/build-impl.xml

@@ -1067,6 +1067,15 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.Aufgabe9_mvcGrafik}" name="call.subproject"/>
+            <param location="${project.Aufgabe9_mvcGrafik}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+            <param name="transfer.do.jlink" value="false"/>
+        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1738,6 +1747,15 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.Aufgabe9_mvcGrafik}" name="call.subproject"/>
+            <param location="${project.Aufgabe9_mvcGrafik}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+            <param name="transfer.do.jlink" value="false"/>
+        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=126b3ece
+build.xml.data.CRC32=d624b1fd
 build.xml.script.CRC32=1a88b66a
 build.xml.stylesheet.CRC32=f85dc8f2@1.108.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=126b3ece
-nbproject/build-impl.xml.script.CRC32=fdc076e6
+nbproject/build-impl.xml.data.CRC32=d624b1fd
+nbproject/build-impl.xml.script.CRC32=476a1ac9
 nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.108.0.48

nbproject/project.properties

@@ -37,7 +37,8 @@ endorsed.classpath=
 excludes=
 includes=**
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${reference.Aufgabe9_mvcGrafik.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -78,6 +79,8 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
 platform.active=default_platform
+project.Aufgabe9_mvcGrafik=../../T9_mvcGrafik/Aufgabe9_mvcGrafik
+reference.Aufgabe9_mvcGrafik.jar=${project.Aufgabe9_mvcGrafik}/dist/Aufgabe9_mvcGrafik.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

nbproject/project.xml

@@ -11,6 +11,15 @@
                 <root id="test.src.dir"/>
             </test-roots>
         </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>Aufgabe9_mvcGrafik</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>

src/ChatProgramm/Start.java

@@ -6,8 +6,10 @@
 package ChatProgramm;
 
 import ChatProgramm.controller.CommandController;
-import ChatProgramm.model.ChatModel;
+import ChatProgramm.controller.GrafikController;
+import ChatProgramm.model.GrafikModel;
 import ChatProgramm.view.ChatView;
+import ChatProgramm.view.GrafikView;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
@@ -19,10 +21,13 @@ public class Start
 {
   public Start()
   {
+    GrafikModel model = new GrafikModel();
     ChatView view = new ChatView();
-    ChatModel model = new ChatModel(view);
-    view.getGvZeichenflaeche().setModel(model.getGrafikDaten());
-    CommandController controller_commands = new CommandController(view, model);
+    GrafikView zeichenflaeche = view.getGvZeichenflaeche();
+    zeichenflaeche.setModel(model);
+    GrafikController controller = new GrafikController(zeichenflaeche, model);
+    controller.registerEvents();
+    CommandController controller_commands = new CommandController(view, model, controller, zeichenflaeche);
     controller_commands.registerEvents();
     controller_commands.registerCommands();
     view.setVisible(true);

src/ChatProgramm/controller/CommandController.java

@@ -8,43 +8,43 @@ package ChatProgramm.controller;
 import ChatProgramm.controller.commands.CommandConnect;
 import ChatProgramm.controller.commands.CommandInvoker;
 import ChatProgramm.controller.commands.CommandSend;
-import ChatProgramm.model.ChatModel;
+import ChatProgramm.model.GrafikModel;
 import ChatProgramm.view.ChatView;
+import ChatProgramm.view.GrafikView;
 import java.awt.Component;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import static java.awt.event.MouseEvent.MOUSE_RELEASED;
-import java.awt.event.MouseMotionListener;
 
 /**
  *
  * @author ahren
  */
-public class CommandController extends MouseAdapter implements MouseMotionListener, ActionListener{
+public class CommandController implements ActionListener{
     
     private ChatView view;
-    private ChatModel model;
+    private GrafikModel model;
+    private GrafikView gView;
     private CommandInvoker invoker;
+    private GrafikController controller;
         
-public CommandController(ChatView view, ChatModel model){
+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); 
-        view.addMouseMotionListener(this);
-        view.addMouseListener(this);
+        //ToDo: muss auf gFrame referenzieren
+        //view.getTfNachricht().addActionListener(this);
     }
     
     public void registerCommands(){
-      invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, model));
-      
-      invoker.addCommand(view.getGvZeichenflaeche(), new CommandSend(view, model));
+        CommandSend commandSend = new CommandSend(view.getGvZeichenflaeche(), model);
+        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend, model, gView));
+        this.controller.setCommand(commandSend);
     }
 
     /**
@@ -57,20 +57,8 @@ public CommandController(ChatView view, ChatModel model){
         invoker.executeCommand(key);
 
     }
-     @Override
-     public void mouseDragged(MouseEvent evt)
-  {
-    Point p = evt.getPoint();
-    model.getGrafikDaten().addPoint(p);
-    view.getGvZeichenflaeche().drawPoint();
-  }
-    @Override
-  public void mouseReleased(MouseEvent evt)
-  {
-      model.getGrafikDaten().endShape();
-      invoker.executeCommand(view.getGvZeichenflaeche());
     
-  }
+
     
 }
 

src/ChatProgramm/controller/GrafikController.java

@@ -0,0 +1,67 @@
+/*
+ * 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.CommandSend;
+import java.awt.Point;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import ChatProgramm.model.GrafikModel;
+import ChatProgramm.view.GrafikView;
+
+/**
+ *
+ * @author le
+ */
+public class GrafikController extends MouseAdapter implements MouseMotionListener
+{
+  private GrafikView view;
+  private GrafikModel model;
+  private CommandSend commandSend;
+  
+  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.addMouseMotionListener(this);
+    view.addMouseListener(this);
+  }
+
+
+
+  @Override
+  public void mouseDragged(MouseEvent evt)
+  {
+    Point p = evt.getPoint();
+    model.addPoint(p);
+    view.drawPoint();
+  }
+
+  @Override
+  public void mouseMoved(MouseEvent e)
+  {
+  }
+  
+  @Override
+  public void mouseReleased(MouseEvent evt)
+  {
+      model.endShape();
+      if(commandSend != null){
+        commandSend.execute();   
+      }
+
+  }
+}

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -5,11 +5,9 @@
 
 package ChatProgramm.controller.commands;
 
-import ChatProgramm.model.ChatModel;
 import ChatProgramm.model.Client;
-import ChatProgramm.model.GrafikDaten;
+import ChatProgramm.model.GrafikModel;
 import ChatProgramm.model.Server;
-import ChatProgramm.model.Transmitter;
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
 import ChatProgramm.view.GrafikView;
@@ -24,29 +22,36 @@ import javax.swing.JRadioButton;
  */
 public class CommandConnect implements CommandInterface
 {
-    private JRadioButton rBtnServer;
-    private JRadioButton rBtnClient;
-    private JDialog dialogFenster;
-    private static Logger lg = OhmLogger.getLogger();
-    private ChatView view;
-    private ChatModel model;
+  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, ChatModel model)
+  public CommandConnect(ChatView view, CommandInterface value, GrafikModel model, GrafikView gView)
   {
-      rBtnServer = view.getBtnServer();
-      rBtnClient = view.getBtnClient();
-      dialogFenster = view.getjDialog1();
-      this.view = view;
-      this.model = model;
+    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 {
-              model.setTransmitterToServer();
+             commandSend.transmitterInterface =  new Server(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
           }
@@ -55,12 +60,13 @@ public class CommandConnect implements CommandInterface
       if(rBtnClient.isSelected()){
           lg.info("Client ausgewählt");
           try {
-              model.setTransmitterToClient(); 
+              commandSend.transmitterInterface =  new Client(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
 
           }
       }
+      
       dialogFenster.setVisible(false);
   }
 

src/ChatProgramm/controller/commands/CommandSend.java

@@ -5,11 +5,16 @@
 
 package ChatProgramm.controller.commands;
 
-import ChatProgramm.model.ChatModel;
+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;
 
 /**
  *
@@ -18,30 +23,44 @@ import java.util.logging.Logger;
 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;
 
-  private ChatView view;
-  private ChatModel model;
-  
-  public CommandSend(ChatView view, ChatModel model)
+  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.getGrafikDaten().getFiguren().getLast();
-    try
-    {
-        model.getTransmitter().send(aktuelleFigur);
+    lg.info("wir sind drin");
+    Figur aktuelleFigur = model.getFiguren().getLast();
+    if(transmitterInterface != null){
+        transmitterInterface.send(aktuelleFigur);
     }
-    catch(Exception NullPointerExeption)
-    {
-        lg.info("Der Transmitter ist null");
+    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()
   {
@@ -52,4 +71,15 @@ public class CommandSend implements CommandInterface
   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/model/ChatModel.java

@@ -1,49 +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 ChatProgramm.view.ChatView;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-/**
- *
- * @author ahren
- */
-public class ChatModel 
-{
-  
-  private Transmitter transmitter;
-  private static Logger lg = OhmLogger.getLogger();  
-  private GrafikDaten grafikdaten = new GrafikDaten();
-  private ChatView view;
-  
-  public ChatModel(ChatView view)
-  {
-    this.view = view;
-  }
-
-  public GrafikDaten getGrafikDaten()
-  {
-    return grafikdaten;
-  }
-
-  public void setTransmitterToClient() throws IOException
-  {
-    transmitter = new Client(view, this);
-  }
-
-  public void setTransmitterToServer()throws IOException
-  {
-    transmitter = new Server(view, this);
-  }
-
-  public Transmitter getTransmitter()
-  {
-    return transmitter;
-  }
-}

src/ChatProgramm/model/Client.java

@@ -4,9 +4,7 @@
  */
 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.*;
@@ -18,13 +16,13 @@ import java.util.logging.*;
  */
 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 {
-        super(view, model);
+    public Client(ChatView view) throws IOException {
+        super(view);
         connect();
         initIO();
     }

src/ChatProgramm/model/GrafikDaten.java

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

@@ -11,6 +11,7 @@ import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.logging.Logger;
 
+
 /**
  *
  * @author ahren
@@ -20,12 +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
@@ -35,9 +40,12 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     }
 
     public void onNext(Figur item) {
-        model.getGrafikDaten().addFigure(item);
-        view.getGvZeichenflaeche().drawFigur();
+        
         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,9 +5,7 @@
 
 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.*;
@@ -18,14 +16,9 @@ import java.util.logging.*;
  */
 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

@@ -5,11 +5,18 @@
 package ChatProgramm.model;
 
 import ChatProgramm.view.ChatView;
+import ChatProgramm.view.GrafikView;
+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;
@@ -24,7 +31,7 @@ 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;
@@ -36,18 +43,22 @@ public abstract class Transmitter implements Runnable {
     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);
+      receiveAdapter = new ReceiveAdapter(view, model, gView);
       figurPublisher = new SubmissionPublisher<>();
       this.view = view;
       addWertSubscription(receiveAdapter);
@@ -73,6 +84,7 @@ 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);
@@ -86,6 +98,7 @@ public abstract class Transmitter implements Runnable {
    * @param figur
    * @throws IOException
    */
+  @Override
     public void send(Figur figur){
       try
       {
@@ -100,41 +113,71 @@ public abstract class Transmitter implements Runnable {
         figurPublisher.submit(figur);
     }
     public Figur receive(){
-        
-        Object receivedObject;
-        try {
-            receivedObject = reader.readObject();
-            
-              if (receivedObject instanceof Figur) {
-                  lg.info("Figur erhalten");
-                  figur = (Figur) receivedObject;
-            }
-        } catch (IOException ex) {
-            Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (ClassNotFoundException ex) {
-            Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
+      Object receivedObject;
+      try {
+        receivedObject = reader.readObject();
+        if(receivedObject instanceof Figur){
+          lg.info("Figur erhalten"); 
+          figur = (Figur) receivedObject;
         }
 
-
+      } 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) {
         lg.info("Warte auf Nachricht");
-        figur = receive();
+        if(laufend) {
+          figur = receive();
           if(!figur.getPunkte().isEmpty()){
               figurPublisher.submit(figur);
           }
+        }
+        else{
+          break;
+        }
       }
     }
 
-    private void startempfangen()
+
+    @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
+    }
+
+    @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();

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;
   }
@@ -58,7 +58,7 @@ public class GrafikView extends JComponent
    * Zeichnet den aktuellen Pfad (solange die maus gedrückt gehalten wird)
    * @param p -> Der aktuelle punkt als x-y-Koordinate
    */
-  public void drawFigur()
+ public void drawFigur()
   {
     Graphics2D g2 = (Graphics2D)this.getGraphics(); // gefährlich!
 
@@ -66,8 +66,7 @@ public class GrafikView extends JComponent
 
     g2.dispose();  //SEEEEHHHHRRRR WICHTIG!!!!!!!
   }
-  
-  public void drawPoint()
+ 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.filename=ohmLog
+log.directory=../Aufgabe7_bandit
+log.filename=ohmLog
 
 # Beispiel f\u00fcr verschiedene Level f\u00fcr unterschiedliche Pakete
 # log.level.bandit.Zahlengenerator=FINE