updating for refactoring via @jamesrcounts

Author: lynnlangit

TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar

@@ -49,7 +49,7 @@ public static void prepareScoringScreen(boolean[] answers, Paintable paintable,
     TortoiseUtils.resetTurtle();
     Tortoise.setSpeed(turtleSpeed);
     Tortoise.getBackgroundWindow().setColor(Color.black);
-    Tortoise.getBackgroundWindow().getWindow().addPaintable(paintable);
+    Tortoise.getBackgroundWindow().getCanvas().add(paintable);
     Tortoise.show();
   }
   public static Turtle createTestTurtle()

TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/graders/QuizUtils.java

@@ -34,7 +34,7 @@ public void paint(Graphics2D g, JPanel caller)
   {
     this.answers[0] = quiz.leftClickWiredUp;
     this.answers[2] = quiz.rightClickWiredUp;
-    for (Paintable p : Tortoise.getBackgroundWindow().getAdditional())
+    for (Paintable p : Tortoise.getBackgroundWindow().getCanvas().getPainters())
     {
       try
       {

TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/quizzes/graders/SimpleBubbleQuizGrader.java

@@ -128,7 +128,6 @@ public String ___()
   }
   private Cursor getCursor()
   {
-    Cursor cursor = Tortoise.getBackgroundWindow().getWindow().getCursor();
-    return cursor;
+    return Tortoise.getBackgroundWindow().getCanvas().getCursor();
   }
 }

TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/DeepDive05Recursion.java

@@ -136,7 +136,6 @@ public String ___()
   }
   private Cursor getCursor()
   {
-    Cursor cursor = Tortoise.getBackgroundWindow().getWindow().getCursor();
-    return cursor;
+    return Tortoise.getBackgroundWindow().getCanvas().getCursor();
   }
 }

TeachingKidsProgramming/src/org/teachingkidsprogramming/section06modelviewcontroller/DeepDive06ModelViewController.java

@@ -149,8 +149,7 @@ private Tortoise[] throwPizzaParty()
     Tortoise cecil = new Tortoise();
     Tortoise michealangelo = new Tortoise();
     Tortoise fred = new Tortoise();
-    Tortoise[] tortoises = {karai, cecil, michealangelo, fred};
-    return tortoises;
+    return new Tortoise[]{karai, cecil, michealangelo, fred};
   }
   private boolean gotASlice;
   public boolean  _____     = false;
@@ -166,8 +165,7 @@ public String ___()
   }
   private Cursor getCursor()
   {
-    Cursor cursor = Tortoise.getBackgroundWindow().getWindow().getCursor();
-    return cursor;
+    return Tortoise.getBackgroundWindow().getCanvas().getCursor();
   }
   public DeepDive07Objects()
   {

TeachingKidsProgramming/src/org/teachingkidsprogramming/section07objects/DeepDive07Objects.java

@@ -20,7 +20,7 @@ public ConnectTheDots()
     //
     //    ------------- Recipe for clearTheScreen --#19.2
     //       Clear the Tortoise --#20.1
-    //       Write "Right click to clear" on the screen at position 100, 100 --#18
+    //       Write "Right click to clearWindow" on the screen at position 100, 100 --#18
     //    ------------- End of clearTheScreen Recipe --#19.3
     //
     //    prepareColorPalette (recipe below) --#17.1