Removed duplication

Author: jamesrcounts

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

@@ -1,14 +1,11 @@
 package org.teachingextensions.WindowUtils;
 
-import org.teachingextensions.approvals.lite.util.ObjectUtils;
 import org.teachingextensions.logo.Turtle;
-import org.teachingextensions.logo.Turtle.Animals;
 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.LineAndShapeUtils.Paintable;
 
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,17 +14,10 @@
  */
 public class MultiTurtleWindow extends TurtlePanel {
   private List<Turtle> turtles = new ArrayList<Turtle>();
-  private Animals      animal  = Animals.Turtle;
-  private Paintable multiTurtlePainter;
-  private Paintable multiTurtleTrailPainter;
 
   public MultiTurtleWindow() {
     super("Turtles, Turtles, Turtles!");
-    this.image = loadAnimal();
-    this.getWindow()
-        .add(this.createTurtlePainter())
-        .add(this.createTurtleTrailPainter())
-        .setBackground(PenColors.Blues.DarkSlateBlue);
+    this.getWindow().setBackground(PenColors.Blues.DarkSlateBlue);
   }
 
   /**
@@ -46,23 +36,20 @@ public void addTurtle(Turtle turtle) {
     turtle.setPanel(this);
 
     this.turtles.add(turtle);
-    this.getWindow()
-        .remove(this.multiTurtlePainter)
-        .remove(this.multiTurtleTrailPainter)
-        .add(this.createTurtlePainter())
-        .add(this.createTurtleTrailPainter());
+    clearPainters();
+    configurePainters();
   }
 
-  private Image loadAnimal() {
-    return ObjectUtils.loadImage(MultiTurtleWindow.class, this.animal + ".png");
+  @Override
+  protected Paintable createTurtleTrailPainter() {
+    this.setTrailPainter(new MultiTurtleTrailPainter(this.turtles));
+    return this.getTrailPainter();
   }
 
-  private Paintable createTurtleTrailPainter() {
-    return this.multiTurtleTrailPainter = new MultiTurtleTrailPainter(this.turtles);
-  }
-
-  private Paintable createTurtlePainter() {
-    return this.multiTurtlePainter = new MultiTurtlePainter(this.turtles, this.getImage());
+  @Override
+  protected Paintable createTurtlePainter() {
+    this.setTurtlePainter(new MultiTurtlePainter(this.turtles, this.getImage()));
+    return this.getTurtlePainter();
   }
 
   public int getTurtleCount() {

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

@@ -1,16 +1,5 @@
 package org.teachingextensions.WindowUtils;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.util.ArrayList;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
 import org.teachingextensions.approvals.lite.util.FrameCloser;
 import org.teachingextensions.approvals.lite.util.WindowUtils;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
@@ -22,6 +11,10 @@
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Paintable;
 import org.teachingextensions.virtualproctor.VirtualProctorWeb;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
 /**
  * <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...
@@ -39,7 +32,7 @@ public ProgramWindow(String title)
     ProgramWindow.createStandardFrame(getFrame());
   }
   /**
-   * Adds a button instance to a window 
+   * Adds a button instance to a window
    * <p><b>Example:</b> {@code programWindow.addButton(myButton)}</p>
    *
    * @param button
@@ -84,7 +77,7 @@ public void removePaintable()
     repaint();
   }
   /**
-   * Adds a right mouse click listener instance to a window 
+   * Adds a right mouse click listener instance to a window
    * <p><b>Example:</b> {@code programWindow.addMouseRightClickListener(myRightClickListener)}</p>
    *
    * @param listener
@@ -95,7 +88,7 @@ public void addMouseRightClickListener(MouseRightClickListener listener)
     addMouseListener(new RightClickMouseAdapter(listener));
   }
   /**
-   * Adds a left mouse click listener instance to a window 
+   * Adds a left mouse click listener instance to a window
    * <p><b>Example:</b> {@code programWindow.addMouseLeftClickListener(myLeftClickListener)}</p>
    *
    * @param listener
@@ -106,10 +99,10 @@ public void addMouseLeftClickListener(MouseLeftClickListener listener)
     addMouseListener(new LeftClickMouseAdapter(listener));
   }
   /**
-   * Adds a background image to a window 
+   * Adds a background image to a window
    * <p><b>Example:</b> {@code programWindow.setBackgroundImage("http://www.coolpicture.com/sunshine.jpg")}</p>
    *
-   * @param URL
+   * @param url
    *     A URL path to an image
    */
   public void setBackgroundImage(String url)

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

@@ -1,5 +1,6 @@
 package org.teachingextensions.WindowUtils;
 
+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;
@@ -11,15 +12,15 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.net.URL;
 import java.util.ArrayList;
 
 public class TurtlePanel {
-  private   Turtle             turtle;
-  protected Image              image;
-  private   TurtleWindow       window;
-  private   TurtleTrailPainter trailPainter;
-  private   TurtlePainter      turtlePainter;
+  protected Animals animal = Animals.Turtle;
+  protected Image        image;
+  private   Turtle       turtle;
+  private   TurtleWindow window;
+  private   Paintable    trailPainter;
+  private   Paintable    turtlePainter;
 
   public TurtlePanel() {
     this(null, null);
@@ -31,14 +32,15 @@ public TurtlePanel(String title) {
 
   public TurtlePanel(String title, Turtle turtle) {
     this.window = new TurtleWindow(title);
-    configureWindow(turtle);
     this.turtle = turtle;
+    this.image = loadAnimal();
+    configurePainters();
   }
 
   public void setTurtle(Turtle turtle) {
-    clearWindow();
-    configureWindow(turtle);
     this.turtle = turtle;
+    clearPainters();
+    configurePainters();
   }
 
   public synchronized Image getImage() {
@@ -49,17 +51,10 @@ public synchronized Image getImage() {
   }
 
   public synchronized void setAnimal(Animals animal) {
-    String name = animal + ".png";
-    URL resource = this.getClass().getResource(name);
-    if (resource == null) {
-      resource = this.getClass().getClassLoader().getResource(name);
-    }
-    if (resource == null) {
-      throw new IllegalStateException("Could not find animal: " + name);
-    }
-    this.image = new ImageIcon(resource).getImage();
-    clearWindow();
-    configureWindow(this.turtle);
+    this.animal = animal;
+    this.image = loadAnimal();
+    clearPainters();
+    configurePainters();
   }
 
   public void setCursor(int cursor) {
@@ -70,16 +65,22 @@ public void ___() {
     // blank for the DeepDive
   }
 
-  protected void clearWindow() {
+  protected void clearPainters() {
     this.window.remove(this.trailPainter)
         .remove(this.turtlePainter);
   }
 
-  protected void configureWindow(Turtle turtle) {
-    this.trailPainter = new TurtleTrailPainter(turtle);
-    this.turtlePainter = new TurtlePainter(turtle, this.getImage());
-    this.window.add(this.trailPainter)
-        .add(this.turtlePainter);
+  protected void configurePainters() {
+    this.window.add(createTurtleTrailPainter())
+        .add(createTurtlePainter());
+  }
+
+  protected Paintable createTurtleTrailPainter() {
+    return this.turtlePainter = new TurtlePainter(this.turtle, this.getImage());
+  }
+
+  protected Paintable createTurtlePainter() {
+    return this.trailPainter = new TurtleTrailPainter(this.turtle);
   }
 
   public TurtleWindow getWindow() {
@@ -113,5 +114,25 @@ public void setBackgroundImage(String picture) {
   public ArrayList<Paintable> getAdditional() {
     return this.window.additional;
   }
+
+  protected Image loadAnimal() {
+    return ObjectUtils.loadImage(MultiTurtleWindow.class, this.animal + ".png");
+  }
+
+  protected Paintable getTrailPainter() {
+    return trailPainter;
+  }
+
+  protected void setTrailPainter(Paintable trailPainter) {
+    this.trailPainter = trailPainter;
+  }
+
+  protected Paintable getTurtlePainter() {
+    return turtlePainter;
+  }
+
+  protected void setTurtlePainter(Paintable turtlePainter) {
+    this.turtlePainter = turtlePainter;
+  }
 }
 

src/main/java/org/teachingextensions/logo/utils/InterfaceUtils/MultiTurtlePainter.java

@@ -19,6 +19,10 @@ public MultiTurtlePainter(List<Turtle> turtles, Image image) {
 
   @Override
   public void paint(Graphics2D g, JPanel caller) {
+    if (this.turtles == null){
+      return;
+    }
+
     for (Turtle turtle : turtles)
     {
       if (turtle.isHidden())