Introduced LazyCanvas

Author: jamesrcounts

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;
@@ -40,6 +41,11 @@ public void addTurtle(Turtle turtle) {
     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

@@ -16,25 +16,26 @@
 
 import javax.swing.*;
 import java.awt.*;
+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...
  */
 public class ProgramWindow {
-  private final CanvasPanel panel = new CanvasPanel();
+  private final LazyCanvas canvas = new LazyCanvas();
   private JFrame frame;
 
   public ProgramWindow(String title) {
     this();
     this.frame = new JFrame(title);
-    this.frame.getContentPane().add(this.panel);
+    this.canvas.addTo(this.frame);
     ProgramWindow.createStandardFrame(getFrame());
   }
 
   public ProgramWindow() {
-    this.panel.setPreferredSize(new Dimension(627, 442));
+    this.canvas.setPreferredSize(new Dimension(627, 442));
     setColor(PenColors.Whites.White);
   }
 
@@ -51,17 +52,16 @@ public static void createStandardFrame(JFrame frame) {
    *     A button instance
    */
   public void addButton(JButton button) {
-    this.panel.add(button);
+    this.canvas.add(button);
   }
 
 
   public void setColor(Color backgroundColor) {
-    this.panel.setBackground(backgroundColor);
+    this.canvas.setBackground(backgroundColor);
   }
 
-  @Deprecated
   public ProgramWindow clearWindow() {
-    this.panel.clear();
+    this.canvas.clear();
     return this;
   }
 
@@ -73,7 +73,7 @@ public ProgramWindow clearWindow() {
    *     A listener instance
    */
   public void addMouseRightClickListener(MouseRightClickListener listener) {
-    this.panel.addMouseListener(new RightClickMouseAdapter(listener));
+    this.canvas.addMouseListener(new RightClickMouseAdapter(listener));
   }
 
   /**
@@ -84,7 +84,7 @@ public void addMouseRightClickListener(MouseRightClickListener listener) {
    *     A listener instance
    */
   public void addMouseLeftClickListener(MouseLeftClickListener listener) {
-    this.panel.addMouseListener(new LeftClickMouseAdapter(listener));
+    this.canvas.addMouseListener(new LeftClickMouseAdapter(listener));
   }
 
   /**
@@ -104,38 +104,38 @@ public JFrame getFrame() {
 
   public void setWindowVisible(boolean b) {
     this.frame.setVisible(b);
-    this.panel.setVisible(b);
+    this.canvas.getValue().setVisible(b);
   }
 
   @Deprecated
   public ProgramWindow add(Paintable painter) {
-    this.panel.add(painter);
+    this.canvas.getValue().add(painter);
     return this;
   }
 
   @Deprecated
   public ProgramWindow remove(Paintable painter) {
-    this.panel.remove(painter);
+    this.canvas.getValue().remove(painter);
     return this;
   }
 
 
   public final BufferedImage getWindowImage() {
-    return ComponentApprovalWriter.drawComponent(this.panel);
+    return ComponentApprovalWriter.drawComponent(this.canvas.getValue());
   }
 
   public ProgramWindow addTo(TurtleFrame frame) {
-    frame.addContent(this.panel);
+    frame.addContent(this.canvas.getValue());
     return this;
   }
 
   public ProgramWindow repaint() {
-    this.panel.repaint();
+    this.canvas.getValue().repaint();
     return this;
   }
 
   public ProgramWindow setVisible(boolean visible) {
-    this.panel.setVisible(visible);
+    this.canvas.getValue().setVisible(visible);
     return this;
   }
 
@@ -145,17 +145,59 @@ public ProgramWindow setCursor(int cursor) {
   }
 
   public ProgramWindow setCursor(Cursor predefinedCursor) {
-    this.panel.setCursor(predefinedCursor);
+    this.canvas.getValue().setCursor(predefinedCursor);
+    return this;
+  }
+
+  public ProgramWindow setBackground(Color color) {
+    this.canvas.setBackground(color);
     return this;
   }
 
   public CanvasPanel getCanvas() {
-    return this.panel;
+    return this.canvas.getValue();
   }
 
-  public ProgramWindow setBackground(Color color) {
-    this.panel.setBackground(color);
-    return this;
+  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;
+    }
   }
 }
 

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

@@ -3,6 +3,7 @@
 import org.teachingextensions.approvals.lite.util.ObjectUtils;
 import org.teachingextensions.logo.Turtle;
 import org.teachingextensions.logo.Turtle.Animals;
+import org.teachingextensions.logo.utils.InterfaceUtils.TurtleFrame;
 import org.teachingextensions.logo.utils.InterfaceUtils.TurtlePainter;
 import org.teachingextensions.logo.utils.InterfaceUtils.TurtleTrailPainter;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Paintable;
@@ -74,7 +75,7 @@ protected Paintable createTurtlePainter() {
   }
 
   protected Image loadAnimal() {
-    return ObjectUtils.loadImage(MultiTurtleWindow.class, this.animal + ".png");
+    return ObjectUtils.loadImage(TurtleWindow.class, this.animal + ".png");
   }
 
   protected Paintable getTrailPainter() {
@@ -92,5 +93,19 @@ protected Paintable getTurtlePainter() {
   protected void setTurtlePainter(Paintable turtlePainter) {
     this.turtlePainter = turtlePainter;
   }
+
+  public TurtleWindow init(Turtle turtle, TurtleFrame frame) {
+    if (this.turtle != null){
+      return this;
+    }
+
+    if (turtle.getSpeed() != Turtle.TEST_SPEED) {
+      this.addTo(frame);
+      frame.setStandardLayout();
+    }
+
+    this.setTurtle(turtle);
+    return this;
+  }
 }
 

src/main/java/org/teachingextensions/approvals/lite/writers/ComponentApprovalWriter.java

@@ -1,50 +1,52 @@
 package org.teachingextensions.approvals.lite.writers;
 
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.image.BufferedImage;
-
-import javax.swing.JFrame;
-
 import org.teachingextensions.approvals.lite.ApprovalWriter;
 
-public class ComponentApprovalWriter implements ApprovalWriter {
-    private ImageApprovalWriter image = null;
-
-    public ComponentApprovalWriter(Component c) {
-        BufferedImage image = drawComponent(c);
-        this.image = new ImageApprovalWriter(image);
-    }
-
-    public static BufferedImage drawComponent(Component c) {
-        validateComponent(c);
-        BufferedImage image = new BufferedImage(c.getWidth(), c.getHeight(), BufferedImage.TYPE_INT_ARGB);
-        Graphics g = image.createGraphics();
-        c.paint(g);
-        g.dispose();
-        return image;
-    }
-
-    private static void validateComponent(Component c) {
-        if (!c.isValid()) {
-            JFrame frame = new JFrame();
-            frame.getContentPane().add(c);
-            frame.pack();
-        }
-    }
-
-    @Override
-    public String getApprovalFilename(String base) {
-        return image.getApprovalFilename(base);
-    }
-
-    @Override
-    public String getReceivedFilename(String base) {
-        return image.getReceivedFilename(base);
-    }
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
 
-    @Override
-    public String writeReceivedFile(String filename) throws Exception {
-        return image.writeReceivedFile(filename);
+public class ComponentApprovalWriter implements ApprovalWriter {
+  private ImageApprovalWriter image = null;
+
+  public ComponentApprovalWriter(Component c) {
+    BufferedImage image = drawComponent(c);
+    this.image = new ImageApprovalWriter(image);
+  }
+
+  public static BufferedImage drawComponent(Component c) {
+    validateComponent(c);
+    BufferedImage image = new BufferedImage(c.getWidth(), c.getHeight(), BufferedImage.TYPE_INT_ARGB);
+    Graphics g = image.createGraphics();
+    c.paint(g);
+    g.dispose();
+    return image;
+  }
+
+  private static void validateComponent(Component c) {
+    if (!c.isValid()) {
+      if (c instanceof JFrame) {
+        ((JFrame) c).pack();
+      } else {
+        JFrame frame = new JFrame();
+        frame.getContentPane().add(c);
+        frame.pack();
+      }
     }
+  }
+
+  @Override
+  public String writeReceivedFile(String filename) throws Exception {
+    return image.writeReceivedFile(filename);
+  }
+
+  @Override
+  public String getReceivedFilename(String base) {
+    return image.getReceivedFilename(base);
+  }
+
+  @Override
+  public String getApprovalFilename(String base) {
+    return image.getApprovalFilename(base);
+  }
 }