Refactor for PenColors

lynnlangit · lynnlangit · commit 5530e8c184b7 · 2015-02-04T09:02:37.000-08:00
diff --git a/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar b/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquare.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquare.java
@@ -1,14 +1,13 @@
 package org.teachingkidsprogramming.section01forloops;
 
-
 public class SimpleSquare
 {
   public static void main(String[] args) throws Exception
   {
     //  Show the tortoise --#1
     //  Make the tortoise move as fast as possible --#6
     //  Do the following 4 times --#5.1
-    //      Change the color of the line the tortoise draws to "blue" --#4
+    //      Change the pen color of the line the tortoise draws to "blue" --#4
     //      Move the tortoise 50 pixels --#2
     //      Turn the tortoise to the right (90 degrees) --#3
     //  Repeat --#5.2
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquareQuiz.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquareQuiz.java
@@ -15,7 +15,7 @@ public void question2()
   }
   public void question3()
   {
-    //  Change the color the tortoise draws to yellow
+    //  Change the pen color the tortoise draws to yellow
   }
   public void question4()
   {
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/Spiral.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/Spiral.java
@@ -10,7 +10,7 @@ public static void main(String[] args)
     //    Add Violet to the Color Wheel --#8
     //    Add Blue Violet to the Color Wheel --#9
     //    Do the following 75 times --#3
-    //         Change the color of the line the tortoise draws the next color on the Color Wheel --#6
+    //         Change the pen color of the line the tortoise draws the next color on the Color Wheel --#6
     //         Move the tortoise 5 times the current line number you are drawing --#5
     //         Turn the tortoise 1/3 of 360 degrees to the right --#2
     //  Repeat --#3
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/FourSquare.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/FourSquare.java
@@ -10,7 +10,7 @@ public static void main(String[] args)
     //      drawSquare (recipe below) --#6
     //      ------------- Recipe for drawSquare --#6
     //      Do the following 4 times --#5
-    //          Change the color of the line the tortoise draws to a random color --#3
+    //          Change the pen color of the line the tortoise draws to a random color --#3
     //          Move the tortoise 50 pixels --#2
     //          Turn the tortoise 90 degrees to the right --#4
     //      Repeat --#5
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/Houses.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/Houses.java
@@ -9,7 +9,7 @@ public static void main(String[] args)
     //   The current height is 40 --#1.2
     //   drawHouse (recipe below) --#9
     //   ------------- Recipe for drawHouse --#9
-    //   Change the color of the line the tortoise draws to lightGray --#15
+    //   Change the pen color of the line the tortoise draws to lightGray --#15
     //   Move the tortoise the height of a house --#1.1
     //   Turn the tortoise 90 degrees to the right --#2
     //   Move the tortoise 30 pixels --#3
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/TriangleShell.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/TriangleShell.java
@@ -8,7 +8,7 @@ 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.1
-    //          Change the color of the line the tortoise draws to a random color --#10
+    //          Change the pen 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
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/ChooseYourOwnAdventure.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/ChooseYourOwnAdventure.java
@@ -10,10 +10,10 @@ public static void main(String[] args)
     //      animateStartStory (recipe below) --#38
     //      ------------- Recipe for animateStartStory --#38
     //         Show the Tortoise --#37
-    //         The current color is black --#39.2
+    //         The current pen color is black --#39.2
     //         Do the following 25 times --#41
-    //         Turn the background to the current color --#39.1
-    //         lighten the current color --#42
+    //         Turn the background to the current pen color --#39.1
+    //         lighten the current pen color --#42
     //         wait for 100 milliseconds --#40  
     //         Repeat --#41
     //      ------------- End of animateStartStory recipe --#38
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/DigiFlower.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/DigiFlower.java
@@ -6,18 +6,19 @@ public static void main(String[] args)
   {
     //    Show the tortoise --#1
     //    Make the tortoise move as fast as possible --#7
-    //    Make the background silver --#8
+    //    Make the background silver (HINT: Use PenColors) --#8
     //    Make the line the tortoise draws 3 pixels wide --#20
     //    createColorPalette (recipe below) --#9
     //    Do the following 15 times --#19.1
     //      drawOctogon (recipe below) --#10
     //      Turn the tortoise 1/15th of 360 degrees to the right --#18
     //    Repeat --#19.2
     //    ------------- Recipe for createColorPalette --#9
-    //    Color 1 is red --#3
-    //    Color 2 is dark orange --#11
-    //    Color 3 is gold --#12
-    //    Color 4 is yellow --#13
+    //    Pen Color 1 is red --#3
+    //    Pen Color 2 is dark orange --#11
+    //    Pen Color 3 is gold --#12
+    //    Pen Color 4 is yellow --#13
+    //
     //    Add color 1 to the color wheel --#3.1
     //    Add color 2 to the color wheel --#11.1
     //    Add color 3 to the color wheel --#12.1
@@ -28,7 +29,7 @@ public static void main(String[] args)
     //    Add color 1 to the color wheel --#17
     //    ------------- Recipe for drawOctogon --#10
     //    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
+    //      Change the pen 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 --#6.2 
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/KnottedRing.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/KnottedRing.java
@@ -6,7 +6,7 @@ public static void main(String[] args)
   {
     //      Make the tortoise move as fast as possible --#4
     //      createColorPalette (recipe below) --#7
-    //      ------------- Recipe for createColorPalette --#7
+    //      ------------- Recipe for createColorPalette (HINT: Use PenColors)--#7
     //      Add hot pink to the color wheel --#6
     //      Add red to the color wheel --#13
     //      Add fuchsia to the color wheel --#14
@@ -17,7 +17,7 @@ public static void main(String[] args)
     //      Add tomato to the color wheel --#19
     //      ------------- End of createColorPalette recipe --#7
     //      Do the following 30 times --#11
-    //              Change the color of the line the tortoise draws to a random color from the color wheel --#5
+    //              Change the pen color of the line the tortoise draws to a random color from the color wheel --#5
     //              drawOctagonWithOverlap (recipe below) --#9
     //              ------------- Recipe for drawOctagonWithOverlap --#8
     //              Do the following 8 + 1 times --#3
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/PentagonCrazy.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/PentagonCrazy.java
@@ -6,7 +6,7 @@ public static void main(String[] args)
   {
     //    Make the tortoise move as fast as possible --#3
     //    createColorPalette (recipe below) --#8
-    //    ------------- Recipe for createColorPalette --#8
+    //    ------------- Recipe for createColorPalette (HINT: Use PenColors)--#8
     //    Add steel blue to the color wheel --#7
     //    Add dark orchid to the color wheel --#11
     //    Add dark slate blue to the color wheel --#12
@@ -18,7 +18,7 @@ public static void main(String[] args)
     //    Do the following 200 times --#2
     //        adjustPen (recipe below) --#9
     //        ------------- Recipe for adjustPen --#9
-    //        Change the color of the line the tortoise draws to the next color on the color wheel --#6
+    //        Change the pen color of the line the tortoise draws to the next color on the color wheel --#6
     //        Increase the tortoises pen width by 1 --#15                                              
     //        If the tortoises pen width is greater than 4, then --#17
     //            Reset it to 1 --#16
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/DeepDive05Recursion.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/DeepDive05Recursion.java
@@ -9,7 +9,7 @@
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.teachingextensions.logo.Colors;
+import org.teachingextensions.logo.PenColors;
 import org.teachingextensions.logo.Tortoise;
 
 
@@ -41,24 +41,24 @@ public void getTheWindow() throws Exception
   public void setColorUsingKey() throws Exception
   {
     HashMap<Integer, Color> colors = new HashMap<Integer, Color>();
-    colors.put(10, Colors.Greens.Lime);
-    colors.put(____, Colors.Greens.DarkGreen);
-    Assert.assertEquals(Colors.Greens.DarkGreen, colors.get(20));
+    colors.put(10, PenColors.Greens.Lime);
+    colors.put(____, PenColors.Greens.DarkGreen);
+    Assert.assertEquals(PenColors.Greens.DarkGreen, colors.get(20));
   }
   @Test
   public void findTheGreenKey() throws Exception
   {
     HashMap<Integer, Color> colors = new HashMap<Integer, Color>();
-    colors.put(20, Colors.Greens.DarkGreen);
-    colors.put(30, Colors.Greens.Green);
-    Assert.assertEquals(Colors.Greens.Green, colors.get(___));
+    colors.put(20, PenColors.Greens.DarkGreen);
+    colors.put(30, PenColors.Greens.Green);
+    Assert.assertEquals(PenColors.Greens.Green, colors.get(___));
   }
   @Test
   public void findTheColorForTheBananaKey() throws Exception
   {
     HashMap<String, Color> colors = new HashMap<String, Color>();
-    colors.put("banana", Colors.Yellows.Yellow);
-    colors.put("apple", Colors.Reds.Red);
+    colors.put("banana", PenColors.Yellows.Yellow);
+    colors.put("apple", PenColors.Reds.Red);
     Assert.assertEquals(_______, colors.get("banana"));
   }
   @Test
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWeb.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWeb.java
@@ -7,7 +7,7 @@ public static void main(String[] args)
     //    Make the tortoise go as fast as possible --#6
     //    Change the width of the line the tortoise draws to 1 pixel --#12
     //    Change the Tortoise to a Spider --#14
-    //    Change the color of the line the tortoise draws to silver --#13
+    //    Change the pen color of the line the tortoise draws to silver --#13
     //    The current length of a line is 10.5 pixels --#1.2                  
     //    The current zoom is 1.1 --#8.2
     //    Do the following 10 times --#10
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/TurtleTree.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/TurtleTree.java
@@ -5,7 +5,7 @@ public class TurtleTree
   public static void main(String[] args)
   {
     //    Make the tortoise go as fast as possible --#10
-    //    Turn the background black --#21
+    //    Turn the background black (HINT: Use PenColors) --#21
     //    The current branch length = 60 --#1.2
     //    drawBranch(recipe below) --#2
     //    ------------- Recipe for drawBranch --#2
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07events/ConnectTheDots.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07events/ConnectTheDots.java
@@ -20,7 +20,7 @@ public ConnectTheDots()
     //   Write "Right click to clear" on the screen at position 100, 100 --#18
     //  ------------- End of clearTheScreen Recipe --#19
     //  prepareColorPalette (recipe below) --#17
-    //  ------------- Recipe for prepareColorPalette --#17
+    //  ------------- Recipe for prepareColorPalette (HINT: use PenColors)--#17
     //   Add red to the color wheel --#6
     //   Add green to the color wheel --#12
     //   Add blue to the color wheel --#13
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07events/SimpleBubble.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07events/SimpleBubble.java
@@ -9,7 +9,7 @@ public SimpleBubble()
     //Create a ProgramWindow titled Bubbles --#1
     //Have SimpleBubble listen for when the left mouse button is clicked in your program window --#2.2
     //prepareColorPalette (recipe below) --#7
-    //------------- Recipe for prepareColorPalette --#7
+    //------------- Recipe for prepareColorPalette (HINT: Use PenColors)--#7
     // Add purple to the color wheel --#2.3
     // Add alice blue to the color wheel --#4
     // Add blue to the color wheel --#5

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public void question2()`
`15`	`15`	`}`
`16`	`16`	`public void question3()`
`17`	`17`	`{`
`18`		`- // Change the color the tortoise draws to yellow`
	`18`	`+ // Change the pen color the tortoise draws to yellow`
`19`	`19`	`}`
`20`	`20`	`public void question4()`
`21`	`21`	`{`