Merge pull request #89 from jamesrcounts/master

Some bug fixes

Author: lynnlangit

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

@@ -258,6 +258,7 @@ public static void setPenDown()
   public static void clear()
   {
     turtle().clear();
+    turtle().getBackgroundWindow().setTurtle(turtle());
   }
 
   /**

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

@@ -39,6 +39,7 @@ public CanvasPanel add(Paintable painter) {
     if (!this.painters.contains(painter)) {
       this.painters.add(painter);
     }
+    this.repaint();
     return this;
   }
 

src/main/java/org/teachingextensions/logo/utils/LineAndShapeUtils/Circle.java

@@ -1,7 +1,6 @@
 package org.teachingextensions.logo.utils.LineAndShapeUtils;
 
 import org.teachingextensions.WindowUtils.ProgramWindow;
-import org.teachingextensions.WindowUtils.TurtleWindow;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 
 import javax.swing.*;
@@ -50,7 +49,7 @@ public int getRadius()
    */
   public void addTo(ProgramWindow panel)
   {
-    panel.add(this);
+    panel.getCanvas().add(this);
   }
   /**
    * Paints a circle
@@ -91,8 +90,4 @@ public int getY()
   {
     return this.y;
   }
-
-  public void addTo(TurtleWindow panel) {
-    panel.getCanvas().add(this);
-  }
 }

src/main/java/org/teachingkidsprogramming/recipes/completed/section08events/SimpleBubbleKataQuestion.java

@@ -10,7 +10,7 @@
 //
 //------------Kata Question---------------//
 //  How would you change your bubble into a unicorn when you right click on the window?
-//  Write out the steps in English 
+//  Write out the steps in English
 //  Then translate the steps into code
 //  Make sure to run after each line
 //
@@ -48,4 +48,4 @@ public static void main(String[] args)
   {
     new SimpleBubbleKataQuestion();
   }
-}
+}

src/main/java/org/teachingkidsprogramming/recipes/completed/section08events/TortoiseMaze.java

@@ -1,14 +1,12 @@
 package org.teachingkidsprogramming.recipes.completed.section08events;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-
 import org.teachingextensions.logo.Tortoise;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 //***********************ANSWER: In Progress***************************//
 //      Need to write English comments and copy to STUDENT section     //
 //
@@ -20,6 +18,7 @@ public static void main(String[] args)
   }
   public TortoiseMaze()
   {
+    Tortoise.show();
     Tortoise.setSpeed(10);
     Tortoise.setPenColor(PenColors.Greens.Green);
     Tortoise.setPenWidth(4);