Funktioniert und aufgeräumt

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);
+    
+    CommandController controller_commands = new CommandController(view, model, controller, zeichenflaeche);
     controller_commands.registerEvents();
     controller_commands.registerCommands();
+    
+    
+    
+    
     view.setVisible(true);
   }
 

src/ChatProgramm/controller/CommandController.java

@@ -8,7 +8,9 @@ package ChatProgramm.controller;
 import ChatProgramm.controller.commands.CommandConnect;
 import ChatProgramm.controller.commands.CommandInvoker;
 import ChatProgramm.controller.commands.CommandSend;
+import ChatProgramm.model.GrafikModel;
 import ChatProgramm.view.ChatView;
+import ChatProgramm.view.GrafikView;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -20,23 +22,27 @@ import java.awt.event.ActionListener;
 public class CommandController implements ActionListener{
     
     private ChatView view;
+    private GrafikModel model;
+    private GrafikView gView;
     private CommandInvoker invoker;
+    private GrafikController controller;
         
-    public CommandController(ChatView view){
+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); 
-        //ToDo: muss auf gFrame referenzieren
-        //view.getTfNachricht().addActionListener(this);
     }
     
     public void registerCommands(){
-        CommandSend commandSend = new CommandSend(view);
+        CommandSend commandSend = new CommandSend(view.getGvZeichenflaeche(), model);
-        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend));
+        invoker.addCommand(view.getBtnConnect(), new CommandConnect(view, commandSend, model, gView));
-        //invoker.addCommand(view.getTfNachricht(), commandSend);
+        this.controller.setCommand(commandSend);
     }
 
     /**
@@ -47,9 +53,7 @@ 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();
-//        }
     }
     
 }

src/ChatProgramm/controller/GrafikController.java

@@ -5,8 +5,6 @@
 
 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;
@@ -14,7 +12,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
 import ChatProgramm.model.GrafikModel;
 import ChatProgramm.view.GrafikView;
-import java.awt.Component;
 
 /**
  *
@@ -24,12 +21,17 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
 {
   private GrafikView view;
   private GrafikModel model;
-  private CommandInvoker invoker;
+  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()
@@ -37,10 +39,7 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
     view.addMouseMotionListener(this);
     view.addMouseListener(this);
   }
-      public void registerCommands(){
+
-        CommandSend commandSend = new CommandSend(view);
-        invoker.addCommand(view.getTfNachricht(), commandSend);
-    }
 
 
   @Override
@@ -48,7 +47,7 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
   {
     Point p = evt.getPoint();
     model.addPoint(p);
-    view.drawPoint(p);
+    view.drawPoint();
   }
 
   @Override
@@ -60,11 +59,9 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
   public void mouseReleased(MouseEvent evt)
   {
       model.endShape();
-      Component key = (Component)evt.getSource();
+      if(commandSend != null){
-        invoker.executeCommand(key);
+        commandSend.execute();   
-//    if (evt.getButton() == MouseEvent.BUTTON3)
+      }
-//    {
+
-//      view.doPrint();
-//    }
   }
 }

src/ChatProgramm/controller/commands/CommandConnect.java

@@ -6,9 +6,11 @@
 package ChatProgramm.controller.commands;
 
 import ChatProgramm.model.Client;
+import ChatProgramm.model.GrafikModel;
 import ChatProgramm.model.Server;
 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;
@@ -26,8 +28,10 @@ public class CommandConnect implements CommandInterface
     private static Logger lg = OhmLogger.getLogger();
     private CommandSend commandSend;
     private ChatView view;
+    private GrafikModel model;
+    private GrafikView gView;
     
-    public CommandConnect(ChatView view, CommandInterface value)
+    public CommandConnect(ChatView view, CommandInterface value, GrafikModel model, GrafikView gView)
   {
       rBtnServer = view.getBtnServer();
       rBtnClient = view.getBtnClient();
@@ -36,6 +40,8 @@ public class CommandConnect implements CommandInterface
       commandSend = (CommandSend) value;
 
       this.view = view;
+      this.model = model;
+      this.gView = gView;
   }
 
   @Override
@@ -44,7 +50,7 @@ public class CommandConnect implements CommandInterface
       if(rBtnServer.isSelected()){
           lg.info("Server ausgewählt");
           try {
-             commandSend.transmitterInterface =  new Server(view);
+              commandSend.setTransmitter(new Server(view, model, gView));
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Server ist Fehlgeschlagen");
           }
@@ -53,7 +59,7 @@ 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));
           } catch (IOException ex) {
               lg.info("Die Verbindung zum Client ist Fehlgeschlagen");
 

src/ChatProgramm/controller/commands/CommandSend.java

@@ -6,13 +6,14 @@
 package ChatProgramm.controller.commands;
 
 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.model.Nachricht;
 import ChatProgramm.view.GrafikView;
 
 /**
@@ -22,9 +23,10 @@ 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;
@@ -32,9 +34,10 @@ public class CommandSend implements CommandInterface
 
   
     
-  public CommandSend(GrafikView view)
+  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;
@@ -43,13 +46,16 @@ public class CommandSend implements CommandInterface
   @Override
   public void execute()
   {
-      //ToDo in dieser methode muss die Figur serialisiert werden und zum 
+    Figur aktuelleFigur = model.getFiguren().getLast();
-      //übermitteln bereitgestellt werden
+    try
+    {
+        transmitterInterface.send(aktuelleFigur);
         
-//      if(transmitterInterface != null && !eingabeFeld.getText().isEmpty()){
+    }
-//          transmitterInterface.send(eingabeFeld.getText());
+    catch(Exception NullPointerExeption)
-//          eingabeFeld.setText("");
+    {
-//      }
+        lg.info("Der Transmitter ist null");
+    }
   }
 
 
@@ -63,4 +69,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/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, GrafikModel model, GrafikView gView) throws IOException {
-        super(view);
+        super(view, model, gView);
         connect();
         initIO();
     }

src/ChatProgramm/model/GrafikModel.java

@@ -2,7 +2,6 @@
  * 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;
@@ -20,30 +19,32 @@ 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()
+    public GrafikModel() {
-  {
         aktuelleFigur = new Figur();
         figuren = new ArrayList<>();
     }
 
-  public void addPoint(Point p)
+    public void addPoint(Point p) {
-  {
         aktuelleFigur.addPoint(p);
     }
 
-  public List<Point> getPunkte()
+    public void addFigure(Figur figur) {
-  {
+        figuren.add(figur);
+    }
+
+    public List<Point> getPunkte() {
         return aktuelleFigur.getPunkte();
     }
 
@@ -51,71 +52,9 @@ public class GrafikModel
         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,32 @@
  */
 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 GrafikModel model;
