added line numbers w/Matt

Author: lynnlangit

TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar

@@ -7,18 +7,18 @@ public static void main(String[] args)
   {
     //    Show the tortoise --#1
     //    Make the tortoise go as fast as possible --#7
-    //    Do the following 60 times --#8
+    //    Do the following 60 times --#8.1
     //          Change the color of the line the tortoise draws to a random color --#10
     //          Increase the current length of the side by 4 pixels --#9
     //          drawTriangle (recipe below) --#6
     //          ------------- Recipe for drawTriangle --#5
-    //              Do the following 3 times --#3
+    //              Do the following 3 times --#3.1
     //                      Move the tortoise the current length of a side --#4
     //                      Turn the tortoise 1/3rd of 360 degrees --#2
-    //              Repeat 
+    //              Repeat --#3.2 
     //          ------------- End of drawTriangle recipe --#5
     //          Turn the tortoise 1/60th of 360 degrees to the right --#11
-    //    Repeat 
+    //    Repeat --#8.2
   }
   // Related Videos:
   // Sub recipe-> Method : http://youtu.be/C6fnqjceVcs

TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/TriangleShell.java

@@ -9,10 +9,10 @@ public static void main(String[] args)
     //    Make the background silver --#8
     //    Make the line the tortoise draws 3 pixels wide --#20
     //    createColorPalette (recipe below) --#9
-    //    Do the following 15 times --#19
+    //    Do the following 15 times --#19.1
     //      drawOctogon (recipe below) --#10
     //      Turn the tortoise 1/15th of 360 degrees to the right --#18
-    //    Repeat
+    //    Repeat --#19.2
     //    ------------- Recipe for createColorPalette --#9
     //    Color 1 is red --#3
     //    Color 2 is dark orange --#11
@@ -27,10 +27,10 @@ public static void main(String[] args)
     //    Add color 2 to the color wheel --#16
     //    Add color 1 to the color wheel --#17
     //    ------------- Recipe for drawOctogon --#10
-    //    Do the following 8 times --#6
+    //    Do the following 8 times --#6.1
     //      Change the color of the line the tortoise draws to the next color on the color wheel --#4
     //      Move the tortoise 50 pixels --#2
     //      Turn the tortoise 1/8th of 360 degrees to the right --#5
-    //    Repeat  
+    //    Repeat --#6.2 
   }
 }

TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/DigiFlower.java

@@ -1,4 +1,4 @@
-package org.teachingkidsprogramming.section04mastery;
+package org.teachingkidsprogramming.section05recursion;
 
 import org.teachingkidsprogramming.recipes.quizzes.graders.SpiderQuiz;
 import org.teachingkidsprogramming.recipes.quizzes.graders.SpiderWebQuizGrader;

…ming/section04mastery/SpiderWebQuiz.java …ng/section05recursion/SpiderWebQuiz.javaTeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/SpiderWebQuiz.java renamed to TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWebQuiz.java TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/SpiderWebQuiz.java renamed to TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWebQuiz.java

@@ -24,7 +24,8 @@ public class DeepDive06ModelViewController
   public void stringsCanBeArrays() throws Exception
   {
     String[] words = {"happy ", ___};
-    Assert.assertEquals("happy baby", words);
+    String result = words[0] + words[1];
+    Assert.assertEquals("happy baby", result);
   }
   @Test
   public void numbersCanBeStrings() throws Exception

TeachingKidsProgramming/src/org/teachingkidsprogramming/section06modelviewcontroller/DeepDive06ModelViewController.java

@@ -26,11 +26,11 @@ public class DeepDive07Events
   //   'this' - instance(s) - multiple Tortoises
   //    exploring Object methods other than Tortoise---Circle (TKP)...methods
   @Test
-  public void concatenateString() throws Exception
+  public void stringsCanBeArrays() throws Exception
   {
-    //create a new string from the strings "happy " + "baby"
     String[] words = {"happy ", ___};
-    Assert.assertEquals("happy baby", words);
+    String result = words[0] + words[1];
+    Assert.assertEquals("happy baby", result);
   }
   @Test
   public void twoTortoises() throws Exception

TeachingKidsProgramming/src/org/teachingkidsprogramming/section07events/DeepDive07Events.java

@@ -26,11 +26,11 @@ public class DeepDive08TDD
   //   type conversion
   //   autoboxing
   @Test
-  public void concatenateString() throws Exception
+  public void stringsCanBeArrays() throws Exception
   {
-    //create a new string from the strings "happy " + "baby"
     String[] words = {"happy ", ___};
-    Assert.assertEquals("happy baby", words);
+    String result = words[0] + words[1];
+    Assert.assertEquals("happy baby", result);
   }
   /**
    * Ignore the following, It's needed to run the homework