37 files changed, 4543 insertions, 4744 deletions

diff --git a/src/ch/epfl/maze/graphics/Animation.java b/src/ch/epfl/maze/graphics/Animation.java
index 0502a92..47e0fc8 100644
--- a/src/ch/epfl/maze/graphics/Animation.java
+++ b/src/ch/epfl/maze/graphics/Animation.java
@@ -1,6 +1,12 @@
 package ch.epfl.maze.graphics;
 
-import java.awt.Graphics2D;
+import ch.epfl.maze.physical.Animal;
+import ch.epfl.maze.util.Action;
+import ch.epfl.maze.util.Direction;
+import ch.epfl.maze.util.Vector2D;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
 import java.io.File;
@@ -10,236 +16,231 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.imageio.ImageIO;
-
-import ch.epfl.maze.physical.Animal;
-import ch.epfl.maze.util.Action;
-import ch.epfl.maze.util.Direction;
-import ch.epfl.maze.util.Vector2D;
-
 /**
  * Handles the animation of a {@code Simulation} by extrapolating the positions
  * of animals.
- * 
  */
 
 public final class Animation {
 
-        /** Default number of waiting frames to display when animation is aborting. */
-        public static final int DEFAULT_WAITING_FRAMES = 2;
-
-        /** Maps animals identity to graphical components that will be  animated. */
-        private Map<Integer, GraphicComponent> mGraphMap;
-
-        /** Buffer of images of animals. Key format: "superclass.class" */
-        private Map<String, BufferedImage> mImages;
-
-        /** Drawing ratio variable. */
-        private float mRatio;
-
-        /** Control variable. */
-        private boolean mDone;
-
-        /** Current number of waiting frames, to prevent screen from flashing. */
-        private int mWaitingFrames;
-
-        /**
-         * Constructs an animation handler that will animate animals on a graphic
-         * environment by extrapolating their position.
-         * 
-         * @param animals
-         *            The {@code List} of animals that will be shown on the first
-         *            frame
-         */
-
-        public Animation(List<Animal> animals) {
-                mGraphMap = new TreeMap<Integer, GraphicComponent>();
-                mImages = new HashMap<String, BufferedImage>();
-
-                // sanity check
-                if (animals != null) {
-                        // puts default action to draw animals and loads corresponding image
-                        Action none = new Action(Direction.NONE);
-                        for (int i = 0; i < animals.size(); i++) {
-                                Animal animal = animals.get(i);
-                                BufferedImage img = loadImage(animal);
-                                Vector2D position = animal.getPosition().mul(Display.SQUARE_SIZE);
-        
-                                mGraphMap.put(i, new GraphicComponent(img, position, none));
-                        }
-                }
-
-                // default values
-                mDone = true;
-                mWaitingFrames = 0;
-        }
-
-        /**
-         * Asks the animation to update an animal on the screen with a corresponding
-         * action. The animal is identified by a number, so it can be overwritten in
-         * case of a future update.
-         * 
-         * @param animal
-         *            Animal to update with action
-         * @param id
-         *            Unique identifier for animal
-         * @param action
-         *            Action that animal needs to perform
-         */
-
-        public void update(Animal animal, int id, Action action) {
-                // sanity checks
-                if (action == null) {
-                        action = new Action(Direction.NONE, false);
-                }
-                if (animal != null) {
-                        // retrieves BufferedImage
-                        String folder = animal.getClass().getSuperclass().getSimpleName();
-                        String file = animal.getClass().getSimpleName();
-                        BufferedImage img = mImages.get(folder + "." + file);
-                        if (img == null) {
-                                img = loadImage(animal);
-                        }
-        
-                        // transforms position
-                        Vector2D position = animal.getPosition().mul(Display.SQUARE_SIZE);
-        
-                        mGraphMap.put(id, new GraphicComponent(img, position, action));
+    /**
+     * Default number of waiting frames to display when animation is aborting.
+     */
+    public static final int DEFAULT_WAITING_FRAMES = 2;
+
+    /**
+     * Maps animals identity to graphical components that will be  animated.
+     */
+    private Map<Integer, GraphicComponent> mGraphMap;
+
+    /**
+     * Buffer of images of animals. Key format: "superclass.class"
+     */
+    private Map<String, BufferedImage> mImages;
+
+    /**
+     * Drawing ratio variable.
+     */
+    private float mRatio;
+
+    /**
+     * Control variable.
+     */
+    private boolean mDone;
+
+    /**
+     * Current number of waiting frames, to prevent screen from flashing.
+     */
+    private int mWaitingFrames;
+
+    /**
+     * Constructs an animation handler that will animate animals on a graphic
+     * environment by extrapolating their position.
+     *
+     * @param animals The {@code List} of animals that will be shown on the first
+     *                frame
+     */
+
+    public Animation(List<Animal> animals) {
+        mGraphMap = new TreeMap<Integer, GraphicComponent>();
+        mImages = new HashMap<String, BufferedImage>();
+
+        // sanity check
+        if (animals != null) {
+            // puts default action to draw animals and loads corresponding image
+            Action none = new Action(Direction.NONE);
+            for (int i = 0; i < animals.size(); i++) {
+                Animal animal = animals.get(i);
+                BufferedImage img = loadImage(animal);
+                Vector2D position = animal.getPosition().mul(Display.SQUARE_SIZE);
+
+                mGraphMap.put(i, new GraphicComponent(img, position, none));
+            }
+        }
+
+        // default values
+        mDone = true;
+        mWaitingFrames = 0;
+    }
+
+    /**
+     * Asks the animation to update an animal on the screen with a corresponding
+     * action. The animal is identified by a number, so it can be overwritten in
+     * case of a future update.
+     *
+     * @param animal Animal to update with action
+     * @param id     Unique identifier for animal
+     * @param action Action that animal needs to perform
+     */
+
+    public void update(Animal animal, int id, Action action) {
+        // sanity checks
+        if (action == null) {
+            action = new Action(Direction.NONE, false);
+        }
+        if (animal != null) {
+            // retrieves BufferedImage
+            String folder = animal.getClass().getSuperclass().getSimpleName();
+            String file = animal.getClass().getSimpleName();
+            Buffe