+    private GrafikView gView;
     private Flow.Subscription subscription;
 
-    public ReceiveAdapter(ChatView view) {
+    public ReceiveAdapter(ChatView view, GrafikModel model, GrafikView gView) {
         this.view = view;
+        this.model = model;
+        this.gView = gView;
+        
+       
     }
 
     @Override
@@ -27,12 +38,11 @@ public class ReceiveAdapter implements Subscriber<Nachricht> {
         this.subscription.request(1);
     }
 
-    @Override
+    public void onNext(Figur item) {
-    public void onNext(Nachricht item) {
+        model.addFigure(item);
+        gView.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 +53,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,9 +18,14 @@ 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, GrafikModel model, GrafikView gView) throws IOException {
+        super(view, model, gView);
+        connect();
+        initIO();
+  } 
  
   public void connect() throws IOException
   {
@@ -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,10 +5,15 @@
 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;
@@ -26,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;
@@ -34,32 +39,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 GrafikModel model;
     private ReceiveAdapter receiveAdapter;
     
-    public Transmitter(ChatView view)
+    public Transmitter(ChatView view, GrafikModel model, GrafikView gView)
     {
       socket = new Socket();
       eService = null;
-      receiveAdapter = new ReceiveAdapter(view);
+      receiveAdapter = new ReceiveAdapter(view, model, gView);
-      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 +74,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,47 +88,54 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
       }
     }
     
-    public void send(String txtNachricht){
+  /**
-
+   *
-        writer.println(txtNachricht);
+   * @param figur
+   * @throws IOException
+   */
+  @Override
+    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(){
+        
+        Object receivedObject;
         try {
-        txtNachricht = reader.readLine();
+            receivedObject = reader.readObject();
-        if(!txtNachricht.isEmpty()){
+            
-          lg.info("Nachricht erhalten");
+              if (receivedObject instanceof Figur) {
-          nachricht.setNachricht("\nEr / Sie: " + txtNachricht);
+                  lg.info("Figur erhalten");
-          return nachricht;
+                  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;
           }
       }
     }
@@ -138,7 +147,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
     }
 
@@ -155,7 +164,6 @@ public abstract class Transmitter implements Runnable, Subscriber<String>, Trans
   private void startempfangen()
   {
     synchronized (this){
-    laufend = true;
     }
     if (eService == null){
         eService = Executors.newSingleThreadExecutor();

src/ChatProgramm/model/TransmitterInterface.java

@@ -4,14 +4,13 @@
  */
 package ChatProgramm.model;
 
-import ChatProgramm.model.Nachricht;
 /**
  *
  * @author ahren
  */
 public interface TransmitterInterface
 {
-    public void send(String txtNachricht);
+    public void send(Figur figur);
-    public Nachricht receive();
+    public Figur receive();
 
 }

src/ChatProgramm/view/GrafikView.java

@@ -30,7 +30,7 @@ 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
@@ -58,7 +58,16 @@ 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!
 
@@ -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