Combined TurtleWindow and ProgramWindow

Author: jamesrcounts

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

@@ -20,116 +20,125 @@
  * allows you to change the color of the background and more...
  */
 @SuppressWarnings({"serial"})
-public class ProgramWindow extends JPanel
-{
-  private JFrame              frame;
-  public ArrayList<Paintable> additional = new ArrayList<>();
-  public ProgramWindow(String title)
-  {
+public class ProgramWindow extends JPanel {
+  protected final ArrayList<Paintable> painters = new ArrayList<Paintable>();
+  private JFrame frame;
+
+  public ProgramWindow(String title) {
     this();
-    frame = new JFrame(title);
-    getFrame().getContentPane().add(this);
+    this.frame = new JFrame(title);
+    this.frame.getContentPane().add(this);
     ProgramWindow.createStandardFrame(getFrame());
   }
+
+  public ProgramWindow() {
+    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
    * <p><b>Example:</b> {@code programWindow.addButton(myButton)}</p>
    *
    * @param button
    *     A button instance
    */
-  public void addButton(JButton button)
-  {
+  public void addButton(JButton button) {
     this.add(button);
   }
-  public ProgramWindow()
-  {
-    setPreferredSize(new Dimension(627, 442));
-    setColor(PenColors.Whites.White);
-  }
-  public static void createStandardFrame(JFrame frame)
-  {
-    WindowUtils.testFrame(frame, new VirtualProctorWeb(), new FrameCloser());
-  }
+
   @Override
-  public void paint(Graphics g)
-  {
+  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 : additional)
-    {
+    for (Paintable p : toPaint) {
       p.paint(g2d, this);
     }
-    g2d.dispose();
   }
-  public void setColor(Color backgroundColor)
-  {
+
+  public void setColor(Color backgroundColor) {
     setBackground(backgroundColor);
   }
-  public void addPaintable(Paintable additional)
-  {
-    this.additional.add(additional);
-    repaint();
-  }
-  public void removePaintable()
-  {
-    additional.clear();
-    repaint();
+
+  public ProgramWindow clearWindow() {
+    this.painters.clear();
+    return this;
   }
+
   /**
    * Adds a right mouse click listener instance to a window
    * <p><b>Example:</b> {@code programWindow.addMouseRightClickListener(myRightClickListener)}</p>
    *
    * @param listener
    *     A listener instance
    */
-  public void addMouseRightClickListener(MouseRightClickListener listener)
-  {
+  public void addMouseRightClickListener(MouseRightClickListener listener) {
     addMouseListener(new RightClickMouseAdapter(listener));
   }
+
   /**
    * Adds a left mouse click listener instance to a window
    * <p><b>Example:</b> {@code programWindow.addMouseLeftClickListener(myLeftClickListener)}</p>
    *
    * @param listener
    *     A listener instance
    */
-  public void addMouseLeftClickListener(MouseLeftClickListener listener)
-  {
+  public void addMouseLeftClickListener(MouseLeftClickListener listener) {
     addMouseListener(new LeftClickMouseAdapter(listener));
   }
+
   /**
    * Adds a background image to a window
    * <p><b>Example:</b> {@code programWindow.setBackgroundImage("http://www.coolpicture.com/sunshine.jpg")}</p>
    *
    * @param url
    *     A URL path to an image
    */
-  public void setBackgroundImage(String url)
-  {
-    addPaintable(new ImageBackground(url));
+  public void setBackgroundImage(String url) {
+    add(new ImageBackground(url));
   }
-  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;
-  }
-  public void removePaintable(Paintable item)
-  {
-    this.additional.remove(item);
-    repaint();
-  }
-  public JFrame getFrame()
-  {
+
+  public JFrame getFrame() {
     return frame;
   }
-  public void setWindowVisible(boolean b)
-  {
+
+  public void setWindowVisible(boolean b) {
     this.frame.setVisible(b);
     this.setVisible(b);
   }
+
+  public ProgramWindow add(Paintable painter) {
+    if (!this.painters.contains(painter)) {
+      this.painters.add(painter);
+    }
+
+    return this;
+  }
+
+  public ProgramWindow remove(Paintable painter) {
+    if (this.painters.contains(painter)) {
+      this.painters.remove(painter);
+    }
+
+    return this;
+  }
 }

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

@@ -7,7 +7,6 @@
 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.InterfaceUtils.TurtleWindow;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Paintable;
 
 import javax.swing.*;
@@ -18,7 +17,7 @@ public class TurtlePanel {
   protected Animals animal = Animals.Turtle;
   protected Image        image;
   private   Turtle       turtle;
-  private   TurtleWindow window;
+  private   ProgramWindow window;
   private   Paintable    trailPainter;
   private   Paintable    turtlePainter;
 
@@ -31,7 +30,7 @@ public TurtlePanel(String title) {
   }
 
   public TurtlePanel(String title, Turtle turtle) {
-    this.window = new TurtleWindow(title);
+    this.window = new ProgramWindow(title);
     this.turtle = turtle;
     this.image = loadAnimal();
     configurePainters();
@@ -83,7 +82,7 @@ protected Paintable createTurtlePainter() {
     return this.trailPainter = new TurtleTrailPainter(this.turtle);
   }
 
-  public TurtleWindow getWindow() {
+  public ProgramWindow getWindow() {
     return window;
   }
 
@@ -112,7 +111,7 @@ public void setBackgroundImage(String picture) {
   }
 
   public ArrayList<Paintable> getAdditional() {
-    return this.window.additional;
+    return this.window.painters;
   }
 
   protected Image loadAnimal() {