working on SuperSoundingTurtles recipe

Author: lynnlangit

src/main/java/org/teachingextensions/logo/utils/InterfaceUtils/TurtleFrame.java

@@ -1,76 +1,74 @@
 package org.teachingextensions.logo.utils.InterfaceUtils;
 
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+
 import org.teachingextensions.approvals.lite.util.FrameCloser;
 import org.teachingextensions.approvals.lite.util.WindowUtils;
 import org.teachingextensions.virtualproctor.VirtualProctorWeb;
 
-import javax.swing.*;
-
-public class TurtleFrame {
+public class TurtleFrame
+{
   public static final String TITLE = "TKPJava Turtle";
-  private LazyFrame frame;
-  private String    title;
-
-  public TurtleFrame(JFrame frame) {
-    if (frame == null) {
-      throw new IllegalArgumentException("frame must not be null when creating a TurtleFrame");
-    }
-
+  private LazyFrame          frame;
+  private String             title;
+  public TurtleFrame(JFrame frame)
+  {
+    if (frame == null) { throw new IllegalArgumentException(
+        "frame must not be null when creating a TurtleFrame"); }
     this.frame = new LazyFrame(frame);
   }
-
-  public TurtleFrame(String title) {
-    if (title == null) {
+  public TurtleFrame(String title)
+  {
+    if (title == null)
+    {
       title = TITLE;
     }
-
     this.frame = new LazyFrame(title);
   }
-
-  public TurtleFrame() {
+  public TurtleFrame()
+  {
     this(TITLE);
   }
-
-  public static void createStandardFrame(JFrame frame) {
+  public static void createStandardFrame(JFrame frame)
+  {
     WindowUtils.testFrame(frame, new VirtualProctorWeb(), new FrameCloser());
   }
-
-  public TurtleFrame addContent(JComponent panel) {
+  public TurtleFrame addContent(JComponent panel)
+  {
     this.frame.getValue().getContentPane().add(panel);
     return this;
   }
-
-  public TurtleFrame setVisible(boolean visible) {
+  public TurtleFrame setVisible(boolean visible)
+  {
     this.frame.getValue().setVisible(visible);
     return this;
   }
-
-  public TurtleFrame setStandardLayout() {
+  public TurtleFrame setStandardLayout()
+  {
     createStandardFrame(this.frame.getValue());
     return this;
   }
-
-  private class LazyFrame {
+  private class LazyFrame
+  {
     private String title;
     private JFrame frame;
-
-    public LazyFrame(String title) {
-      if (title == null) {
-        throw new IllegalArgumentException("title must not be null when creating a LazyFrame");
-      }
-
+    public LazyFrame(String title)
+    {
+      if (title == null) { throw new IllegalArgumentException(
+          "title must not be null when creating a LazyFrame"); }
       this.title = title;
     }
-
-    public LazyFrame(JFrame frame) {
+    public LazyFrame(JFrame frame)
+    {
       this.frame = frame;
     }
-
-    public JFrame getValue() {
-      if (this.frame == null) {
+    public JFrame getValue()
+    {
+      if (this.frame == null)
+      {
         this.frame = new JFrame(this.title);
       }
-
       return this.frame;
     }
   }

src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/SuperSoundingTurtles.java

@@ -17,28 +17,27 @@ public static void main(String[] args)
   }
   private void showSomeTurtles()
   {
-    makeSpeedyTurtle();
     makeSlowTurtle();
+    makeSpeedyTurtle();
     makeCrazyTurtle();
   }
-  private void makeSpeedyTurtle()
-  {
-    Turtle speedyTurtle = new Turtle();
-    Sound s = new Sound();
-    s.setSound(Sound.TKPSound.LLCoolJYaKnow);
-    speedyTurtle.setSound(s);
-    mtw.addAndShowTurtle(speedyTurtle);
-    speedyTurtle.setSpeed(10);
-    speedyTurtle.drawTriangle(100);
-    speedyTurtle.speak();
-  }
   private void makeSlowTurtle()
   {
     Turtle slowTurtle = new Turtle();
     slowTurtle.setSound(new Sound(Sound.TKPSound.Ahem));
     mtw.addAndShowTurtle(slowTurtle);
-    slowTurtle.drawTriangle(-50);
     slowTurtle.speak();
+    slowTurtle.drawTriangle(-50);
+  }
+  private void makeSpeedyTurtle()
+  {
+    Turtle speedyTurtle = new Turtle();
+    // TODO: Event synchronization API needs updating to be able to match events with rendering order
+    //speedyTurtle.setSound(new Sound(Sound.TKPSound.Gong));
+    //speedyTurtle.speak();
+    mtw.addAndShowTurtle(speedyTurtle);
+    speedyTurtle.setSpeed(10);
+    speedyTurtle.drawTriangle(100);
   }
   private void makeCrazyTurtle()
   {

src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/SuperTurtlesKataQuestion.java

@@ -5,7 +5,7 @@
 
 //
 //------------Kata Question---------------//
-//  How would you add a sound when the crazy turtle draws lightning?
+//  How would you add a sound before the slow turtle draws a triangle?
 //  Write out the steps in English 
 //  Then translate the steps into code
 //  Make sure to run after each line
@@ -23,23 +23,23 @@ public static void main(String[] args)
   }
   private void showSomeTurtles()
   {
-    makeSpeedyTurtle();
     makeSlowTurtle();
+    makeSpeedyTurtle();
     makeCrazyTurtle();
   }
+  private void makeSlowTurtle()
+  {
+    Turtle slowTurtle = new Turtle();
+    mtw.addAndShowTurtle(slowTurtle);
+    slowTurtle.drawTriangle(-50);
+  }
   private void makeSpeedyTurtle()
   {
     Turtle speedyTurtle = new Turtle();
     mtw.addAndShowTurtle(speedyTurtle);
     speedyTurtle.setSpeed(10);
     speedyTurtle.drawTriangle(100);
   }
-  private void makeSlowTurtle()
-  {
-    Turtle slowTurtle = new Turtle();
-    mtw.addAndShowTurtle(slowTurtle);
-    slowTurtle.drawTriangle(-50);
-  }
   private void makeCrazyTurtle()
   {
     Turtle crazyTurtle = new Turtle();

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

@@ -18,6 +18,7 @@ public ConnectTheDots()
   {
     setUpTheWindow();
     prepareColorPalette();
+    // NOTE for teachers: Using the Tortoise object here as we are having the Tortoise draw a line (trail)  for this recipe
     // Listen for left clicks on the window for the tortoise 
     Tortoise.getBackgroundWindow().addMouseLeftClickListener(this);
     // Listen for right clicks on the window for the tortoise

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

@@ -22,13 +22,6 @@ public SimpleBubbleVariation()
     programWindow.addMouseRightClickListener(this);
     prepareColorPalette();
   }
-  private void prepareColorPalette()
-  {
-    ColorWheel.addColor(PenColors.Blues.LightSteelBlue);
-    ColorWheel.addColor(PenColors.Blues.Blue);
-    ColorWheel.addColor(PenColors.Blues.DarkBlue);
-    ColorWheel.addColor(PenColors.Purples.Purple);
-  }
   @Override
   public void onLeftMouseClick(int x, int y)
   {
@@ -61,6 +54,13 @@ private void createBubbles(int x1, int y1)
       createBubble(x1 + i * 15, y1 + i * 15);
     }
   }
+  private void prepareColorPalette()
+  {
+    ColorWheel.addColor(PenColors.Blues.LightSteelBlue);
+    ColorWheel.addColor(PenColors.Blues.Blue);
+    ColorWheel.addColor(PenColors.Blues.DarkBlue);
+    ColorWheel.addColor(PenColors.Purples.Purple);
+  }
   public static void main(String[] args)
   {
     new SimpleBubbleVariation();