cleaning w/@samanthalangit

Author: lynnlangit

src/main/java/org/teachingkidsprogramming/recipes/completed/section00demos/QuickShape.java

@@ -11,18 +11,18 @@ public static void main(String[] args) throws Exception
   {
     Tortoise.show();
     Tortoise.setX(150);
-    //Tip: Use the Tortoise to draw shapes!
-    //Draw a red square that is 50 pixels per side with a line that's 2 pixels thick
+    // Tip: Use the Tortoise object to draw shapes!
+    // Draw a red square that is 50 pixels per side with a line that's 2 pixels thick
     Tortoise.drawShape(4, PenColors.Reds.Red, 75, 4);
-    //Draw a blue hexagon that is 65 pixels per side with a line that's 40 pixels thick
+    // Draw a blue hexagon that is 65 pixels per side with a line that's 40 pixels thick
     Tortoise.setX(425);
     Tortoise.drawShape(6, PenColors.Blues.Blue, 65, 40);
     Tortoise.setX(250);
     Tortoise.setY(375);
     Random r = new Random();
     int sides = r.nextInt(10) + 1;
-    //Draw a purple shape that is 50 pixel on each side with a line that's 10 pixels thick
+    // Draw a purple shape that is 50 pixel on each side with a line that's 10 pixels thick
     Tortoise.drawShape(sides, PenColors.Purples.Purple, 50, 10);
   }
-  //See your "work" at http://virtualproctor.tkpjava.org
+  // See your "work" at http://virtualproctor.tkpjava.org
 }

src/main/java/org/teachingkidsprogramming/recipes/completed/section00demos/QuickTortoise.java

@@ -7,6 +7,7 @@ public class QuickTortoise
   public static void main(String[] args) throws Exception
   {
     Tortoise.show();
+    //  Use the Tortoise object to draw a Tortoise!
     Tortoise.drawTortoise();
   }
 }

src/main/java/org/teachingkidsprogramming/recipes/completed/section01forloops/DeepDive01ForLoops.java

@@ -10,7 +10,7 @@
 public class DeepDive01ForLoops
 {
   //  How to do deep dive:
-  //  Step 1: Select the method name (numbersDoNotNeedQuotes on line 24) Press the Run Button
+  //  Step 1: Select the method name (numbersDoNotNeedQuotes on line 23) Press the Run Button
   //            PC: Ctrl+F11 
   //            Mac: Command+fn+F11
   //  Step 2: Read the name of the method that failed

src/main/java/org/teachingkidsprogramming/recipes/completed/section03ifs/HiLow.java

@@ -39,7 +39,7 @@ else if (guess < answer)
         MessageBox.showMessage("Try a higher number.");
       }
     }
-    //    If after 8 times they haven't guessed correctly then --#12
+    //     If after 8 times they haven't guessed correctly then --#12
     //     Tell them they've lost the game --#11
     MessageBox.showMessage("You lost!");
   }

src/main/java/org/teachingkidsprogramming/recipes/completed/section04mastery/DeepDive04Mastery.java

