TurtlePanel => TurtleWindow

Author: jamesrcounts

src/main/java/org/teachingextensions/WindowUtils/MultiTurtleWindow.java

@@ -12,12 +12,12 @@
 /**
  * Use this window when you want to put more than one turtle on the same window
  */
-public class MultiTurtleWindow extends TurtlePanel {
+public class MultiTurtleWindow extends TurtleWindow {
   private List<Turtle> turtles = new ArrayList<Turtle>();
 
   public MultiTurtleWindow() {
     super("Turtles, Turtles, Turtles!");
-    this.getWindow().setBackground(PenColors.Blues.DarkSlateBlue);
+    this.setBackground(PenColors.Blues.DarkSlateBlue);
   }
 
   /**
@@ -32,7 +32,7 @@ public void addTurtle(Turtle turtle) {
     if (turtle == null) {
       return;
     }
-    turtle.setFrame(this.getWindow().getFrame());
+    turtle.setFrame(this.getFrame());
     turtle.setPanel(this);
 
     this.turtles.add(turtle);

src/main/java/org/teachingextensions/WindowUtils/ProgramWindow.java

@@ -2,52 +2,46 @@
 
 import org.teachingextensions.approvals.lite.util.FrameCloser;
 import org.teachingextensions.approvals.lite.util.WindowUtils;
+import org.teachingextensions.approvals.lite.writers.ComponentApprovalWriter;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 import org.teachingextensions.logo.utils.EventUtils.LeftClickMouseAdapter;
 import org.teachingextensions.logo.utils.EventUtils.MouseLeftClickListener;
 import org.teachingextensions.logo.utils.EventUtils.MouseRightClickListener;
 import org.teachingextensions.logo.utils.EventUtils.RightClickMouseAdapter;
+import org.teachingextensions.logo.utils.InterfaceUtils.CanvasPanel;
+import org.teachingextensions.logo.utils.InterfaceUtils.TurtleFrame;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.ImageBackground;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Paintable;
 import org.teachingextensions.virtualproctor.VirtualProctorWeb;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.ArrayList;
+import java.awt.image.BufferedImage;
 
 /**
  * <img src="http://ftpmirror.your.org/pub/wikimedia/images/wikibooks/de/2/2c/JPanel_Add_JButton_PAGE_END.JPG" style="text-align: left" alt="A window image" height="50" width="75" > Program Window
  * allows you to change the color of the background and more...
  */
-@SuppressWarnings({"serial"})
-public class ProgramWindow extends JPanel {
-  protected final ArrayList<Paintable> painters = new ArrayList<Paintable>();
+public class ProgramWindow {
+  private final CanvasPanel panel = new CanvasPanel();
   private JFrame frame;
 
   public ProgramWindow(String title) {
     this();
     this.frame = new JFrame(title);
-    this.frame.getContentPane().add(this);
+    this.frame.getContentPane().add(this.panel);
     ProgramWindow.createStandardFrame(getFrame());
   }
 
   public ProgramWindow() {
-    setPreferredSize(new Dimension(627, 442));
+    this.panel.setPreferredSize(new Dimension(627, 442));
     setColor(PenColors.Whites.White);
   }
 
   public static void createStandardFrame(JFrame frame) {
     WindowUtils.testFrame(frame, new VirtualProctorWeb(), new FrameCloser());
   }
 
-  public static Graphics2D configureGraphics2D(Graphics g) {
-    Graphics2D g2d = (Graphics2D) g.create();
-    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
-    g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
-    g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
-    return g2d;
-  }
 
   /**
    * Adds a button instance to a window
@@ -57,30 +51,17 @@ public static Graphics2D configureGraphics2D(Graphics g) {
    *     A button instance
    */
   public void addButton(JButton button) {
-    this.add(button);
+    this.panel.add(button);
   }
 
-  @Override
-  public void paint(Graphics g) {
-    super.paint(g);
-    if (this.painters == null) {
-      return;
-    }
-
-    ArrayList<Paintable> toPaint = new ArrayList<>(this.painters);
-
-    Graphics2D g2d = configureGraphics2D(g);
-    for (Paintable p : toPaint) {
-      p.paint(g2d, this);
-    }
-  }
 
   public void setColor(Color backgroundColor) {
-    setBackground(backgroundColor);
+    this.panel.setBackground(backgroundColor);
   }
 
+  @Deprecated
   public ProgramWindow clearWindow() {
-    this.painters.clear();
+    this.panel.clear();
     return this;
   }
 
@@ -92,7 +73,7 @@ public ProgramWindow clearWindow() {
    *     A listener instance
    */
   public void addMouseRightClickListener(MouseRightClickListener listener) {
-    addMouseListener(new RightClickMouseAdapter(listener));
+    this.panel.addMouseListener(new RightClickMouseAdapter(listener));
   }
 
   /**
@@ -103,7 +84,7 @@ public void addMouseRightClickListener(MouseRightClickListener listener) {
    *     A listener instance
    */
   public void addMouseLeftClickListener(MouseLeftClickListener listener) {
-    addMouseListener(new LeftClickMouseAdapter(listener));
+    this.panel.addMouseListener(new LeftClickMouseAdapter(listener));
   }
 
   /**
@@ -123,22 +104,58 @@ public JFrame getFrame() {
 
   public void setWindowVisible(boolean b) {
     this.frame.setVisible(b);
-    this.setVisible(b);
+    this.panel.setVisible(b);
   }
 
+  @Deprecated
   public ProgramWindow add(Paintable painter) {
-    if (!this.painters.contains(painter)) {
-      this.painters.add(painter);
-    }
-
+    this.panel.add(painter);
     return this;
   }
 
+  @Deprecated
   public ProgramWindow remove(Paintable painter) {
-    if (this.painters.contains(painter)) {
-      this.painters.remove(painter);
-    }
+    this.panel.remove(painter);
+    return this;
+  }
+
+
+  public final BufferedImage getWindowImage() {
+    return ComponentApprovalWriter.drawComponent(this.panel);
+  }
+
+  public ProgramWindow addTo(TurtleFrame frame) {
+    frame.addContent(this.panel);
+    return this;
+  }
+
+  public ProgramWindow repaint() {
+    this.panel.repaint();
+    return this;
+  }
+
+  public ProgramWindow setVisible(boolean visible) {
+    this.panel.setVisible(visible);
+    return this;
+  }
+
+  public ProgramWindow setCursor(int cursor) {
+    this.setCursor(Cursor.getPredefinedCursor(cursor));
+    return this;
+  }
 
+  public ProgramWindow setCursor(Cursor predefinedCursor) {
+    this.panel.setCursor(predefinedCursor);
+    return this;
+  }
+
+  public CanvasPanel getCanvas() {
+    return this.panel;
+  }
+
+  public ProgramWindow setBackground(Color color) {
+    this.panel.setBackground(color);
     return this;
   }
 }
+

…gextensions/WindowUtils/TurtlePanel.java …extensions/WindowUtils/TurtleWindow.javasrc/main/java/org/teachingextensions/WindowUtils/TurtlePanel.java renamed to src/main/java/org/teachingextensions/WindowUtils/TurtleWindow.java src/main/java/org/teachingextensions/WindowUtils/TurtlePanel.java renamed to src/main/java/org/teachingextensions/WindowUtils/TurtleWindow.java

@@ -3,34 +3,29 @@
 import org.teachingextensions.approvals.lite.util.ObjectUtils;
 import org.teachingextensions.logo.Turtle;
 import org.teachingextensions.logo.Turtle.Animals;
-import org.teachingextensions.logo.utils.EventUtils.MouseLeftClickListener;
-import org.teachingextensions.logo.utils.EventUtils.MouseRightClickListener;
 import org.teachingextensions.logo.utils.InterfaceUtils.TurtlePainter;
 import org.teachingextensions.logo.utils.InterfaceUtils.TurtleTrailPainter;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Paintable;
 
-import javax.swing.*;
 import java.awt.*;
-import java.util.ArrayList;
 
-public class TurtlePanel {
+public class TurtleWindow extends ProgramWindow {
   protected Animals animal = Animals.Turtle;
-  protected Image        image;
-  private   Turtle       turtle;
-  private   ProgramWindow window;
-  private   Paintable    trailPainter;
-  private   Paintable    turtlePainter;
+  protected Image     image;
+  private   Turtle    turtle;
+  private   Paintable trailPainter;
+  private   Paintable turtlePainter;
 
-  public TurtlePanel() {
+  public TurtleWindow() {
     this(null, null);
   }
 
-  public TurtlePanel(String title) {
+  public TurtleWindow(String title) {
     this(title, null);
   }
 
-  public TurtlePanel(String title, Turtle turtle) {
-    this.window = new ProgramWindow(title);
+  public TurtleWindow(String title, Turtle turtle) {
+    super(title);
     this.turtle = turtle;
     this.image = loadAnimal();
     configurePainters();
@@ -56,21 +51,17 @@ public synchronized void setAnimal(Animals animal) {
     configurePainters();
   }
 
-  public void setCursor(int cursor) {
-    this.window.setCursor(Cursor.getPredefinedCursor(cursor));
-  }
-
   public void ___() {
     // blank for the DeepDive
   }
 
   protected void clearPainters() {
-    this.window.remove(this.trailPainter)
+    this.getCanvas().remove(this.trailPainter)
         .remove(this.turtlePainter);
   }
 
   protected void configurePainters() {
-    this.window.add(createTurtleTrailPainter())
+    this.getCanvas().add(createTurtleTrailPainter())
         .add(createTurtlePainter());
   }
 
@@ -82,38 +73,6 @@ protected Paintable createTurtlePainter() {
     return this.trailPainter = new TurtleTrailPainter(this.turtle);
   }
 
-  public ProgramWindow getWindow() {
-    return window;
-  }
-
-  public void setColor(Color color) {
-    this.getWindow().setColor(color);
-  }
-
-  public void addButton(JButton leftButton) {
-    this.getWindow().addButton(leftButton);
-  }
-
-  public void setBackground(Color color) {
-    this.getWindow().setBackground(color);
-  }
-
-  public void addMouseLeftClickListener(MouseLeftClickListener listener) {
-    this.getWindow().addMouseLeftClickListener(listener);
-  }
-
-  public void addMouseRightClickListener(MouseRightClickListener listener) {
-    this.getWindow().addMouseRightClickListener(listener);
-  }
-
-  public void setBackgroundImage(String picture) {
-    this.getWindow().setBackgroundImage(picture);
-  }
-
-  public ArrayList<Paintable> getAdditional() {
-    return this.window.painters;
-  }
-
   protected Image loadAnimal() {
     return ObjectUtils.loadImage(MultiTurtleWindow.class, this.animal + ".png");
   }

src/main/java/org/teachingextensions/logo/Tortoise.java

@@ -1,16 +1,16 @@
 package org.teachingextensions.logo;
 
-import java.awt.Color;
-
-import org.teachingextensions.WindowUtils.TurtlePanel;
+import org.teachingextensions.WindowUtils.TurtleWindow;
 import org.teachingextensions.logo.Turtle.Animals;
-import org.teachingextensions.logo.utils.TortoiseUtils;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Text;
 import org.teachingextensions.logo.utils.PizzaUtils.Pizza;
 import org.teachingextensions.logo.utils.PizzaUtils.Topping;
+import org.teachingextensions.logo.utils.TortoiseUtils;
 import org.teachingextensions.virtualproctor.VirtualProctor;
 
+import java.awt.*;
+
 /**
  * <img src="https://lh5.googleusercontent.com/-B3Q59gpYW8o/T4tA2k_TYUI/AAAAAAAAAjo/WiqdoXjbkb0/s65/Tortoise.png" style="text-align: left" alt="A tortoise drawing a line" >
  * The Tortoise allows you to draw lines and shapes by moving it around on the window
@@ -99,7 +99,7 @@ public static void setPenWidth(Number width)
    * <b>Example:</b> {@code  TurtlePanel panel = Tortoise.getBackgroundWindow()}
    * @return the (program) window that the Tortoise is moving on
    */
-  public static TurtlePanel getBackgroundWindow()
+  public static TurtleWindow getBackgroundWindow()
   {
     return turtle().getBackgroundWindow();
   }
@@ -263,9 +263,9 @@ public static void moveTo(int x, int y)
   {
     turtle().moveTo(x, y);
   }
-  public static TurtlePanel ___()
+  public static TurtleWindow ___()
   {
-    return new TurtlePanel();
+    return new TurtleWindow();
   }
   private Topping topping;
   /**
@@ -310,7 +310,7 @@ public static void drawShape(int sides, Color color, int length, int width)
   {
     Tortoise.show();
     Tortoise.setSpeed(7);
-    Tortoise.getBackgroundWindow().setBackground(PenColors.Yellows.Goldenrod);
+    Tortoise.getBackgroundWindow().getCanvas().setBackground(PenColors.Yellows.Goldenrod);
     new Text("TKP Java - Make Some Shapes!").setTopLeft(225, 50).addTo(Tortoise.getBackgroundWindow());
     for (int i = 0; i < sides; i++)
     {