From eaf6fb85d0302585c9ce1a595d61fe7cbc2320a0 Mon Sep 17 00:00:00 2001
From: Jan <>
Date: Thu, 20 Jun 2019 21:24:36 +0200
Subject: [PATCH] .

---
 Garten/src/garten/model/Gaertner.java       | 28 ++++++++---------
 Garten/src/garten/view/Fenster.java         | 35 +++------------------
 Garten/src/garten/view/FlaecheBeet.java     |  2 +-
 Garten/src/garten/view/FlaechePflanzen.java |  2 +-
 Garten/src/garten/view/FlaecheWeg.java      |  4 +--
 5 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/Garten/src/garten/model/Gaertner.java b/Garten/src/garten/model/Gaertner.java
index 41c3ad0..3df6f15 100644
--- a/Garten/src/garten/model/Gaertner.java
+++ b/Garten/src/garten/model/Gaertner.java
@@ -39,6 +39,7 @@ public class Gaertner
     this.flbeet = flbeet;
     this.fenster = fenster;
     this.flweg = flweg;
+    this.flpfl = flpfl;
     pflanzen = new ArrayList<>();
     
     
@@ -77,24 +78,21 @@ public class Gaertner
     flbeet.setBeet(randomwertex,randomwertey);
     flweg.setWeg(randomwertex,randomwertey);
     
-    pfl = new Pflanze1(100,100,3);
-    pfl2 = new Pflanze1(200,400,4);
-    meinGarten.hinzufuegenPflanze(pfl);
-    meinGarten.hinzufuegenPflanze(pfl2);
+    for (int i = 0; i<5; i++)
+    {
+      pfl = new Pflanze1(100+(i*50),100+(i*50),3);
+      meinGarten.hinzufuegenPflanze(pfl);
+    }
+ 
+    meinGarten.zeichnePflanzen();
+    //pfl = new Pflanze1(100,100,3);
+    //pfl2 = new Pflanze1(200,400,4);
     meinGarten.zeichnePflanzen();
   }
-  /*
+    /*
   public Pflanze getPflanze(int x,int y)
   {
     return meinGarten.naechstePflanze(x,y);
-  }
-  
-  public void zeichnen()
-  {
-    //meinGarten.zeichnen();
-    pfl.draw();
-    System.out.println("??");
-  }
-  
-   */
+  }*/
+
 }
diff --git a/Garten/src/garten/view/Fenster.java b/Garten/src/garten/view/Fenster.java
index 1fff5b1..8751704 100644
--- a/Garten/src/garten/view/Fenster.java
+++ b/Garten/src/garten/view/Fenster.java
@@ -5,12 +5,7 @@
  */
 package garten.view;
 
-import java.awt.BasicStroke;
-import java.awt.Container;
-import java.awt.geom.Line2D;
-import javax.swing.JButton;
 import javax.swing.JFrame;
-import javax.swing.OverlayLayout;
 
 /**
  *
@@ -18,21 +13,9 @@ import javax.swing.OverlayLayout;
  */
 public class Fenster extends JFrame
 {
-  private Line2D.Float Gerade;
-  private BasicStroke pinsel;
-  private static final float DICKE = 2f;
-  private JButton btnnl;
-  private JButton btnnr;
+
   public Fenster()
   {
-    pinsel = new BasicStroke(DICKE);
-    Gerade = new Line2D.Float();
-     btnnl = new JButton(" > ");
-    btnnr = new JButton(" < ");
-
-    Container hauptkiste = this.getContentPane();
-    hauptkiste.setLayout(new OverlayLayout(hauptkiste));
-    
 
     /*
     JPopupMenu popup = new JPopupMenu();
@@ -45,7 +28,8 @@ public class Fenster extends JFrame
     hauptkiste.add(popup);
     JPopupMenu.setDefaultLightWeightPopupEnabled(false);
     popup.setVisible(true);
-     */
+    */
+    
     this.setTitle("Garten von Paul und Jan");
     this.pack();
     this.setDefaultCloseOperation(EXIT_ON_CLOSE);
@@ -55,17 +39,6 @@ public class Fenster extends JFrame
 
   public void paintComponent()
   {
-    /*
-    g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                        RenderingHints.VALUE_ANTIALIAS_ON);
-
-
-    Gerade.setLine(200, 200, 400, 400);
-    g2.setStroke(pinsel);
-    g2.setPaint(Color.BLACK);
-    //g2.draw(Kreis);
-    g2.draw(Gerade);
-    this.repaint();
-     */
+    
   }
 }
diff --git a/Garten/src/garten/view/FlaecheBeet.java b/Garten/src/garten/view/FlaecheBeet.java
index 2fe031d..2ddbf4b 100644
--- a/Garten/src/garten/view/FlaecheBeet.java
+++ b/Garten/src/garten/view/FlaecheBeet.java
@@ -40,7 +40,7 @@ public class FlaecheBeet extends JPanel
       }
     }
   }
-  public void setBeet(int[] x, int[] y)
+  public void setBeet(int[] x, int[] y) //set = automatisch zeichnen
   {
     randomwertex = x;
     randomwertey = y;
diff --git a/Garten/src/garten/view/FlaechePflanzen.java b/Garten/src/garten/view/FlaechePflanzen.java
index ed257fb..94170b5 100644
--- a/Garten/src/garten/view/FlaechePflanzen.java
+++ b/Garten/src/garten/view/FlaechePflanzen.java
@@ -52,7 +52,7 @@ public class FlaechePflanzen extends JPanel
       }
     }
   }
-  public void setPflanzen(ArrayList<Pflanze> temppflanzen)
+  public void setPflanzen(ArrayList<Pflanze> temppflanzen) //set = automatisch zeichnen
   {
     pflanzen.addAll(0, temppflanzen);
     repaint();
diff --git a/Garten/src/garten/view/FlaecheWeg.java b/Garten/src/garten/view/FlaecheWeg.java
index cfeae62..1638ef0 100644
--- a/Garten/src/garten/view/FlaecheWeg.java
+++ b/Garten/src/garten/view/FlaecheWeg.java
@@ -44,8 +44,8 @@ public class FlaecheWeg extends JPanel
     }
   }
 
-  public void setWeg(int[] x, int[] y)
-  {
+  public void setWeg(int[] x, int[] y)//set = automatisch zeichnen
+  { 
     randomwertex = x;
     randomwertey = y;
     repaint();