scheinbar kacke kopiert

src/ChatProgramm/Start.java

@@ -25,17 +25,11 @@ 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,6 +58,8 @@ 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 rBtnClient;
-    private JDialog dialogFenster;
-    private static Logger lg = OhmLogger.getLogger();
-    private CommandSend commandSend;
-    private ChatView view;
-    private GrafikModel model;
-    private GrafikView gView;
+  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)
+  public CommandConnect(ChatView view, CommandInterface value, GrafikModel model, GrafikView gView)
   {
-      rBtnServer = view.getBtnServer();
-      rBtnClient = view.getBtnClient();
-      dialogFenster = view.getjDialog1();
+    rBtnServer = view.getBtnServer();
+    rBtnClient = view.getBtnClient();
+    dialogFenster = view.getjDialog1();
 
-      commandSend = (CommandSend) value;
+    commandSend = (CommandSend) value;
 
-      this.view = view;
-      this.model = model;
-      this.gView = gView;
+    this.view = view;
+    this.model = model;
+    this.gView = gView;
   }
 
+
   @Override
   public void execute()
   {
       if(rBtnServer.isSelected()){
           lg.info("Server ausgewählt");
           try {
-              commandSend.setTransmitter(new Server(view, model, gView));
-             //commandSend.transmitterInterface =  new Server(view);
+             commandSend.transmitterInterface =  new Server(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
           }
@@ -60,8 +60,7 @@ public class CommandConnect implements CommandInterface
       if(rBtnClient.isSelected()){
           lg.info("Client ausgewählt");
           try {
-              commandSend.setTransmitter(new Client(view, model, gView));
-              //commandSend.transmitterInterface =  new Client(view);
+              commandSend.transmitterInterface =  new Client(view);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
 

src/ChatProgramm/controller/commands/CommandSend.java

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

src/ChatProgramm/model/Client.java

@@ -5,7 +5,6 @@
 package ChatProgramm.model;
 
 import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.logging.*;
@@ -22,8 +21,8 @@ public class Client extends Transmitter {
     private static final String IP = "127.0.0.1";
     
 
-    public Client(ChatView view, GrafikModel model, GrafikView gView) throws IOException {
-        super(view, model, gView);
+    public Client(ChatView view) throws IOException {
+        super(view);
         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,6 +11,7 @@ import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
 import java.util.logging.Logger;
 
+
 /**
  *
  * @author ahren
@@ -42,7 +43,7 @@ public class ReceiveAdapter implements Subscriber<Figur> {
         
         lg.info("Figur wurde dem Grafikmodel hinzugefügt");
         model.setFigur(item);
-        gView.drawPoint();
+        gView.drawFigur();
         // evtl muss die Figur aber zuerst serialisiert werden
         //view.getTxtChat().append(item.getNachricht());
         this.subscription.request(1);
@@ -56,4 +57,4 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     public void onComplete(){
     }
 
-}
+}

src/ChatProgramm/model/Server.java

@@ -6,7 +6,6 @@
 package ChatProgramm.model;
 
 import ChatProgramm.view.ChatView;
-import ChatProgramm.view.GrafikView;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.logging.*;
@@ -36,8 +35,8 @@ public class Server extends Transmitter
           lg.warning("Timeout"+"("+timeout/1000+"s)");
       }
   }
-    public Server(ChatView view, GrafikModel model, GrafikView gView) throws IOException {
-        super(view, model, gView);
+    public Server(ChatView view) throws IOException {
+        super(view);
         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<Figur>, TransmitterInterface {
+public abstract class Transmitter implements Runnable, Subscriber<String>, TransmitterInterface {
 
     static final int timeout = 60000;
     private static final int PORT = 35000;
@@ -49,10 +49,12 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
     private ExecutorService eService;
     private String receivedString;
     private ChatView view;
+    private GrafikView gView;
     private GrafikModel model;
+
     private ReceiveAdapter receiveAdapter;
     
-    public Transmitter(ChatView view, GrafikModel model, GrafikView gView)
+    public Transmitter(ChatView view)
     {
       socket = new Socket();
       eService = null;
@@ -75,15 +77,11 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
         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");
@@ -115,23 +113,21 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
         figurPublisher.submit(figur);
     }
     public Figur receive(){
-        
-        Object receivedObject;
-        try {
-            receivedObject = reader.readObject();
-            
-              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);
+      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;
     }
     
@@ -164,7 +160,7 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
     }
 
     @Override
-    public void onNext(Figur item) {
+    public void onNext(String item) {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
 

src/ChatProgramm/view/GrafikView.java

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