Working on DD7 w/Jim

Author: lynnlangit

src/org/teachingextensions/logo/TurtlePanel.java

@@ -16,8 +16,9 @@
 
 public class TurtlePanel extends ProgramWindow
 {
-  private Turtle turtle;
-  private Image  image;
+  private Turtle  turtle;
+  private Image   image;
+  private Animals animal;
   public TurtlePanel()
   {
   }
@@ -71,8 +72,17 @@ public synchronized Image getImage()
     }
     return image;
   }
+  public synchronized Animals getAnimal()
+  {
+    if (animal == null)
+    {
+      setAnimal(Animals.Turtle);
+    }
+    return animal;
+  }
   public synchronized void setAnimal(Animals animal)
   {
+    this.animal = animal;
     image = new ImageIcon(this.getClass().getResource(animal + ".png")).getImage();
   }
   public void setCursor(int cursor)

src/org/teachingkidsprogramming/recipes/completed/ConnectTheDots.java

@@ -14,7 +14,7 @@ public class ConnectTheDots implements MouseRightClickListener, MouseLeftClickLi
 {
   public static void main(String[] args)
   {
-    //Create a Connect the Dots window.
+    //Create new a 'Connect the Dots' window.
     ConnectTheDots dots = new ConnectTheDots();
   }
   public ConnectTheDots()

…mming/recipes/completed/HolidayCard.java …pes/completed/SmallBasicHolidayCard.javasrc/org/teachingkidsprogramming/recipes/completed/HolidayCard.java renamed to src/org/teachingkidsprogramming/recipes/completed/SmallBasicHolidayCard.java src/org/teachingkidsprogramming/recipes/completed/HolidayCard.java renamed to src/org/teachingkidsprogramming/recipes/completed/SmallBasicHolidayCard.java

@@ -1,7 +1,8 @@
 package org.teachingkidsprogramming.recipes.completed;
 
-public class HolidayCard
+public class SmallBasicHolidayCard
 {
+  //**needs to be translated from the SmallBasic
   //  Holiday Recipe - Enjoy!
   //  Set the background to the color of Snow
   //

…ramming/recipes/completed/TicTacToe.java …cipes/completed/SmallBasicTicTacToe.javasrc/org/teachingkidsprogramming/recipes/completed/TicTacToe.java renamed to src/org/teachingkidsprogramming/recipes/completed/SmallBasicTicTacToe.java src/org/teachingkidsprogramming/recipes/completed/TicTacToe.java renamed to src/org/teachingkidsprogramming/recipes/completed/SmallBasicTicTacToe.java

@@ -1,7 +1,9 @@
 package org.teachingkidsprogramming.recipes.completed;
 
-public class TicTacToe
+public class SmallBasicTicTacToe
 {
+  //**needs to be translated from the SmallBasic**
+  
   //   Tell TicTacToe to call PlayInFirstEmptySpot (recipe below) when its Xs turn
   //
   //  Start TicTacToe

src/org/teachingkidsprogramming/section07events/ConnectTheDots.java

@@ -7,7 +7,7 @@ public class ConnectTheDots implements MouseRightClickListener, MouseLeftClickLi
 {
   public static void main(String[] args)
   {
-    //Create a Connect The Dots window. --#1.1
+    //Create a new 'Connect The Dots' window. --#1.1
   }
   public ConnectTheDots()
   {

src/org/teachingkidsprogramming/section07events/DeepDive07Events.java

@@ -1,11 +1,11 @@
 package org.teachingkidsprogramming.section07events;
 
-import java.awt.Color;
 import java.awt.Cursor;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.teachingextensions.logo.Tortoise;
+import org.teachingextensions.logo.Turtle;
 //This deepdive is in progress!
 
 //@Ignore
@@ -21,17 +21,52 @@ public class DeepDive07Events
   //  Step 5: Advance to the next method
   //  Do not change anything except the blank (___)
   //
-  //    concepts:
-  //   events
-  //   event listeners - right click 
+  //   concepts:
+  //   events / multiple event listeners - right click 
   //   'this' - instance(s) - multiple Tortoises
+  //    exploring Object methods other than Tortoise---Circle (TKP)...methods
   @Test
   public void concatenateString() throws Exception
   {
     //create a new string from the strings "happy " + "baby"
     String[] words = {"happy ", ___};
     Assert.assertEquals("happy baby", words);
   }
+  @Test
+  public void twoTortoises() throws Exception
+  {
+    Tortoise rafael = new Tortoise();
+    Tortoise michealangelo = new Tortoise();
+    boolean result = rafael.equals(michealangelo);
+    Assert.assertEquals(______, result);
+  }
+  @Test
+  public void twoTortoisesAgain() throws Exception
+  {
+    Tortoise rafael = new Tortoise();
+    Tortoise anonymousNinja = rafael;
+    boolean result = rafael.equals(anonymousNinja);
+    Assert.assertEquals(_____, result);
+  }
+  @Test
+  public void twoTortoisesYetAgain() throws Exception
+  {
+    Tortoise rafael = new Tortoise();
+    Tortoise michealangelo = new Tortoise();
+    Tortoise anonymousNinja = ________;
+    boolean result = michealangelo.equals(anonymousNinja);
+    Assert.assertEquals(true, result);
+  }
+  //"this" Tortoise belongs here (to this Object)
+  private Turtle leonardo;
+  @Test
+  public void sadTortoise() throws Exception
+  {
+    this._______ = new Turtle();
+    //sorry, leonardo must die now - joking
+    this.leonardo.getPenWidth();
+    Assert.assertEquals(2, this.leonardo.getPenWidth());
+  }
   /**
    * Ignore the following, It's needed to run the homework
    * 
@@ -45,11 +80,12 @@ public void concatenateString() throws Exception
    * 
    * 
    */
-  public boolean _____  = false;
-  public boolean ______ = true;
-  public String  ___    = "You need to fill in the blank ___";
-  public int     ____   = 0;
-  public Color   _______;
+  public boolean  _____  = false;
+  public boolean  ______ = true;
+  public String   ___    = "You need to fill in the blank ___";
+  public int      ____   = 0;
+  public Turtle   _______;
+  public Tortoise ________;
   public String ___()
   {
     return ___;