Bisschen Menü gedöns

.gitignore

@@ -1,2 +1 @@
 /build/
-/dist/

src/mvcgrafik/Start.java

@@ -7,7 +7,6 @@ package mvcgrafik;
 
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
-import mvcgrafik.controller.CommandController;
 import mvcgrafik.controller.GrafikController;
 import mvcgrafik.model.GrafikModel;
 import mvcgrafik.view.GrafikFrame;
@@ -26,10 +25,7 @@ public class Start
     GrafikView view = frm.getgZeichenflaeche();
     view.setModel(model);
     GrafikController controller = new GrafikController(view, model);
-    CommandController controller_commands = new CommandController(frm,view, model);
     controller.registerEvents();
-    controller_commands.registerEvents();
-    controller_commands.registerCommands();
     frm.setVisible(true);
   }
 

src/mvcgrafik/controller/CommandController.java

@@ -1,66 +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 mvcgrafik.controller;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import mvcgrafik.controller.commands.CommandInvoker;
-import mvcgrafik.controller.commands.OpenCommand;
-import mvcgrafik.controller.commands.PrintCommand;
-import mvcgrafik.controller.commands.SaveCommand;
-import mvcgrafik.model.GrafikModel;
-import mvcgrafik.view.GrafikFrame;
-import mvcgrafik.view.GrafikView;
-
-/**
- *
- * @author ahren
- */
-public class CommandController implements ActionListener
-{
-  private GrafikFrame frame;
-  private GrafikView view;
-  private GrafikModel model;
-  private CommandInvoker invoker;
-    
-  public CommandController(GrafikFrame frame,GrafikView view, GrafikModel model)
-  {
-    this.frame = frame;
-    this.view = view;
-    this.model = model;
-    this.invoker = new CommandInvoker();
-  }
-
-  public void registerEvents()
-  {
-    frame.getBtnFileOpen().addActionListener(this);
-    frame.getBtnFileSave().addActionListener(this);
-    frame.getBtnPrint().addActionListener(this);
-
-  }
-  
-  public void registerCommands()
-  {
-    invoker.addCommand(frame.getBtnFileOpen(), new OpenCommand(frame, model));
-    invoker.addCommand(frame.getBtnFileSave(), new SaveCommand(frame,model));
-    invoker.addCommand(frame.getBtnPrint(), new PrintCommand(view,model));  
-
-  }
-  
-    /**
-     * Ausführen des jeweiligen Kommandos
-     * @param e Referenz auf das Event
-     */
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        Component key = (Component)e.getSource();
-        invoker.executeCommand(key);
-        if(key == frame.getBtnFileOpen()){
-          invoker.deleteStack();
-        }
-    }
-}

src/mvcgrafik/controller/GrafikController.java

@@ -50,5 +50,9 @@ public class GrafikController extends MouseAdapter implements MouseMotionListene
   public void mouseReleased(MouseEvent evt)
   {
       model.endShape();
+    if (evt.getButton() == MouseEvent.BUTTON3)
+    {
+      view.doPrint();
+    }
   }
 }

src/mvcgrafik/controller/commands/CommandInterface.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 mvcgrafik.controller.commands;
-
-/**
- *
- * @author ahren
- */
-public interface CommandInterface
-{
-  public void execute();
-  public void undo();
-  public void redo();
-  public boolean isUndoable();
-}

src/mvcgrafik/controller/commands/CommandInvoker.java

@@ -1,73 +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 mvcgrafik.controller.commands;
-
-import java.awt.Component;
-import java.util.HashMap;
-import java.util.Stack;
-
-/**
- * Dient zur Realisierung des Polymorphismus
- * für das COmmand-Design-Pattern
- * Die Commands werden in einer HashMap gespeichert
- * @author ahren
- * @see CommandInterface
- */
-public class CommandInvoker {
-    
-    private HashMap<Component, CommandInterface> commands;
-    private Stack <CommandInterface> undoStack;
-    
-    public CommandInvoker(){
-        commands = new HashMap<>();
-        undoStack = new Stack();  
-    }
-    
-    /**
-    * Fügt ein Kommando zur Kommando-"Datenbank" = HashMap hinzu
-    * @param key Quelle des Events
-    * @param value Referenz auf das zugehörige Kommando-Objekt
-    */
-    public void addCommand(Component key, CommandInterface value){
-        commands.put(key, value);
-    }
-    
-    /**
-    * Führt Kommando der Eventquelle "key" aus und legt die Referenz
-    * des Kommando in den Undo-Stack
-    * @param key Referenz auf die Eventquelle
-    */
-    public void executeCommand(Component key){
-      CommandInterface command = commands.get(key);
-      command.execute();
-      if (command.isUndoable())
-      {
-        undoStack.push(command);
-      }
-    }
-    /**
-    * Falls der Stack Elemente enthält, wird das oberste Element geholt
-    * und die Methode "undo" des Commands aufgerufen
-    */
-    public void undoCommand()
-    {
-      if (!undoStack.isEmpty())
-      {
-        undoStack.pop().undo();
-      }
-    }
-
-    /**
-     * Löscht bei Öffnen einer neuen Datei den Stack
-     */
-    public void deleteStack()
-    {
-      while(!undoStack.isEmpty())
-        undoStack.pop();
-    }
-    
-}
-

