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

@@ -37,6 +37,8 @@ public CommandController(ChatView view, GrafikModel model, GrafikController cont
     
     public void registerEvents(){
         view.getBtnConnect().addActionListener(this); 
+        //ToDo: muss auf gFrame referenzieren
+        //view.getTfNachricht().addActionListener(this);
     }
     
     public void registerCommands(){
@@ -56,6 +58,8 @@ public CommandController(ChatView view, GrafikModel model, GrafikController cont
 
     }
     
+
+    
 }
 
 

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -22,35 +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);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
           }
@@ -59,7 +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);
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
 

src/ChatProgramm/controller/commands/CommandSend.java

@@ -23,17 +23,14 @@ import ChatProgramm.view.GrafikView;
 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;
@@ -46,16 +43,21 @@ public class CommandSend implements CommandInterface
   @Override
   public void execute()
   {
+    lg.info("wir sind drin");
     Figur aktuelleFigur = model.getFiguren().getLast();
-    try
-    {
+    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("");
+//      }
   }
 
 
@@ -80,4 +82,4 @@ public class CommandSend implements CommandInterface
             lg.info("der transmitter kommt hier als null an");
         }
     }
-}
+}

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, 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

@@ -2,6 +2,7 @@
  * 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;
@@ -19,42 +20,107 @@ import java.util.List;
 import java.util.logging.Logger;
 import java.util.prefs.Preferences;
 import ChatProgramm.util.OhmLogger;
-
 /**
  *
  * @author le
  */
-public class GrafikModel {
+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);
+  }
 
-    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 void addFigure(Figur figur) {
-        figuren.add(figur);
-    }
-
-    public List<Point> getPunkte() {
-        return aktuelleFigur.getPunkte();
-    }
-
-    public List<Figur> getFiguren() {
-        return Collections.unmodifiableList(figuren);
-    }
+  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
@@ -39,10 +40,12 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     }
 
     public void onNext(Figur item) {
-        model.addFigure(item);
-        gView.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);
     }
 
@@ -54,4 +57,4 @@ public class ReceiveAdapter implements Subscriber<Figur> {
     public void onComplete(){
     }
 
-}
+}

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,15 +16,10 @@ 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, GrafikModel model, GrafikView gView) throws IOException {
-        super(view, model, gView);
-        connect();
-        initIO();
-  } 
- 
+  
   public void connect() throws IOException
   {
       try
@@ -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

@@ -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;
@@ -43,14 +43,18 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
     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 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;
@@ -73,13 +77,14 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
         lg.info("Initialisiere reader und writer");
         InputStream is = socket.getInputStream();
         OutputStream os = socket.getOutputStream();
-
+        
         writer = new ObjectOutputStream(os);
         writer.flush();
         reader = new ObjectInputStream(is);
-        
+
         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);
@@ -108,35 +113,43 @@ 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;
-            }
-        } 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;
+        }
       }
     }
 
@@ -147,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
     }
 
@@ -164,6 +177,7 @@ public abstract class Transmitter implements Runnable, Subscriber<Figur>, Transm
   private void startempfangen()
   {
     synchronized (this){
+    laufend = true;
     }
     if (eService == null){
         eService = Executors.newSingleThreadExecutor();

src/ChatProgramm/model/TransmitterInterface.java

@@ -4,6 +4,7 @@
  */
 package ChatProgramm.model;
 
+import ChatProgramm.model.Nachricht;
 /**
  *
  * @author ahren

src/ChatProgramm/view/GrafikView.java

@@ -30,7 +30,7 @@ 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
@@ -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!
 
@@ -75,6 +74,7 @@ public class GrafikView extends JComponent
 
     g2.dispose();  //SEEEEHHHHRRRR WICHTIG!!!!!!! 
   }
+
   
   
   /**
@@ -96,7 +96,7 @@ public class GrafikView extends JComponent
     });
   }
   
-  public void drawPath(List<Point> path, Graphics2D g2){  
+  public void drawPath(List<Point> path, Graphics2D g2){     
     from = path.getFirst();
     to = null;
     
@@ -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