refactoring on a Saturday w/@jamesrcounts

Author: lynnlangit

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

@@ -2,6 +2,7 @@
 
 import java.awt.Toolkit;
 import java.io.File;
+import java.net.URL;
 
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
@@ -21,12 +22,32 @@ public static void playBeep()
   {
     Toolkit.getDefaultToolkit().beep();
   }
+  /**
+   * Current types are: CatMeow, Crickets
+   */
+  public enum TKPSound {
+    CatMeow, Crickets
+  }
+  private String soundFilename = null;
+  public synchronized void setSound(TKPSound mySound)
+  {
+    String sound = "soundFiles/" + mySound + ".wav";
+    URL resource = this.getClass().getResource(sound);
+    if (resource == null)
+    {
+      resource = this.getClass().getClassLoader().getResource(sound);
+    }
+    if (resource == null) { throw new IllegalStateException("Could not get TKPSound: " + sound); }
+    this.soundFilename = resource.toString();
+    this.soundFilename = this.soundFilename.replace("file:", "");
+  }
   /**
    * Plays a sound through your speakers. Use a '.wav' file<br>
    * <b>Example:</b> {@code  Sound.playSound("mySound.wav")}
    */
-  public static synchronized void playSound(final String fileName)
+  public synchronized void playSound()
   {
+    final String sound = this.soundFilename;
     new Thread(new Runnable()
     {
       @Override
@@ -35,13 +56,13 @@ public void run()
         try
         {
           Clip clip = AudioSystem.getClip();
-          AudioInputStream inputStream = AudioSystem.getAudioInputStream(new File(fileName));
+          AudioInputStream inputStream = AudioSystem.getAudioInputStream(new File(sound));
           clip.open(inputStream);
           clip.start();
         }
         catch (Exception e)
         {
-          System.out.println("play sound error: " + e.getMessage() + " for " + fileName);
+          System.out.println("play sound error: " + e.getMessage() + " for " + sound);
         }
       }
     }).start();

src/main/java/org/teachingextensions/setup/MacThumbDriveInstaller.java

@@ -1,5 +1,6 @@
 package org.teachingkidsprogramming.recipes.completed.section00demos;
 
+import org.teachingextensions.logo.Sound;
 import org.teachingextensions.logo.Tortoise;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.Text;
@@ -20,6 +21,9 @@ public static void main(String[] args) throws Exception
       Tortoise.setPenWidth(150);
       Tortoise.move(75);
       Tortoise.turn(360 / sides);
+      Sound s = new Sound();
+      s.setSound(Sound.TKPSound.CatMeow);
+      s.playSound();
     }
     VirtualProctor.setClassName("TKPHouseAtHome");
     VirtualProctor.setName("LynnLangit");

src/main/java/org/teachingextensions/setup/ThumbDriveInstaller.java

@@ -1,9 +1,9 @@
 package org.teachingkidsprogramming.recipes.completed.section01forloops;
 
-import org.teachingextensions.logo.ColorWheel;
-import org.teachingextensions.logo.PenColors;
 import org.teachingextensions.logo.Tortoise;
-import org.teachingextensions.windows.MessageBox;
+import org.teachingextensions.logo.utils.ColorUtils.ColorWheel;
+import org.teachingextensions.logo.utils.ColorUtils.PenColors;
+import org.teachingextensions.logo.utils.EventUtils.MessageBox;
 
 public class Spiral
 {

src/main/java/org/teachingextensions/setup/WindowsThumbDriveInstaller.java

@@ -1,4 +1,4 @@
-package org.teachingkidsprogramming.recipes.completed.section07events;
+package org.teachingkidsprogramming.recipes.completed.section07objects;
 
 import java.awt.Cursor;
 
@@ -11,7 +11,7 @@
 import org.teachingextensions.logo.utils.PizzaUtils.Topping;
 
 @SuppressWarnings("unused")
-public class DeepDive07Events
+public class DeepDive07Objects
 {
   //  How to do deep dive:
   //  Step 1: Select the method name (twoTortoises on line 30) Press the Run Button
@@ -170,7 +170,7 @@ private Cursor getCursor()
     Cursor cursor = Tortoise.getBackgroundWindow().getCursor();
     return cursor;
   }
-  public DeepDive07Events()
+  public DeepDive07Objects()
   {
     this.leonardo = new Turtle();
     this.donatello = new Turtle();

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

@@ -1,4 +1,4 @@
-package org.teachingkidsprogramming.recipes.completed.section07events;
+package org.teachingkidsprogramming.recipes.completed.section07objects;
 
 import java.util.ArrayList;
 

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

@@ -1,4 +1,4 @@
-package org.teachingkidsprogramming.recipes.completed.section07events;
+package org.teachingkidsprogramming.recipes.completed.section07objects;
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;

…ed/section07events/DeepDive07Events.java …/section07objects/DeepDive07Objects.javasrc/main/java/org/teachingkidsprogramming/recipes/completed/section07events/DeepDive07Events.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/DeepDive07Objects.java src/main/java/org/teachingkidsprogramming/recipes/completed/section07events/DeepDive07Events.java renamed to src/main/java/org/teachingkidsprogramming/recipes/completed/section07objects/DeepDive07Objects.java

@@ -1,4 +1,4 @@
-package org.teachingkidsprogramming.recipes.completed.section07events;
+package org.teachingkidsprogramming.recipes.completed.section07objects;
 
 import org.teachingextensions.WindowUtils.MultiTurtleWindow;
 import org.teachingextensions.logo.Turtle;