bzw jetzt ist auch der Transmitter kein Subscriber mehr, warum war

der das eh überhaupt?

nbproject/build-impl.xml

@@ -1067,15 +1067,6 @@ 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">
@@ -1747,15 +1738,6 @@ 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=d624b1fd
+build.xml.data.CRC32=126b3ece
 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=d624b1fd
+nbproject/build-impl.xml.data.CRC32=126b3ece
-nbproject/build-impl.xml.script.CRC32=476a1ac9
+nbproject/build-impl.xml.script.CRC32=fdc076e6
 nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.108.0.48

nbproject/project.properties

@@ -37,8 +37,7 @@ 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
@@ -79,8 +78,6 @@ 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,15 +11,6 @@
                 <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,10 +6,8 @@
 package ChatProgramm;
 
 import ChatProgramm.controller.CommandController;
-import ChatProgramm.controller.GrafikController;
+import ChatProgramm.model.ChatModel;
-import ChatProgramm.model.GrafikModel;
 import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
@@ -21,13 +19,10 @@ public class Start
 {
   public Start()
   {
-    GrafikModel model = new GrafikModel();
     ChatView view = new ChatView();
-    GrafikView zeichenflaeche = view.getGvZeichenflaeche();
+    ChatModel model = new ChatModel(view);
-    zeichenflaeche.setModel(model);
+    view.getGvZeichenflaeche().setModel(model.getGrafikDaten());
-    GrafikController controller = new GrafikController(zeichenflaeche, model);
+    CommandController controller_commands = new CommandController(view, model);
-    controller.registerEvents();
-    CommandController controller_commands = new CommandController(view);
     controller_commands.registerEvents();
     controller_commands.registerCommands();
     view.setVisible(true);

src/ChatProgramm/controller/CommandController.java

@@ -8,37 +8,45 @@ package ChatProgramm.controller;
 import ChatProgramm.controller.commands.CommandConnect;
 import ChatProgramm.controller.commands.CommandInvoker;
 import ChatProgramm.controller.commands.CommandSend;
+import ChatProgramm.model.ChatModel;
 import ChatProgramm.view.ChatView;
 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 implements ActionListener{
+public class CommandController extends MouseAdapter implements MouseMotionListener, ActionListener{
     
     private ChatView view;
+    private ChatModel model;
     private CommandInvoker invoker;
         
-    public CommandController(ChatView view){
+public CommandController(ChatView view, ChatModel model){
         this.view = view;
+        this.model = model;
         this.invoker = new CommandInvoker();
     }
     
     public void registerEvents(){
-        view.getBtnConnect().addActionListener(this); 
+        view.getBtnConnect().addActionListener(this);
-        //ToDo: muss auf gFrame referenzieren
+        view.addMouseMotionListener(this);
-        //view.getTfNachricht().addActionListener(this);
+        view.addMouseListener(this);
     }
     
     public void registerCommands(){
-        CommandSend commandSend = new CommandSend(view);
+      invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, model));
-        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend));
+      
-        //invoker.addCommand(view.getTfNachricht(), commandSend);
+      invoker.addCommand(view.getGvZeichenflaeche(), new CommandSend(view, model));
     }
-
+     
     /**
      * Ausführen des jeweiligen Kommandos
      * @param e Referenz auf das Event
@@ -47,10 +55,22 @@ public class CommandController implements ActionListener{
     public void actionPerformed(ActionEvent e) {
         Component key = (Component)e.getSource();
         invoker.executeCommand(key);
-//        if(key == view.getBtnOpen()|| key==view.getMiOpen())
+
-//          invoker.deleteStack();
-//        }
     }
+     @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

@@ -1,70 +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 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;
-import java.awt.Component;
-
-/**
- *
- * @author le
- */
-public class GrafikController extends MouseAdapter implements MouseMotionListener
-{
-  private GrafikView view;
-  private GrafikModel model;
-  private CommandInvoker invoker;
-  
-  public GrafikController(GrafikView view, GrafikModel model)
-  {
-    this.view = view;
-    this.model = model;
-  }
-  
-  public void registerEvents()
-  {
-    view.addMouseMotionListener(this);
-    view.addMouseListener(this);
-  }
-      public void registerCommands(){
-        CommandSend commandSend = new CommandSend(view);
-        invoker.addCommand(view.getTfNachricht(), commandSend);
-    }
-
-
-  @Override
-  public void mouseDragged(MouseEvent evt)
-  {
-    Point p = evt.getPoint();
-    model.addPoint(p);
-    view.drawPoint(p);
-  }
-
-  @Override
-  public void mouseMoved(MouseEvent e)
-  {
-  }
-  
-  @Override
-  public void mouseReleased(MouseEvent evt)
-  {
-      model.endShape();
-      Component key = (Component)evt.getSource();
-        invoker.executeCommand(key);
-//    if (evt.getButton() == MouseEvent.BUTTON3)
-//    {
-//      view.doPrint();
-//    }
-  }
-}

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -5,10 +5,14 @@
 
 package ChatProgramm.controller.commands;
 
+import ChatProgramm.model.ChatModel;
 import ChatProgramm.model.Client;
+import ChatProgramm.model.GrafikDaten;
 import ChatProgramm.model.Server;
+import ChatProgramm.model.Transmitter;
 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;
@@ -24,18 +28,16 @@ public class CommandConnect implements CommandInterface
     private JRadioButton rBtnClient;
     private JDialog dialogFenster;
     private static Logger lg = OhmLogger.getLogger();
-    private CommandSend commandSend;
     private ChatView view;
+    private ChatModel model;
     
-    public CommandConnect(ChatView view, CommandInterface value)
+    public CommandConnect(ChatView view, ChatModel model)
   {
       rBtnServer = view.getBtnServer();
       rBtnClient = view.getBtnClient();
       dialogFenster = view.getjDialog1();
-
-      commandSend = (CommandSend) value;
-
       this.view = view;
+      this.model = model;
   }
 
   @Override
@@ -44,7 +46,7 @@ public class CommandConnect implements CommandInterface
       if(rBtnServer.isSelected()){
           lg.info("Server ausgewählt");
           try {
-             commandSend.transmitterInterface =  new Server(view);
+              model.setTransmitterToServer();
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
           }
@@ -53,13 +55,12 @@ public class CommandConnect implements CommandInterface
       if(rBtnClient.isSelected()){
           lg.info("Client ausgewählt");
           try {
-              commandSend.transmitterInterface =  new Client(view);
+              model.setTransmitterToClient(); 
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
 
           }
       }
-      
       dialogFenster.setVisible(false);
   }
 

src/ChatProgramm/controller/commands/CommandSend.java

@@ -5,15 +5,11 @@
 
 package ChatProgramm.controller.commands;
 
-import ChatProgramm.model.Client;
+import ChatProgramm.model.ChatModel;
-import ChatProgramm.model.Server;
+import ChatProgramm.model.Figur;
-import ChatProgramm.model.TransmitterInterface;
 import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
 import java.util.logging.Logger;
-import javax.swing.JTextField;
-import ChatProgramm.model.Nachricht;
-import ChatProgramm.view.GrafikView;
 
 /**
  *
@@ -22,37 +18,30 @@ import ChatProgramm.view.GrafikView;
 public class CommandSend implements CommandInterface
 {
   private static Logger lg = OhmLogger.getLogger();
-  private JTextField eingabeFeld;
-  private String nachricht;
-  private GrafikView view;
-  public TransmitterInterface transmitterInterface;
-  public Server server;
-  public Client client;
-
-
   
-    
+  private ChatView view;
-  public CommandSend(GrafikView view)
+  private ChatModel model;
+  
+  public CommandSend(ChatView view, ChatModel model)
   {
       this.view = view;
-      //ToDo: Hier muss auch der gFrame referenziert werden
+      this.model = model;
-      //this.eingabeFeld = view.getTfNachricht();
-      transmitterInterface = null;
   }
 
   @Override
   public void execute()
   {
-      //ToDo in dieser methode muss die Figur serialisiert werden und zum 
+    Figur aktuelleFigur = model.getGrafikDaten().getFiguren().getLast();
-      //übermitteln bereitgestellt werden
+    try
-      
+    {
-//      if(transmitterInterface != null && !eingabeFeld.getText().isEmpty()){
+        model.getTransmitter().send(aktuelleFigur);
-//          transmitterInterface.send(eingabeFeld.getText());
+    }
-//          eingabeFeld.setText("");
+    catch(Exception NullPointerExeption)
-//      }
+    {
+        lg.info("Der Transmitter ist null");
+    }
   }
 
-
   @Override
   public boolean isUndoable()
   {

src/ChatProgramm/model/ChatModel.java

@@ -0,0 +1,49 @@
+/*
+ * 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,7 +4,9 @@
  */
 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.*;
@@ -16,13 +18,13 @@ import java.util.logging.*;
  */
 public class Client extends Transmitter {
 
-    private static Logger lg = Logger.getLogger("netz");
+    private static Logger lg = OhmLogger.getLogger();
     private static final int PORT = 35000; //lt. iana port > 2¹⁵
     private static final String IP = "127.0.0.1";
     
 
-    public Client(ChatView view) throws IOException {
+    public Client(ChatView view, ChatModel model) throws IOException {
-        super(view);
+        super(view, model);
         connect();
         initIO();
     }

src/ChatProgramm/model/GrafikDaten.java

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

@@ -1,121 +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 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();
-    }
-  
-    /**
-   * 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

@@ -1,31 +0,0 @@
-/*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
- */
-
-package ChatProgramm.model;
-
-/**
- *
- * @author ahren
- */
-public class Nachricht 
-{
-  private String nachricht;
-    
-  public Nachricht(String nachricht)
-  {
-    this.nachricht = nachricht;
-  }
-
-  /**
-   * @return the nachricht
-   */
-  public String getNachricht() {
-    return nachricht;
-  }
-
-  public void setNachricht(String nachricht) {
-    this.nachricht = nachricht;
-  }
-}

src/ChatProgramm/model/ReceiveAdapter.java

@@ -4,21 +4,28 @@
  */
 package ChatProgramm.model;
 
+import ChatProgramm.util.OhmLogger;
 import ChatProgramm.view.ChatView;
+import ChatProgramm.view.GrafikView;
 import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
+import java.util.logging.Logger;
 
 /**
  *
  * @author ahren
  */
-public class ReceiveAdapter implements Subscriber<Nachricht> {
+public class ReceiveAdapter implements Subscriber<Figur> {
+    
+    private static Logger lg = OhmLogger.getLogger();
 
     private ChatView view;
+    private ChatModel model;
     private Flow.Subscription subscription;
 
-    public ReceiveAdapter(ChatView view) {
+    public ReceiveAdapter(ChatView view, ChatModel model) {
         this.view = view;
+        this.model = model;
     }
 
     @Override
@@ -27,12 +34,10 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
         this.subscription.request(1);
     }
 
-    @Override
+    public void onNext(Figur item) {
-    public void onNext(Nachricht item) {
+        model.getGrafikDaten().addFigure(item);
-        
+        view.getGvZeichenflaeche().drawFigur();
-        //ToDo: hier muss der gFrame aufgerufen werden
+        lg.info("Figur wurde dem Grafikmodel hinzugefügt");
-        // evtl muss die Figur aber zuerst serialisiert werden
-        //view.getTxtChat().append(item.getNachricht());
         this.subscription.request(1);
     }
 
@@ -43,4 +48,5 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
     @Override
     public void onComplete(){
     }
+
 }

src/ChatProgramm/model/Server.java

@@ -5,7 +5,9 @@
 
 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.*;
@@ -16,10 +18,15 @@ import java.util.logging.*;
  */
 public class Server extends Transmitter
 {
-  private static Logger lg = Logger.getLogger("netz");  
+  private static Logger lg = OhmLogger.getLogger();  
   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
   {
       try
@@ -34,12 +41,5 @@ 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,13 +5,11 @@
 package ChatProgramm.model;
 
 import ChatProgramm.view.ChatView;
-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;
@@ -26,7 +24,7 @@ import java.util.logging.Logger;
  *
  * @author ahren
  */
-public abstract class Transmitter implements Runnable, Subscriber<String>, TransmitterInterface {
+public abstract class Transmitter implements Runnable {
 
     static final int timeout = 60000;
     private static final int PORT = 35000;
@@ -34,32 +32,31 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
     private static Logger lg = Logger.getLogger("netz");
 
     protected Socket socket;
-    protected BufferedReader reader;
+    protected ObjectInputStream reader;
-    protected PrintWriter writer;
+    protected ObjectOutputStream writer;
     
-    private Nachricht nachricht;
+    private Figur figur;
-    private String txtNachricht;
+    private SubmissionPublisher<Figur> figurPublisher;
-    private boolean laufend;
-    private SubmissionPublisher<Nachricht> textPublisher;
     private ExecutorService eService;
     private String receivedString;
     private ChatView view;
+    private ChatModel model;
     private ReceiveAdapter receiveAdapter;
     
-    public Transmitter(ChatView view)
+    public Transmitter(ChatView view, ChatModel model)
     {
       socket = new Socket();
       eService = null;
-      receiveAdapter = new ReceiveAdapter(view);
+      receiveAdapter = new ReceiveAdapter(view, model);
-      textPublisher = new SubmissionPublisher<>();
+      figurPublisher = new SubmissionPublisher<>();
       this.view = view;
       addWertSubscription(receiveAdapter);
-      nachricht = new Nachricht("");
+      figur = new Figur();
     }
     
-     public void addWertSubscription(Subscriber<Nachricht> subscriber)
+     public void addWertSubscription(Subscriber<Figur> subscriber)
     {
-      textPublisher.subscribe(subscriber);
+      figurPublisher.subscribe(subscriber);
     }
 
     public abstract void connect() throws IOException;
@@ -70,14 +67,12 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
         InputStream is = socket.getInputStream();
         OutputStream os = socket.getOutputStream();
 
-        InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+        writer = new ObjectOutputStream(os);
-        OutputStreamWriter osr = new OutputStreamWriter(os, "UTF-8");
+        writer.flush();
-
+        reader = new ObjectInputStream(is);
-        reader = new BufferedReader(isr);
+        
-        writer = new PrintWriter(osr);
         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,76 +81,60 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
       }
     }
     
-    public void send(String txtNachricht){
+  /**
-
+   *
-        writer.println(txtNachricht);
+   * @param figur
+   * @throws IOException
+   */
+    public void send(Figur figur){
+      try
+      {
+        writer.writeObject(figur);
         writer.flush();
+      }
+      catch (IOException ex)
+      {
+        Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
+      }
         lg.info("Nachricht gesendet");
-        nachricht.setNachricht("\nDu: " + txtNachricht);
+        figurPublisher.submit(figur);
-        textPublisher.submit(nachricht);
     }
-    public Nachricht receive(){
+    public Figur receive(){
-      try {
+        
-        txtNachricht = reader.readLine();
+        Object receivedObject;
-        if(!txtNachricht.isEmpty()){
+        try {
-          lg.info("Nachricht erhalten");
+            receivedObject = reader.readObject();
-          nachricht.setNachricht("\nEr / Sie: " + txtNachricht);
+            
-          return nachricht;
+              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);
         }
 
-      } catch (IOException e) {
+
-        throw new RuntimeException(e);
+      return figur;
-      }
-      return nachricht;
     }
     
-//    public void disconnect (){
+
-//    in.close();
-//    out.close();
-//    s.close();
-//    }
     
     @Override
     public void run() {
       while (true) {
         lg.info("Warte auf Nachricht");
-        if(laufend) {
+        figur = receive();
-          nachricht = receive();
+          if(!figur.getPunkte().isEmpty()){
-          if(!nachricht.getNachricht().isEmpty()){
+              figurPublisher.submit(figur);
-              textPublisher.submit(nachricht);
           }
-        }
-        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

@@ -1,17 +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;
-
-import ChatProgramm.model.Nachricht;
-/**
- *
- * @author ahren
- */
-public interface TransmitterInterface
-{
-    public void send(String txtNachricht);
-    public Nachricht 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;
 
 
@@ -30,13 +30,13 @@ import ChatProgramm.util.OhmLogger;
  *
  * @author le
  */
-public class GrafikView extends JComponent implements Printable
+public class GrafikView extends JComponent
 {
   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 GrafikModel model;
+  private GrafikDaten model;
   
   private Point from = null;
   private Point to = null;
@@ -47,7 +47,7 @@ public class GrafikView extends JComponent implements Printable
     line = new Line2D.Float();
   }
 
-  public void setModel(GrafikModel model)
+  public void setModel(GrafikDaten model)
   {
     this.model = model;
   }
@@ -58,13 +58,22 @@ public class GrafikView extends JComponent implements Printable
    * Zeichnet den aktuellen Pfad (solange die maus gedrückt gehalten wird)
    * @param p -> Der aktuelle punkt als x-y-Koordinate
    */
-  public void drawPoint(Point p)
+  public void drawFigur()
+  {
+    Graphics2D g2 = (Graphics2D)this.getGraphics(); // gefährlich!
+
+    drawPath(model.getFiguren().getLast().getPunkte(),g2);
+
+    g2.dispose();  //SEEEEHHHHRRRR WICHTIG!!!!!!!
+  }
+  
+  public void drawPoint()
   {
     Graphics2D g2 = (Graphics2D)this.getGraphics(); // gefährlich!
 
     drawPath(model.getPunkte(),g2);
 
-    g2.dispose();  //SEEEEHHHHRRRR WICHTIG!!!!!!!
+    g2.dispose();  //SEEEEHHHHRRRR WICHTIG!!!!!!! 
   }
   
   
@@ -87,7 +96,7 @@ public class GrafikView extends JComponent implements Printable
     });
   }
   
-  public void drawPath(List<Point> path, Graphics2D g2){     
+  public void drawPath(List<Point> path, Graphics2D g2){  
     from = path.getFirst();
     to = null;
     
@@ -100,44 +109,4 @@ public class GrafikView extends JComponent implements Printable
            
      });
   }
-  
-  
-  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