working on ExceptionalAdLIbs w/ @samanthalangit

Author: lynnlangit

src/main/java/org/teachingextensions/windows/MessageBox.java

@@ -16,62 +16,64 @@
  * Use it to collect numerical input from the user<br>
  * Or to display a message for the user to read.<br>
  */
-public class MessageBox {
-	private static MessageBoxInstance messageBox = new MessageBoxInstance();
-
-	/**
-	 * Prints a request for a numerical input to the window. <br>
-	 * <b>Example:</b>
-	 * {@code  int cookies = MessageBox.askForNumericalInput("How many cookies would you like?");}
-	 * 
-	 * @param message
-	 *            the text to be displayed
-	 * @return the user input
-	 */
-	public static int askForNumericalInput(String message) {
-		return messageBox.askForNumericalInput(message);
-	}
-
-	/**
-	 * Prints a request for a text input to the window. <br>
-	 * <b>Example:</b>
-	 * {@code  String name = MessageBox.askForTextInput("What is your nickname?");}
-	 * 
-	 * @param message
-	 *            the text to be displayed
-	 * @return the user input
-	 */
-	public static String askForTextInput(String message) {
-		return messageBox.askForTextInput(message);
-	}
-
-	/**
-	 * Prints the message to the window. <br>
-	 * <b>Example:</b> {@code  MessageBox.showMessage(&quot;Girl programmers rule!&quot;);}
-	 * 
-	 * @param message
-	 *            the text to be displayed
-	 */
-	public static void showMessage(String message) {
-		messageBox.showMessage(message);
-	}
-
-	public static void mock(MessageBoxInstance messageBoxMock) {
-		messageBox = messageBoxMock;
-	}
-
-	public static class MessageBoxInstance {
-		public int askForNumericalInput(String message) {
-			String input = askForTextInput(message);
-			return NumberUtils.load(input, 0);
-		}
-
-		public String askForTextInput(String message) {
-			return JOptionPane.showInputDialog(message);
-		}
-
-		public void showMessage(String message) {
-			JOptionPane.showMessageDialog(null, message);
-		}
-	}
+public class MessageBox
+{
+  private static MessageBoxInstance messageBox = new MessageBoxInstance();
+  /**
+   * Prints a request for a numerical input to the window. <br>
+   * <b>Example:</b>
+   * {@code  int cookies = MessageBox.askForNumericalInput("How many cookies would you like?");}
+   * 
+   * @param message
+   *            the text to be displayed
+   * @return the user input
+   */
+  public static int askForNumericalInput(String message)
+  {
+    return messageBox.askForNumericalInput(message);
+  }
+  /**
+   * Prints a request for a text input to the window. <br>
+   * <b>Example:</b>
+   * {@code  String name = MessageBox.askForTextInput("What is your nickname?");}
+   * 
+   * @param message
+   *            the text to be displayed
+   * @return the user input
+   */
+  public static String askForTextInput(String message)
+  {
+    return messageBox.askForTextInput(message);
+  }
+  /**
+   * Prints the message to the window. <br>
+   * <b>Example:</b> {@code  MessageBox.showMessage("Girl programmers rule!");}
+   * 
+   * @param message
+   *            the text to be displayed
+   */
+  public static void showMessage(String message)
+  {
+    messageBox.showMessage(message);
+  }
+  public static void mock(MessageBoxInstance messageBoxMock)
+  {
+    messageBox = messageBoxMock;
+  }
+  public static class MessageBoxInstance
+  {
+    public int askForNumericalInput(String message)
+    {
+      String input = askForTextInput(message);
+      return NumberUtils.load(input, 0);
+    }
+    public String askForTextInput(String message)
+    {
+      return JOptionPane.showInputDialog(message);
+    }
+    public void showMessage(String message)
+    {
+      JOptionPane.showMessageDialog(null, message);
+    }
+  }
 }

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

@@ -11,10 +11,10 @@ public static void main(String[] args)
     String adverb = MessageBox.askForTextInput("What is the adverb?");
     if (adverb.isEmpty())
     {
-      MessageBox.showMessage("Required value, pay attention and start over");
+      MessageBox.showMessage("L Y don't you want to play? To start you need one adverb.");
       return;
     }
-    else if (adverb.matches("[\\d]"))
+    else if (adverb.matches("[\\d]*"))
     {
       MessageBox.showMessage("Numbers are NOT adverbs, try again");
       return;
@@ -24,17 +24,28 @@ else if (adverb.matches("[\\d]"))
     String edverb = MessageBox.askForTextInput("What is the -ed verb?");
     if (edverb.isEmpty())
     {
-      MessageBox.showMessage("Don't like verbs? Sorry you need one now, pay attention and start over");
+      MessageBox.showMessage("Don't like verbs? You need one now.");
       return;
     }
-    else if (edverb.matches("[\\d]"))
+    else if (edverb.matches("[\\d]*"))
     {
-      MessageBox.showMessage("Numbers are NOT verbs, try again");
+      MessageBox.showMessage("Numbers are != verbs, try again");
       return;
     }
     String currentEdVerb = edverb;
     //Ask the user to enter a body part, save it as currentBodyPart --#6
-    String currentBodyPart = MessageBox.askForTextInput("What is the body part?");
+    String bodyPart = MessageBox.askForTextInput("What is the body part?");
+    if (bodyPart.isEmpty())
+    {
+      MessageBox.showMessage("No body, no story, pay attention and start over");
+      return;
+    }
+    else if (bodyPart.matches("[\\d]*"))
+    {
+      MessageBox.showMessage("Numbers <> body parts, try again");
+      return;
+    }
+    String currentBodyPart = bodyPart;
     //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