src/mvcgrafik/controller/commands/OpenCommand.java

@@ -1,78 +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 mvcgrafik.controller.commands;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JFileChooser;
-import mvcgrafik.model.GrafikModel;
-import mvcgrafik.view.GrafikFrame;
-
-
-/**
- *
- * @author ahren
- */
-public class OpenCommand implements CommandInterface
-{
-  private GrafikFrame view;
-  private GrafikModel model;
-  
-  public OpenCommand(GrafikFrame view, GrafikModel model)
-  {
-    this.view = view;
-    this.model = model;
-  }
-
-  @Override
-  public void execute() {
-    JFileChooser fc = view.getFcFileChooser();
-    String lastDirectory = model.getPref();
-    if (lastDirectory != null) {
-        fc.setCurrentDirectory(new File(lastDirectory));
-    }
-    int choice = fc.showOpenDialog(view);
-    if (choice == JFileChooser.APPROVE_OPTION)
-    {
-      File selectedFile = fc.getSelectedFile();
-      String filename = selectedFile.getAbsolutePath();
-      model.putPref("lastDirectory", selectedFile.getParent());
-
-      try
-      {
-        model.lesePunkte(filename);
-      }
-      catch (FileNotFoundException ex)
-      {
-        Logger.getLogger(OpenCommand.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      catch (ClassNotFoundException | IOException ex)
-      {
-        Logger.getLogger(OpenCommand.class.getName()).log(Level.SEVERE, null, ex);
-      }
-      view.getgZeichenflaeche().repaint();
-    }
-  }
-
-  @Override
-  public void undo() {
-      throw new UnsupportedOperationException("Not undoable."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-  }
-
-  @Override
-  public void redo() {
-      throw new UnsupportedOperationException("Not redoable."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-  }
-
-  @Override
-  public boolean isUndoable()
-  {
-    return false;
-  }
-}

src/mvcgrafik/controller/commands/PrintCommand.java

@@ -1,57 +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 mvcgrafik.controller.commands;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JFileChooser;
-import mvcgrafik.model.GrafikModel;
-import mvcgrafik.view.GrafikFrame;
-import mvcgrafik.view.GrafikView;
-
-/**
- *
- * @author ahren
- */
-public class PrintCommand implements CommandInterface
-{
-   private GrafikView view;
-    private GrafikModel model;
-    
-    public PrintCommand(GrafikView view, GrafikModel model){
-        this.view = view;
-        this.model = model;
-    }
-    
-  /**
-   * Aufrufen des File Choosers in zuletzt verwendeten Ordner, versuchen die 
-   * Tabellendatei zu speichern
-   */
-    @Override
-    public void execute() {
-        this.view.doPrint();
-    }
-    
-
-    @Override
-    public void undo() {
-        throw new UnsupportedOperationException("Not undoable."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
-    @Override
-    public void redo() {
-        throw new UnsupportedOperationException("Not redoable."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
-    @Override
-    public boolean isUndoable() {
-        return false;
-    }
-    
-}

src/mvcgrafik/controller/commands/SaveCommand.java

@@ -1,80 +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 mvcgrafik.controller.commands;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JFileChooser;
-import mvcgrafik.model.GrafikModel;
-import mvcgrafik.view.GrafikFrame;
-
-/**
- *
- * @author ahren
- */
-public class SaveCommand implements CommandInterface
-{
-   private GrafikFrame view;
-    private GrafikModel model;
-    
-    public SaveCommand(GrafikFrame view, GrafikModel model){
-        this.view = view;
-        this.model = model;
-    }
-    
-  /**
-   * Aufrufen des File Choosers in zuletzt verwendeten Ordner, versuchen die 
-   * Tabellendatei zu speichern
-   */
-    @Override
-    public void execute() {
-      JFileChooser fc = view.getFcFileChooser();
-      String lastDirectory = model.getPref();
-      if (lastDirectory != null) {
-          fc.setCurrentDirectory(new File(lastDirectory));
-      }
-      int choice = fc.showSaveDialog(view);
-      if (choice == JFileChooser.APPROVE_OPTION)
-      {
-        File selectedFile = fc.getSelectedFile();
-        String filename = selectedFile.getAbsolutePath();
-        model.putPref("lastDirectory", selectedFile.getParent());
-        
-        try
-        {
-          model.speicherePunkte(filename);
-        }
-        catch (FileNotFoundException ex)
-        {
-          Logger.getLogger(SaveCommand.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        catch (IOException ex)
-        {
-          Logger.getLogger(SaveCommand.class.getName()).log(Level.SEVERE, null, ex);
-        }
-      }
-    }
-    
-
-    @Override
-    public void undo() {
-        throw new UnsupportedOperationException("Not undoable."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
-    @Override
-    public void redo() {
-        throw new UnsupportedOperationException("Not redoable."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
-    }
-
-    @Override
-    public boolean isUndoable() {
-        return false;
-    }
-    
-}

src/mvcgrafik/model/Figur.java

@@ -1,39 +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 mvcgrafik.model;
-
-import java.awt.Point;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *
- * @author ahren
- */
-public class Figur implements Serializable
-{
-  private ArrayList<Point> punkte;
-  
-  public Figur(){
-        punkte = new ArrayList<>();
-  }
-
-  public void addPoint(Point p){
-    punkte.add(p);
-  }
-  
-  public List<Point> getPunkte()
-  {
-    return Collections.unmodifiableList(punkte);
-  }
-  
-  public void clear(){
-    punkte.clear();
-  }
-  
-}

src/mvcgrafik/model/GrafikModel.java

@@ -17,37 +17,33 @@ 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 mvcgrafik.util.OhmLogger;
 /**
  *
  * @author le
  */
 public class GrafikModel
 {
-  private Figur aktuelleFigur;
+  private ArrayList<Point> punkte;
-  private ArrayList<Figur> figuren;
+  private ArrayList<ArrayList> figuren;
-  private Preferences pref;
- private static Logger lg = OhmLogger.getLogger();
   
   public GrafikModel()
   {
-    aktuelleFigur = new Figur();
+    punkte = new ArrayList<>();
     figuren = new ArrayList<>();
   }
   
   public void addPoint(Point p)
   {
-    aktuelleFigur.addPoint(p);
+    punkte.add(p);
   }
 
   public List<Point> getPunkte()
   {
-    return aktuelleFigur.getPunkte();
+    return Collections.unmodifiableList(punkte);
   }
   
-  public List<Figur> getFiguren(){
+  public List<ArrayList> getFiguren(){
     return Collections.unmodifiableList(figuren);
   }
   
@@ -66,7 +62,7 @@ public class GrafikModel
     BufferedOutputStream bos = new BufferedOutputStream(fos);
     //Serialisierung
     ObjectOutputStream oos = new ObjectOutputStream(bos);
-    oos.writeObject(figuren);
+    oos.writeObject(punkte);
     oos.flush(); // Puffer
     oos.close();
   }
@@ -87,35 +83,16 @@ public class GrafikModel
     //eleganter
     if (daten instanceof ArrayList liste)
     {
-      figuren = liste;
+      punkte = liste;
-    }  
+    }
- 
+    
   }  
 
     public void endShape() {
-        figuren.add(aktuelleFigur);
+        figuren.add(new ArrayList<Point>(punkte));
-        aktuelleFigur = new Figur();
+        punkte.clear();
     }
   
-    /**
+  
-   * 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/mvcgrafik/view/GrafikFrame.form

@@ -2,13 +2,50 @@
 
 <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
   <NonVisualComponents>
-    <Component class="javax.swing.JFileChooser" name="FcFileChooser">
+    <Menu class="javax.swing.JMenuBar" name="jMenuBar1">
-    </Component>
+      <SubComponents>
+        <Menu class="javax.swing.JMenu" name="jMenu1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="File"/>
+          </Properties>
+          <SubComponents>
+            <MenuItem class="javax.swing.JMenuItem" name="miSave">
+              <Properties>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Ctrl+S"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="Speichern"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="miSaveActionPerformed"/>
+              </Events>
+            </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="miOpen">
+              <Properties>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Ctrl+O"/>
+                </Property>
+                <Property name="text" type="java.lang.String" value="&#xd6;ffnen"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="miOpenActionPerformed"/>
+              </Events>
+            </MenuItem>
+          </SubComponents>
+        </Menu>
+        <Menu class="javax.swing.JMenu" name="jMenu2">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="Edit"/>
+          </Properties>
+        </Menu>
+      </SubComponents>
+    </Menu>
   </NonVisualComponents>
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="3"/>
   </Properties>
   <SyntheticProperties>
+    <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
     <SyntheticProperty name="formSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-100,0,0,2,28"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="0"/>
     <SyntheticProperty name="generateSize" type="boolean" value="true"/>
@@ -35,55 +72,7 @@
         </Constraint>
       </Constraints>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-        <Property name="useNullLayout" type="boolean" value="true"/>
-      </Layout>
-    </Container>
-    <Container class="javax.swing.JToolBar" name="jToolBar1">
-      <Properties>
-        <Property name="rollover" type="boolean" value="true"/>
-      </Properties>
-      <Constraints>
-        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-          <BorderConstraints direction="First"/>
-        </Constraint>
-      </Constraints>
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
-      <SubComponents>
-        <Component class="javax.swing.JButton" name="btnFileOpen">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/mvcgrafik/view/Open24.gif"/>
-            </Property>
-            <Property name="toolTipText" type="java.lang.String" value="Open File"/>
-            <Property name="focusable" type="boolean" value="false"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btnFileSave">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/mvcgrafik/view/Save24.gif"/>
-            </Property>
-            <Property name="toolTipText" type="java.lang.String" value="Safe File"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-        <Component class="javax.swing.JButton" name="btnPrint">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/mvcgrafik/view/Print24.gif"/>
-            </Property>
-            <Property name="toolTipText" type="java.lang.String" value="Print File"/>
-            <Property name="focusable" type="boolean" value="false"/>
-            <Property name="horizontalTextPosition" type="int" value="0"/>
-            <Property name="verticalTextPosition" type="int" value="3"/>
-          </Properties>
-        </Component>
-      </SubComponents>
     </Container>
   </SubComponents>
 </Form>

src/mvcgrafik/view/GrafikFrame.java

@@ -10,30 +10,6 @@ package mvcgrafik.view;
  */
 public class GrafikFrame extends javax.swing.JFrame
 {
-
-  /**
-   * @return the FcFileChooser
-   */
-  public javax.swing.JFileChooser getFcFileChooser()
-  {
-    return FcFileChooser;
-  }
-
-  /**
-   * @return the btnFileOpen
-   */
-  public javax.swing.JButton getBtnFileOpen()
-  {
-    return btnFileOpen;
-  }
-
-  /**
-   * @return the btnFileSave
-   */
-  public javax.swing.JButton getBtnFileSave()
-  {
-    return btnFileSave;
-  }
   /**
    * @return the gZeichenflaeche
    */
@@ -59,44 +35,57 @@ public class GrafikFrame extends javax.swing.JFrame
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        FcFileChooser = new javax.swing.JFileChooser();
         gZeichenflaeche = new mvcgrafik.view.GrafikView();
-        jToolBar1 = new javax.swing.JToolBar();
+        jMenuBar1 = new javax.swing.JMenuBar();
-        btnFileOpen = new javax.swing.JButton();
+        jMenu1 = new javax.swing.JMenu();
-        btnFileSave = new javax.swing.JButton();
+        miSave = new javax.swing.JMenuItem();
-        btnPrint = new javax.swing.JButton();
+        miOpen = new javax.swing.JMenuItem();
+        jMenu2 = new javax.swing.JMenu();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+
+        gZeichenflaeche.setLayout(new java.awt.BorderLayout());
         getContentPane().add(gZeichenflaeche, java.awt.BorderLayout.CENTER);
 
-        jToolBar1.setRollover(true);
+        jMenu1.setText("File");
 
-        btnFileOpen.setIcon(new javax.swing.ImageIcon(getClass().getResource("/mvcgrafik/view/Open24.gif"))); // NOI18N
+        miSave.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_S, java.awt.event.InputEvent.CTRL_DOWN_MASK));
-        btnFileOpen.setToolTipText("Open File");
+        miSave.setText("Speichern");
-        btnFileOpen.setFocusable(false);
+        miSave.addActionListener(new java.awt.event.ActionListener() {
-        btnFileOpen.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
-        btnFileOpen.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+                miSaveActionPerformed(evt);
-        jToolBar1.add(btnFileOpen);
+            }
+        });
+        jMenu1.add(miSave);
 
-        btnFileSave.setIcon(new javax.swing.ImageIcon(getClass().getResource("/mvcgrafik/view/Save24.gif"))); // NOI18N
+        miOpen.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.event.InputEvent.CTRL_DOWN_MASK));
-        btnFileSave.setToolTipText("Safe File");
+        miOpen.setText("Öffnen");
-        btnFileSave.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        miOpen.addActionListener(new java.awt.event.ActionListener() {
-        btnFileSave.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
-        jToolBar1.add(btnFileSave);
+                miOpenActionPerformed(evt);
+            }
+        });
+        jMenu1.add(miOpen);
 
-        btnPrint.setIcon(new javax.swing.ImageIcon(getClass().getResource("/mvcgrafik/view/Print24.gif"))); // NOI18N
+        jMenuBar1.add(jMenu1);
-        btnPrint.setToolTipText("Print File");
-        btnPrint.setFocusable(false);
-        btnPrint.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnPrint.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        jToolBar1.add(btnPrint);
 
-        getContentPane().add(jToolBar1, java.awt.BorderLayout.PAGE_START);
+        jMenu2.setText("Edit");
+        jMenuBar1.add(jMenu2);
+
+        setJMenuBar(jMenuBar1);
 
         setSize(new java.awt.Dimension(540, 412));
         setLocationRelativeTo(null);
     }// </editor-fold>//GEN-END:initComponents
 
+    private void miSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_miSaveActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_miSaveActionPerformed
+
+    private void miOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_miOpenActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_miOpenActionPerformed
+
   /**
    * @param args the command line arguments
    */
@@ -147,18 +136,25 @@ public class GrafikFrame extends javax.swing.JFrame
   }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JFileChooser FcFileChooser;
-    private javax.swing.JButton btnFileOpen;
-    private javax.swing.JButton btnFileSave;
-    private javax.swing.JButton btnPrint;
     private mvcgrafik.view.GrafikView gZeichenflaeche;
-    private javax.swing.JToolBar jToolBar1;
+    private javax.swing.JMenu jMenu1;
+    private javax.swing.JMenu jMenu2;
+    private javax.swing.JMenuBar jMenuBar1;
+    private javax.swing.JMenuItem miOpen;
+    private javax.swing.JMenuItem miSave;
     // End of variables declaration//GEN-END:variables
 
     /**
-     * @return the btnPrint
+     * @return the miOpen
      */
-    public javax.swing.JButton getBtnPrint() {
+    public javax.swing.JMenuItem getMiOpen() {
-        return btnPrint;
+        return miOpen;
+    }
+
+    /**
+     * @return the miSave
+     */
+    public javax.swing.JMenuItem getMiSave() {
+        return miSave;
     }
 }

src/mvcgrafik/view/GrafikView.java

@@ -38,9 +38,6 @@ public class GrafikView extends JComponent implements Printable
   private Line2D.Float line;
   private GrafikModel model;
   
-  private Point from = null;
-  private Point to = null;
-  
   public GrafikView()
   {
     pixel = new Rectangle2D.Float();
@@ -73,7 +70,6 @@ public class GrafikView extends JComponent implements Printable
    * Jedes mal wenn die Maus los gelassen wird, wird dder aktuelle Pfad gespeichert
    * @param g 
    */
-  @Override
   public void paintComponent(Graphics g)
   {
     if (model == null) return;
@@ -83,25 +79,23 @@ public class GrafikView extends JComponent implements Printable
     
     model.getFiguren().forEach(figuren->
     {
-        drawPath(figuren.getPunkte(),g2);
+        drawPath(figuren,g2);
     });
+ 
   }
   
   public void drawPath(List<Point> path, Graphics2D g2){     
-    from = path.getFirst();
-    to = null;
     
-     path.forEach(point->
+    for(int i=0; i < path.size()-1; i++)
-     {
+    {
-         to = point;
+        Point from = path.get(i);
-         line.setLine(from,to);
+        Point to = path.get(i+1);
-         g2.draw(line);
+        
-         from = to;
+        line.setLine(from,to);
-           
+        g2.draw(line);
-     });
+    }
   }
   
-  
   public void doPrint()
   {
     HashPrintRequestAttributeSet printSet =