cleaned w/@samanthalangit

Author: lynnlangit

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

@@ -21,47 +21,51 @@
  *
  * @param <T> The kind of things that are in the wheel
  */
-public class Wheel<T> {
-    private List<T> list = new ArrayList<>();
-    private int index = 0;
-
-    @SafeVarargs
-    public Wheel(T... loadWith) {
-        for (T t : loadWith) {
-            add(t);
-        }
-    }
-
-    public Wheel() {
+public class Wheel<T>
+{
+  private List<T> list  = new ArrayList<>();
+  private int     index = 0;
+  @SafeVarargs
+  public Wheel(T... loadWith)
+  {
+    for (T t : loadWith)
+    {
+      add(t);
     }
-
-    public void add(T i) {
-        list.add(i);
-    }
-
-    public T next() {
-        assertNonEmpty();
-        if (index >= list.size()) {
-            index = 0;
-        }
-        return list.get(index++);
+  }
+  public Wheel()
+  {
+  }
+  public void add(T i)
+  {
+    list.add(i);
+  }
+  public T next()
+  {
+    assertNonEmpty();
+    if (index >= list.size())
+    {
+      index = 0;
     }
-
-    private void assertNonEmpty() {
-        if (list.isEmpty()) {
-            String message = "I call shenanigans!!!\nThis Wheel is empty\nYou can NOT get something from the Wheel before you've added anything to it.";
-            throw new RuntimeException(message);
-        }
-    }
-
-    public T getRandomFrom() {
-        assertNonEmpty();
-        int index = NumberUtils.getRandomInt(0, list.size());
-        return list.get(index);
-    }
-
-    public void empty() {
-        list.clear();
-        index = 0;
+    return list.get(index++);
+  }
+  private void assertNonEmpty()
+  {
+    if (list.isEmpty())
+    {
+      String message = "I call shenanigans!!!\nThis ColorWheel is empty\nYou can NOT get a color from the Wheel before you've added anything to it.";
+      throw new RuntimeException(message);
     }
+  }
+  public T getRandomFrom()
+  {
+    assertNonEmpty();
+    int index = NumberUtils.getRandomInt(0, list.size());
+    return list.get(index);
+  }
+  public void empty()
+  {
+    list.clear();
+    index = 0;
+  }
 }

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

@@ -9,20 +9,19 @@ public class QuickShape
 {
   public static void main(String[] args) throws Exception
   {
-    //Tip: Use the Tortoise to draw!
-    //Draw a red square that is 50 pixels per side with a line that's 2 pixels thick
     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
     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
     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
     Tortoise.drawShape(sides, PenColors.Purples.Purple, 50, 10);
   }
+  //See your "work" at http://virtualproctor.tkpjava.org
 }

…oops/RecipeForTestingVirtualProctor.java …emos/RecipeForTestingVirtualProctor.javasrc/main/java/org/teachingkidsprogramming/recipes/completed/section01forloops/RecipeForTestingVirtualProctor.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section00demos/RecipeForTestingVirtualProctor.java src/main/java/org/teachingkidsprogramming/recipes/completed/section01forloops/RecipeForTestingVirtualProctor.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section00demos/RecipeForTestingVirtualProctor.java

@@ -1,4 +1,4 @@
-package org.teachingkidsprogramming.recipes.completed.section01forloops;
+package org.teachingkidsprogramming.recipes.completed.section00demos;
 
 import org.teachingextensions.logo.PenColors;
 import org.teachingextensions.logo.Tortoise;

src/main/java/org/teachingkidsprogramming/recipes/completed/section07events/SimpleBubble.java

@@ -22,8 +22,8 @@ public SimpleBubble()
   private void prepareColorPalette()
   {
     //------------- Recipe for prepareColorPalette --#7
-    // Add alice blue to the color wheel --#4
-    ColorWheel.addColor(PenColors.Blues.AliceBlue);
+    // Add light steel blue to the color wheel --#4
+    ColorWheel.addColor(PenColors.Blues.LightSteelBlue);
     // Add blue to the color wheel --#5
     ColorWheel.addColor(PenColors.Blues.Blue);
     // Add dark blue to the color wheel --#6

src/main/java/org/teachingkidsprogramming/recipes/completed/section07events/SimpleBubbleVariation.java

@@ -23,7 +23,7 @@ public SimpleBubbleVariation()
   }
   private void prepareColorPalette()
   {
-    ColorWheel.addColor(PenColors.Blues.AliceBlue);
+    ColorWheel.addColor(PenColors.Blues.LightSteelBlue);
     ColorWheel.addColor(PenColors.Blues.Blue);
     ColorWheel.addColor(PenColors.Blues.DarkBlue);
     ColorWheel.addColor(PenColors.Purples.Purple);

src/main/java/org/teachingkidsprogramming/recipes/completed/section07events/TortoiseMobile.java

@@ -25,6 +25,8 @@ public TortoiseMobile()
   {
     Tortoise.getBackgroundWindow().addMouseRightClickListener(this);
     Tortoise.setSpeed(10);
+    Tortoise.setPenColor(PenColors.Greens.Green);
+    Tortoise.setPenWidth(4);
     clearTheScreen();
     prepareColorPalette();
     ImageIcon arrowIconL = new ImageIcon(

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

@@ -8,8 +8,8 @@ public class QuickShape
 {
   public static void main(String[] args) throws Exception
   {
-    //  Tip: Use the Tortoise to draw shapes!
     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 -- #1
     //
     Tortoise.setX(425);
@@ -18,8 +18,9 @@ public static void main(String[] args) throws Exception
     Tortoise.setX(250);
     Tortoise.setY(375);
     Random r = new Random();
-    int sides = r.nextInt(10) + 1; //  use this to generate a random number of sides
+    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 -- #3
     //
   }
+  //See "your" work at http://virtualproctor.tkpjava.org
 }

src/main/java/org/teachingkidsprogramming/section07events/SimpleBubble.java

@@ -12,7 +12,7 @@ public SimpleBubble()
     //
     //    ------------- Recipe for prepareColorPalette --#7.2
     //         Add purple to the color wheel --#2.3
-    //         Add alice blue to the color wheel --#4
+    //         Add light steel blue to the color wheel --#4
     //         Add blue to the color wheel --#5
     //         Add dark blue to the color wheel --#6
     //    ------------- End of prepareColorPalette recipe --#7.3