Moved GraphicsWindow to saner location

1 files changed, 12 insertions, 16 deletions

diff --git a/ws2015/eip/blaetter/05/GraphicsWindow.java b/ws2015/eip/blaetter/05/GraphicsWindow.java
index b92fdaf..2bb652d 100644
--- a/ws2015/eip/blaetter/05/GraphicsWindow.java
+++ b/ws2015/eip/blaetter/05/GraphicsWindow.java
@@ -1,3 +1,6 @@
+package gameoflifetest;
+
+import java.awt.*;
 import java.util.ArrayList;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -9,16 +12,8 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.event.MouseEvent;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Shape;
 import java.awt.geom.RectangularShape;
 import java.awt.geom.GeneralPath;
-import java.awt.Point;
-import java.awt.Label;
-import java.awt.Font;
-import java.awt.Color;
-import java.awt.Rectangle;
 
 /**
  Eine Klasse zu pädagogischen Zwecken.
@@ -26,7 +21,7 @@ import java.awt.Rectangle;
  mittels Mausklicks, das Zeichnen einfacher
  2D Objekte (java.awt.Shape), sowie die
  Ausgabe von Texten in einer Statuszeile.
- @version 3.042
+ @version 3.043
  @author Martin Hofmann und die EiP-Teams verschiedener Jahre
  */
 
@@ -57,13 +52,15 @@ public class GraphicsWindow {
      @param height Höhe des Fensters
      */
     public GraphicsWindow(int width, int height) {
-        this.width = width;
+        this.width  = width;
         this.height = height;
-        dasFenster = new JFrame();
+        dasFenster  = new JFrame();
         dasFenster.setTitle("Grafikfenster " + ++fensterNr);
         fensterZahl++;
         dasFenster.setLocationByPlatform(true);
         dasFenster.setSize(width,height+50);
+        dasFenster.getContentPane().setPreferredSize(new Dimension(width, height+50));
+        dasFenster.pack();
         dasFenster.addWindowListener(new WindowAdapter(){
             public void windowClosing(WindowEvent e) {
                 dasFenster.dispose(); // nicht gleich alle Fenster abschiessen
@@ -74,7 +71,6 @@ public class GraphicsWindow {
         label = new Label("Statuszeile...");
         label.setFont(new Font("Helvetica", Font.PLAIN, 12));
         dasFenster.getContentPane().add(label,"North" );
-
         panel = new GraphicsWindowPanel();
         //panel.setBackground(Color.cyan);
         panel.addCommand(new SetColor(activeColor));
@@ -243,11 +239,11 @@ public class GraphicsWindow {
 
     /** Löscht das Bild */
     public void clear() {
-        Color oldActive = activeColor;
+//        Color oldActive = activeColor;
         panel.clearAll();
-        this.switchToBackgroundColor();
-        fill(new Rectangle(0,0,width,height));
-        setColor(oldActive);
+//        this.switchToBackgroundColor();
+//        fill(new Rectangle(0,0,width,height));
+//        setColor(oldActive);
     }
 
     public void killIn(int secs) {