@@ -6,7 +6,7 @@
 public class DeepDive04Mastery
 {
   //  How to do deep dive:
-  //  Step 1: Select the method name (theseNumbersCount on line 23) Press the Run Button
+  //  Step 1: Select the method name (theseNumbersCount on line 19) Press the Run Button
   //            PC: Ctrl+F11 
   //            Mac: Command+fn+F11
   //  Step 2: Read the name of the method that failed

src/main/java/org/teachingkidsprogramming/recipes/completed/section05recursion/DeepDive05Recursion.java

@@ -14,7 +14,7 @@
 public class DeepDive05Recursion
 {
   //  How to do deep dive:
-  //  Step 1: Select the method name (changeThePointerToAHand on line 29) Press the Run Button
+  //  Step 1: Select the method name (changeThePointerToAHand on line 27) Press the Run Button
   //            PC: Ctrl+F11 
   //            Mac: Command+fn+F11
   //  Step 2: Read the name of the method that failed

src/main/java/org/teachingkidsprogramming/recipes/completed/section05recursion/RecursiveSquare.java

@@ -10,34 +10,34 @@ public static void main(String[] args) throws Exception
     Tortoise.show();
     Tortoise.getBackgroundWindow().setBackground(PenColors.Greens.DarkGreen);
     Tortoise.setPenColor(PenColors.Yellows.Gold);
-    //Set the speed to the fastest --#8
+    //  Set the speed to the fastest --#8
     Tortoise.setSpeed(10);
-    //Set the length to 100.0 --#1.1
+    //  Set the length to 100.0 --#1.1
     double length = 100.0;
-    //MakeASquare with the current length(recipe below) --#11.4
+    //  MakeASquare with the current length(recipe below) --#11.4
     makeASquare(length);
   }
   //
-  //Create the makeASquare recipe --#11.1 
+  //    Create the makeASquare recipe --#11.1 
   private static void makeASquare(double length)
   {
-    //If the current length is greater than 10 --#10.2
+    //  If the current length is greater than 10 --#10.2
     if (length > 10)
     {
-      //  Run the recipe moveToTheSquareStart with the current length  --#4.3
+      //    Run the recipe moveToTheSquareStart with the current length  --#4.3
       moveToTheSquareStart(length);
       //
-      //  Do the following 4 times --#7.1 
+      //    Do the following 4 times --#7.1 
       for (int i = 0; i < 4; i++)
       {
-        //    Move the Tortoise the current length  
+        //      Move the Tortoise the current length  
         Tortoise.move(length);
-        //    MakeASquare with the current length divided by 1.7 (recipe below)--#11.3  
+        //      MakeASquare with the current length divided by 1.7 (recipe below)--#11.3  
         makeASquare(length / 1.7);
-        //      If the current process count is less than 3 (HINT: use 'i') --#9
+        //          If the current process count is less than 3 (HINT: use 'i') --#9
         if (i < 3)
         {
-          //      Turn the tortoise 90 degrees to the right
+          //            Turn the tortoise 90 degrees to the right
           Tortoise.turn(90);
           //
         }
@@ -48,7 +48,7 @@ private static void makeASquare(double length)
       //  Set the current length to the current length times two --#10.1
       length = length * 2;
     }
-    //End of makeASquare recipe
+    //  End of makeASquare recipe
   }
   //  Create the moveToTheSquareStart recipe --#4.1
   private static void moveToTheSquareStart(double length)

src/main/java/org/teachingkidsprogramming/recipes/completed/section06modelviewcontroller/AdLibs.java

@@ -6,21 +6,21 @@ public class AdLibs
 {
   public static void main(String[] args)
   {
-    //Ask the user to enter an adverb, save it as currentAdverb --#2
+    //  Ask the user to enter an adverb, save it as currentAdverb --#2
     String currentAdverb = MessageBox.askForTextInput("What is the adverb?");
-    //Ask the user to enter a verb ending in '-ed', save it as currentEdVerb --#4
+    //  Ask the user to enter a verb ending in '-ed', save it as currentEdVerb --#4
     String currentEdVerb = MessageBox.askForTextInput("What is the -ed verb?");
-    //Ask the user to enter a body part, save it as currentBodyPart --#6
+    //  Ask the user to enter a body part, save it as currentBodyPart --#6
     String currentBodyPart = MessageBox.askForTextInput("What is the body part?");
-    //Set the value of the currentStory to the word "Today " --#1.2
+    //  Set the value of the currentStory to the word "Today " --#1.2
     String currentStory = "Today ";
-    //Add the words "I woke " + currentAdverb + ". " to the currentStory --#3
+    //  Add the words "I woke " + currentAdverb + ". " to the currentStory --#3
     currentStory = currentStory + "I woke " + currentAdverb + ". ";
-    //Add the words '"Then I " + currentEdVerb + " " to the currentStory --#5
+    //  Add the words '"Then I " + currentEdVerb + " " to the currentStory --#5
     currentStory = currentStory + "Then I " + currentEdVerb + " ";
-    //Add the words "my " + currentBodyPart + ". " to the current story --#7
+    //  Add the words "my " + currentBodyPart + ". " to the current story --#7
     currentStory = currentStory + "my " + currentBodyPart + ". ";
-    //Show the currentStory in a message box as a message --#1.1
+    //  Show the currentStory in a message box as a message --#1.1
     MessageBox.showMessage(currentStory);
   }
 }

src/main/java/org/teachingkidsprogramming/recipes/completed/section06modelviewcontroller/AdLibsQuiz.java

@@ -9,25 +9,25 @@ public class AdLibsQuiz extends AdLibsQuizAdapter
   @Override
   public void question1(String letter1, String letter3)
   {
-    //set current value of word1 to be letter1 + 'o' + letter3
+    //  Set current value of word1 to be letter1 + 'o' + letter3
     word1 = letter1 + "o" + letter3;
   }
   @Override
   public void question2(String letter1)
   {
-    //add the letter1 to the end of word2 
+    //  Add the letter1 to the end of word2 
     word2 += letter1;
   }
   @Override
   public void question3(String templateText, Object model)
   {
-    //use the parser to combine the template and the model as word3
+    //  Use the parser to combine the template and the model as word3
     word3 = Parser.parse(templateText, model);
   }
   @Override
   public void question4(Pieces pieces)
   {
-    //set template4 to the template which does'g' + pieces.middle + 'e'
+    //  Set template4 to the template which does'g' + pieces.middle + 'e'
     template4 = "g{middle}e";
   }
   public static void main(String[] args)

…elviewcontroller/AdLibsRtfVariation.java …tion06modelviewcontroller/AdLibsRtf.javasrc/main/java/org/teachingkidsprogramming/recipes/completed/section06modelviewcontroller/AdLibsRtfVariation.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section06modelviewcontroller/AdLibsRtf.java src/main/java/org/teachingkidsprogramming/recipes/completed/section06modelviewcontroller/AdLibsRtfVariation.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section06modelviewcontroller/AdLibsRtf.java

@@ -4,7 +4,7 @@
 import org.teachingextensions.logo.utils.MVCUtils.Parser;
 import org.teachingextensions.logo.utils.MVCUtils.Viewer;
 
-public class AdLibsRtfVariation
+public class AdLibsRtf
 {
   public static class Words
   {
@@ -14,11 +14,17 @@ public static class Words
   }
   public static void main(String[] args)
   {
+    //  Create a new 'word' container to hold the words for your story --#1.1
     Words word = new Words();
+    //  Ask the user to enter an adverb, save it as currentAdverb --#2
     word.adverb = MessageBox.askForTextInput("What is the adverb?");
+    //  Ask the user to enter a verb ending in '-ed', save it as currentEdVerb --#3
     word.edVerb = MessageBox.askForTextInput("What is the -ed verb?");
+    //  Ask the user to enter a body part, save it as currentBodyPart --#4
     word.bodyPart = MessageBox.askForTextInput("What is the body part?");
+    //  Connect the words in the currentStory to an RTF file parser (use the Parser object)  --#1.2
     String currentStory = Parser.parseRtfFile("view.rtf", word);
+    //  Display the currentStory in an RTF file (use the Viewer object) --#1.3
     Viewer.displayRtfFile(currentStory);
   }
 }