Zwischenstand im Praktikum -> läuft schonmal so fast richtig

TransmitterInterface fressen aber sonst sollte es klappen

src/ChatProgramm/Start.java

@@ -25,11 +25,17 @@ public class Start
     ChatView view = new ChatView();
     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

@@ -58,8 +58,6 @@ public CommandController(ChatView view, GrafikModel model, GrafikController cont
 
     }
     
-
-    
 }
 
 

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -22,36 +22,36 @@ import javax.swing.JRadioButton;
  */
 public class CommandConnect implements CommandInterface
 {
-  private JRadioButton rBtnServer;
+    private JRadioButton rBtnServer;
-  private JRadioButton rBtnClient;
+    private JRadioButton rBtnClient;
-  private JDialog dialogFenster;
+    private JDialog dialogFenster;
-  private static Logger lg = OhmLogger.getLogger();
+    private static Logger lg = OhmLogger.getLogger();
-  private CommandSend commandSend;
+    private CommandSend commandSend;
-  private ChatView view;
+    private ChatView view;
-  private GrafikModel model;
+    private GrafikModel model;
-  private GrafikView gView;
+    private GrafikView gView;
     
-  public CommandConnect(ChatView view, CommandInterface value, GrafikModel model, GrafikView gView)
+    public CommandConnect(ChatView view, CommandInterface value, GrafikModel model, GrafikView gView)
   {
-    rBtnServer = view.getBtnServer();
+      rBtnServer = view.getBtnServer();
-    rBtnClient = view.getBtnClient();
+      rBtnClient = view.getBtnClient();
-    dialogFenster = view.getjDialog1();
+      dialogFenster = view.getjDialog1();
 
-    commandSend = (CommandSend) value;
+      commandSend = (CommandSend) value;
 
-    this.view = view;
+      this.view = view;
-    this.model = model;
+      this.model = model;
-    this.gView = gView;
+      this.gView = gView;
   }
 
-
   @Override
   public void execute()
   {
       if(rBtnServer.isSelected()){
           lg.info("Server ausgewählt");
           try {
-             commandSend.transmitterInterface =  new Server(view);
+              commandSend.setTransmitter(new Server(view, model, gView));
+             //commandSend.transmitterInterface =  new Server(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
           }
@@ -60,7 +60,8 @@ public class CommandConnect implements CommandInterface
       if(rBtnClient.isSelected()){
           lg.info("Client ausgewählt");
           try {
-              commandSend.transmitterInterface =  new Client(view);
+              commandSend.setTransmitter(new Client(view, model, gView));
+              //commandSend.transmitterInterface =  new Client(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
 

src/ChatProgramm/controller/commands/CommandSend.java

@@ -14,6 +14,7 @@ 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;
 
 /**
@@ -31,6 +32,9 @@ public class CommandSend implements CommandInterface
   public Server server;
   public Client client;
 
+
+  
+    
   public CommandSend(GrafikView view, GrafikModel model)
   {
       this.view = view;
@@ -82,4 +86,4 @@ public class CommandSend implements CommandInterface
             lg.info("der transmitter kommt hier als null an");
         }
     }
-}
+}

src/ChatProgramm/model/Client.java

@@ -5,6 +5,7 @@
 package ChatProgramm.model;
 
 import ChatProgramm.view.ChatView;
+import ChatProgramm.view.GrafikView;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.logging.*;
@@ -21,8 +22,8 @@ public class Client extends Transmitter {
     private static final String IP = "127.0.0.1";
     
 
-    public Client(ChatView view) throws IOException {
+    public Client(ChatView view, GrafikModel model, GrafikView gView) throws IOException {
-        super(view);
+        super(view, model, gView);
         connect();
         initIO();
     }

src/ChatProgramm/model/GrafikModel.java

@@ -96,11 +96,11 @@ public class GrafikModel
         figuren.add(aktuelleFigur);
         aktuelleFigur = new Figur();
     }
+    
     public void setFigur(Figur figur){
         aktuelleFigur = figur;
         figuren.add(figur);
     }
-
   
     /**
    * Bestimmt die Adresse des zuletzt besuchten Ordners

src/ChatProgramm/model/ReceiveAdapter.java

@@ -11,7 +11,6 @@ import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.logging.Logger;
 
-
 /**
  *
  * @author ahren
@@ -43,7 +42,7 @@ public class ReceiveAdapter implements Subscriber<Figur> {
         
         lg.info("Figur wurde dem Grafikmodel hinzugefügt");
         model.setFigur(item);
-        gView.drawFigur();
+        gView.drawPoint();
         // evtl muss die Figur aber zuerst serialisiert werden
         //view.getTxtChat().append(item.getNachricht());
         this.subscription.request(1);
@@ -57,4 +56,4 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     public void onComplete(){
     }
 
-}
+}

src/ChatProgramm/model/Server.java

@@ -6,6 +6,7 @@
 package ChatProgramm.model;
 
 import ChatProgramm.view.ChatView;
+import ChatProgramm.view.GrafikView;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.logging.*;
@@ -35,8 +36,8 @@ public class Server extends Transmitter
           lg.warning("Timeout"+"("+timeout/1000+"s)");
       }
   }
-    public Server(ChatView view) throws IOException {
+    public Server(ChatView view, GrafikModel model, GrafikView gView) throws IOException {
-        super(view);
+        super(view, model, gView);
         connect();
         initIO();
 

src/ChatProgramm/model/Transmitter.java

@@ -31,7 +31,7 @@ import java.util.logging.Logger;
  *
  * @author ahren
  */
-public abstract class Transmitter implements Runnable, Subscriber<String>, TransmitterInterface {
+public abstract class Transmitter implements Runnable, Subscriber<Figur>, TransmitterInterface {
 
     static final int timeout = 60000;
     private static final int PORT = 35000;
@@ -49,12 +49,10 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
     private ExecutorService eService;
     private String receivedString;
     private ChatView view;
-    private GrafikView gView;
     private GrafikModel model;
-
     private ReceiveAdapter receiveAdapter;
     
-    public Transmitter(ChatView view)
+    public Transmitter(ChatView view, GrafikModel model, GrafikView gView)
     {
       socket = new Socket();
       eService = null;
@@ -77,11 +75,15 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
         lg.info("Initialisiere reader und writer");
         InputStream is = socket.getInputStream();
         OutputStream os = socket.getOutputStream();
-        
+
+
+        // Bruh im ernst mann muss zuerst den writer und dann den reader initialisieren 
+        // andersrum ist das blockiert weil die Streams von hinten nach vorne gelesen werden 
         writer = new ObjectOutputStream(os);
         writer.flush();
+        
         reader = new ObjectInputStream(is);
-
+        
         lg.info("Reader / Writer Initialisierung abgeschlossen");
         startempfangen();
         lg.info("Warte auf Nachricht");
@@ -113,21 +115,23 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
         figurPublisher.submit(figur);
     }
     public Figur receive(){
-      Object receivedObject;
+        
-      try {
+        Object receivedObject;
-        receivedObject = reader.readObject();
+        try {
-        if(receivedObject instanceof Figur){
+            receivedObject = reader.readObject();
-          lg.info("Figur erhalten"); 
+            
-          figur = (Figur) receivedObject;
+              if (receivedObject instanceof Figur) {
+                  lg.info("Figur erhalten");
+                  figur = (Figur) receivedObject;
+                // Verarbeiten Sie die empfangene Figur
+            }
+        } 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);
-      }
-      catch (ClassNotFoundException ex)
-      {
-        Logger.getLogger(Transmitter.class.getName()).log(Level.SEVERE, null, ex);
-      }
       return figur;
     }
     
@@ -160,7 +164,7 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
     }
 
     @Override
-    public void onNext(String item) {
+    public void onNext(Figur item) {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
 

src/ChatProgramm/view/GrafikView.java

@@ -58,23 +58,14 @@ 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 drawFigur()
+  public void drawPoint()
-  {
-    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!!!!!!!
   }
-
   
   
   /**