Merge pull request #88 from jamesrcounts/master

Turtle Sounds

Author: lynnlangit

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

@@ -4,6 +4,7 @@
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 import org.teachingextensions.logo.utils.InterfaceUtils.MultiTurtlePainter;
 import org.teachingextensions.logo.utils.InterfaceUtils.MultiTurtleTrailPainter;
+import org.teachingextensions.logo.utils.InterfaceUtils.TurtleFrame;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Paintable;
 
 import java.util.ArrayList;
@@ -12,12 +13,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,14 +33,19 @@ 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);
     clearPainters();
     configurePainters();
   }
 
+  @Override
+  public TurtleWindow init(Turtle turtle, TurtleFrame frame) {
+    return this;
+  }
+
   @Override
   protected Paintable createTurtleTrailPainter() {
     this.setTrailPainter(new MultiTurtleTrailPainter(this.turtles));

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

@@ -2,134 +2,202 @@
 
 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.event.MouseListener;
+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
-{
-  private JFrame              frame;
-  public ArrayList<Paintable> additional = new ArrayList<>();
-  public ProgramWindow(String title)
-  {
+public class ProgramWindow {
+  private final LazyCanvas canvas = new LazyCanvas();
+  private JFrame frame;
+
+  public ProgramWindow(String title) {
     this();
-    frame = new JFrame(title);
-    getFrame().getContentPane().add(this);
+    this.frame = new JFrame(title);
+    this.canvas.addTo(this.frame);
     ProgramWindow.createStandardFrame(getFrame());
   }
+
+  public ProgramWindow() {
+    this.canvas.setPreferredSize(new Dimension(627, 442));
+    setColor(PenColors.Whites.White);
+  }
+
+  public static void createStandardFrame(JFrame frame) {
+    WindowUtils.testFrame(frame, new VirtualProctorWeb(), new FrameCloser());
+  }
+
+
   /**
    * 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)
-  {
-    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)
-  {
-    super.paint(g);
-    Graphics2D g2d = configureGraphics2D(g);
-    for (Paintable p : additional)
-    {
-      p.paint(g2d, this);
-    }
-    g2d.dispose();
-  }
-  public void setColor(Color backgroundColor)
-  {
-    setBackground(backgroundColor);
+  public void addButton(JButton button) {
+    this.canvas.add(button);
   }
-  public void addPaintable(Paintable additional)
-  {
-    this.additional.add(additional);
-    repaint();
+
+
+  public void setColor(Color backgroundColor) {
+    this.canvas.setBackground(backgroundColor);
   }
-  public void removePaintable()
-  {
-    additional.clear();
-    repaint();
+
+  public ProgramWindow clearWindow() {
+    this.canvas.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)
-  {
-    addMouseListener(new RightClickMouseAdapter(listener));
+  public void addMouseRightClickListener(MouseRightClickListener listener) {
+    this.canvas.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)
-  {
-    addMouseListener(new LeftClickMouseAdapter(listener));
+  public void addMouseLeftClickListener(MouseLeftClickListener listener) {
+    this.canvas.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 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 void setBackgroundImage(String url) {
+    add(new ImageBackground(url));
+  }
+
+  public JFrame getFrame() {
     return frame;
   }
-  public void setWindowVisible(boolean b)
-  {
+
+  public void setWindowVisible(boolean b) {
     this.frame.setVisible(b);
-    this.setVisible(b);
+    this.canvas.getValue().setVisible(b);
+  }
+
+  @Deprecated
+  public ProgramWindow add(Paintable painter) {
+    this.canvas.getValue().add(painter);
+    return this;
+  }
+
+  @Deprecated
+  public ProgramWindow remove(Paintable painter) {
+    this.canvas.getValue().remove(painter);
+    return this;
+  }
+
+
+  public final BufferedImage getWindowImage() {
+    return ComponentApprovalWriter.drawComponent(this.canvas.getValue());
+  }
+
+  public ProgramWindow addTo(TurtleFrame frame) {
+    frame.addContent(this.canvas.getValue());
+    return this;
+  }
+
+  public ProgramWindow repaint() {
+    this.canvas.getValue().repaint();
+    return this;
+  }
+
+  public ProgramWindow setVisible(boolean visible) {
+    this.canvas.getValue().setVisible(visible);
+    return this;
+  }
+
+  public ProgramWindow setCursor(int cursor) {
+    this.setCursor(Cursor.getPredefinedCursor(cursor));
+    return this;
+  }
+
+  public ProgramWindow setCursor(Cursor predefinedCursor) {
+    this.canvas.getValue().setCursor(predefinedCursor);
+    return this;
+  }
+
+  public ProgramWindow setBackground(Color color) {
+    this.canvas.setBackground(color);
+    return this;
+  }
+
+  public CanvasPanel getCanvas() {
+    return this.canvas.getValue();
+  }
+
+  private class LazyCanvas {
+    private CanvasPanel panel;
+
+    public LazyCanvas addTo(JFrame frame) {
+      frame.getContentPane().add(this.getValue());
+      return this;
+    }
+
+    public CanvasPanel getValue() {
+      if (this.panel == null){
+        this.panel = new CanvasPanel();
+      }
+
+      return panel;
+    }
+
+    public LazyCanvas setPreferredSize(Dimension dimension) {
+      this.getValue().setPreferredSize(dimension);
+      return this;
+    }
+
+    public LazyCanvas add(JButton button) {
+      this.getValue().add(button);
+      return this;
+    }
+
+    public LazyCanvas setBackground(Color color) {
+      this.getValue().setBackground(color);
+      return this;
+    }
+
+    public LazyCanvas clear() {
+      this.getValue().clear();
+      return this;
+    }
+
+    public LazyCanvas addMouseListener(MouseListener adapter) {
+      this.getValue().addMouseListener(adapter);
+      return this;
+    }
   }
 }
+