diff --git a/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar b/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar index 819f723c..182306e2 100644 Binary files a/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar and b/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar differ diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/AdLibs.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/AdLibs.java index 7dadcc82..5bc8a9a2 100644 --- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/AdLibs.java +++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/AdLibs.java @@ -1,17 +1,34 @@ package org.teachingkidsprogramming.recipes; +import org.teachingextensions.simpleparser.Parser; +import org.teachingextensions.utils.Viewer; +import org.teachingextensions.windows.MessageBox; public class AdLibs { public static void main(String[] args) { - //Ask the user to enter an adverb, save it as currentAdverb --#2 + Words words = new Words(); + words.adverb = MessageBox.askForTextInput("Please enter an adverb "); //Ask the user to enter a verb ending in '-ed', save it as currentEdVerb --#4 + words.verb = ""; + forceEd(words); //Ask the user to enter a body part, save it as currentBodyPart --#6 - //Set the value of the currentStory to the word "Today " --#1.2 - //Add the words "I woke " + currentAdverb + ". " to the currentStory --#3 - //Add the words '"Then I " + currentEdVerb + " " to the currentStory --#5 - //Add the words "my " + currentBodyPart + ". " to the current story --#7 - //Show the currentStory in a message box as a message --#1.1 + words.currentBodyPart = MessageBox.askForTextInput("Please state a boday part."); + String story = Parser.parseRtfFile("view.rtf", words); + // MessageBox.showMessage(words.currentStory); + Viewer.displayRtfFile(story); + System.exit(0); + } + private static void forceEd(Words words) + { + while (words.verb.equals("")) + { + String verb = MessageBox.askForTextInput("Please enter a verb ending in \"ed\""); + if (verb.endsWith("ed")) + { + words.verb = verb; + } + } } } \ No newline at end of file diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/Words.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/Words.java new file mode 100644 index 00000000..924b0a22 --- /dev/null +++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/Words.java @@ -0,0 +1,6 @@ +package org.teachingkidsprogramming.recipes; + +public class Words +{ + public String adverb, verb, currentBodyPart, currentStory; +} diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/PentagonCrazyQuiz.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/PentagonCrazyQuiz.java index b56e9446..27ce8abd 100644 --- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/PentagonCrazyQuiz.java +++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/PentagonCrazyQuiz.java @@ -3,7 +3,7 @@ import org.teachingkidsprogramming.recipes.quizzes.graders.PentagonCrazyQuizGrader; import org.teachingkidsprogramming.recipes.quizzes.graders.PentagonQuiz; -public class PentagonCrazyQuiz extends PentagonCrazyQuizGrader +public class PentagonCrazyQuiz extends PentagonQuiz { // Question1 // Create a method called thread @@ -11,7 +11,7 @@ public class PentagonCrazyQuiz extends PentagonCrazyQuizGrader public void question2() { // Do the following 76 times - // Quiz.Stitch() + // call stitch // Repeat } public void question3() @@ -24,6 +24,6 @@ public void question4() } public static void main(String[] args) { - new PentagonCrazyQuizGrader().grade(new PentagonQuiz()); + new PentagonCrazyQuizGrader().grade(new PentagonCrazyQuiz()); } } diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/SpiderWebQuiz.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/SpiderWebQuiz.java index 4f27fa35..9a7aa497 100644 --- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/SpiderWebQuiz.java +++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/SpiderWebQuiz.java @@ -1,15 +1,17 @@ package org.teachingkidsprogramming.recipes.quizzes; -import org.teachingkidsprogramming.recipes.quizzes.graders.HousesQuizGrader; +import org.teachingkidsprogramming.recipes.quizzes.graders.SpiderQuiz; import org.teachingkidsprogramming.recipes.quizzes.graders.SpiderWebQuizGrader; -public class SpiderWebQuiz extends SpiderWebQuizGrader +public class SpiderWebQuiz extends SpiderQuiz { - public double length = 1; - public int number = 1; public void question1() { // Do the following the current number of times + for (int i = 1; i <= i; i++) + { + circle(); + } // Call circle() // Repeat } @@ -38,6 +40,6 @@ public void question1() // public static void main(String[] args) { - new HousesQuizGrader().grade(new HousesQuiz()); + new SpiderWebQuizGrader().grade(new SpiderWebQuiz()); } } diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/graders/PentagonCrazyQuizGrader.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/graders/PentagonCrazyQuizGrader.java index 6791a607..ecab1420 100644 --- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/graders/PentagonCrazyQuizGrader.java +++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/graders/PentagonCrazyQuizGrader.java @@ -1,5 +1,6 @@ package org.teachingkidsprogramming.recipes.quizzes.graders; +import java.awt.Color; import java.awt.Graphics2D; import org.teachingextensions.logo.ColorWheel; @@ -72,13 +73,24 @@ private boolean grade3Lime() { ColorWheel.removeAllColors(); quiz.question3(); - return ColorWheel.getNextColor() == Colors.Greens.Lime; + return getSafeColor() == Colors.Greens.Lime; + } + public Color getSafeColor() + { + try + { + return ColorWheel.getNextColor(); + } + catch (Exception e) + { + return null; + } } private boolean grade4Red() { ColorWheel.removeAllColors(); quiz.question4(); - return ColorWheel.getNextColor() == Colors.Reds.Red; + return getSafeColor() == Colors.Reds.Red; } public void setColors() { @@ -94,7 +106,7 @@ public void stitch() } else { - Tortoise.setPenColor(ColorWheel.getNextColor()); + Tortoise.setPenColor(getSafeColor()); Tortoise.turn(wheel.next()); Tortoise.penDown(); quiz.thread(); diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/view.rtf b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/view.rtf new file mode 100644 index 00000000..00b07466 Binary files /dev/null and b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/view.rtf differ