Merges

Author: jamesrcounts

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

@@ -1,67 +1,67 @@
 package org.teachingextensions.logo;
 
-import org.teachingextensions.approvals.lite.util.ObjectUtils;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
 
-import java.awt.*;
+import org.teachingextensions.approvals.lite.util.ObjectUtils;
 
 /**
  * A tile is a square on the board with an image on it.
  */
-public class Tile {
-  private static final String[] resources = {
-      "Batgirl1a.png", "Batgirl2a.png", "Batgirl3a.png",
-      "Batgirl1b.png", "Batgirl2b.png", "Batgirl3b.png",
-      "Batgirl1c.png", "Batgirl2c.png", "Batgirl3c.png"
-  };
-
-  private static final Point origin = new Point(35, 35);
-
-  private final Image image;
-  private final Dimension dimension = new Dimension(122, 122);
-  private       Point position;
-  private Point target;
-
-  public Tile(int cell, int image) {
+public class Tile
+{
+  private static final String[] resources = {"Batgirl1a.png",
+      "Batgirl2a.png",
+      "Batgirl3a.png",
+      "Batgirl1b.png",
+      "Batgirl2b.png",
+      "Batgirl3b.png",
+      "Batgirl1c.png",
+      "Batgirl2c.png",
+      "Batgirl3c.png"                     };
+  private static final Point    origin    = new Point(35, 35);
+  private final Image           image;
+  private final Dimension       dimension = new Dimension(122, 122);
+  private Point                 position;
+  private Point                 target;
+  public Tile(int cell, int image)
+  {
     this.position = getPosition(cell);
     this.image = getImage(image);
   }
-
-  public static Point getPosition(int cell) {
+  public static Point getPosition(int cell)
+  {
     Point offset = Puzzle.getPosition(cell);
     return new Point(origin.x + (127 * offset.x), origin.y + (127 * offset.y));
   }
-
-  private static Image getImage(int image) {
+  private static Image getImage(int image)
+  {
     return ObjectUtils.loadImage(Tile.class, resources[image]);
   }
-
-  private static int stepTowardGoal(int current, int goal) {
-    if (current < goal) {
-      return current + 1;
-    }
-    if (goal < current) {
-      return current - 1;
-    }
+  private static int stepTowardGoal(int current, int goal)
+  {
+    if (current < goal) { return current + 1; }
+    if (goal < current) { return current - 1; }
     return current;
   }
-
-  public void paint(Graphics2D g2d) {
-    g2d.drawImage(this.image, this.position.x, this.position.y, this.dimension.width, this.dimension.height,
-        null);
+  public void paint(Graphics2D g2d)
+  {
+    g2d.drawImage(this.image, this.position.x, this.position.y, this.dimension.width, this.dimension.height, null);
   }
-
-  public boolean isAtTarget() {
-    return target == null ||
-        (target.x == position.x && target.y == position.y);
+  public boolean isAtTarget()
+  {
+    return target == null || (target.x == position.x && target.y == position.y);
   }
-
-  public void step() {
+  public void step()
+  {
     int x = stepTowardGoal(position.x, target.x);
     int y = stepTowardGoal(position.y, target.y);
     this.position = new Point(x, y);
   }
-
-  public void moveTo(Point goal) {
+  public void moveTo(Point goal)
+  {
     target = goal;
   }
 }

…recipes/inDevelopment/SpiderWebQuiz.java …recipes/inDevelopment/SpiderWebQuiz.javasrc/org/teachingkidsprogramming/recipes/inDevelopment/SpiderWebQuiz.java renamed to src/main/java/org/teachingkidsprogramming/recipes/inDevelopment/SpiderWebQuiz.java src/org/teachingkidsprogramming/recipes/inDevelopment/SpiderWebQuiz.java renamed to src/main/java/org/teachingkidsprogramming/recipes/inDevelopment/SpiderWebQuiz.java

@@ -7,7 +7,6 @@
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 
-import org.teachingextensions.approvals.lite.util.MySystem;
 import org.teachingextensions.logo.AStarPlayer;
 import org.teachingextensions.logo.Puzzle;
 import org.teachingextensions.logo.PuzzleAnimation;
@@ -44,7 +43,6 @@ public void run()
     //    int[] cells = {0, 1, 2, 3, 4, 5, 6, 7, 8};
     //    int[] shuffled = shuffled(cells);
     int[] shuffled = {5, 6, 2, 4, 1, 8, 7, 0, 3}; // known to be solvable
-    MySystem.message(Arrays.toString(shuffled));
     Puzzle puzzle = new Puzzle(shuffled);
     PuzzlePlayer player = new AStarPlayer(puzzle);
     PuzzleState solution = player.solve();