Reformat imported code

1 files changed, 503 insertions, 527 deletions

diff --git a/src/ch/epfl/maze/graphics/Display.java b/src/ch/epfl/maze/graphics/Display.java
index ea08a06..2fddcf1 100644
--- a/src/ch/epfl/maze/graphics/Display.java
+++ b/src/ch/epfl/maze/graphics/Display.java
@@ -1,15 +1,12 @@
 package ch.epfl.maze.graphics;
 
-import java.awt.Canvas;
-import java.awt.Color;
-import java.awt.EventQueue;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
+import ch.epfl.maze.physical.World;
+import ch.epfl.maze.simulation.Simulation;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
 import java.awt.image.BufferStrategy;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -17,527 +14,506 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.imageio.ImageIO;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-import javax.swing.WindowConstants;
-
-import ch.epfl.maze.physical.World;
-import ch.epfl.maze.simulation.Simulation;
-
 /**
  * Handles the display of a {@code Simulation} on a window.
- * 
  */
 
 public final class Display implements Runnable {
 
-        /* constants */
-        public static final Color BACKGROUND_COLOR = Color.GRAY;
-        public static final int SQUARE_SIZE = 42;
-        public static final int BUFFERS_NUMBER = 2;
-        public static final int MAX_SPEED = 32;
-        public static final int DEFAULT_SPEED = 2;
-        public static final int MIN_SPEED = 1;
-        public static final int ANIMATION_SLEEP = 10;
-
-        /* lock for mutual exclusion between human interactions and display */
-        private final Object mLock = new Object();
-
-        /* simulation and animation handlers */
-        private final Simulation mSimulation;
-        private final Animation mAnimation;
-        private volatile float mSpeed;
-
-        /* actual window frame and canvas */
-        private JFrame mFrame;
-        private JMenuBar mMenuBar;
-        private Canvas mCanvas;
-
-        /* drawing buffers */
-        private BufferStrategy mStrategy;
-        private Map<Integer, BufferedImage> mTiles;
-
-        /* control variables */
-        private boolean mRunning;
-        private boolean mPaused;
-        private boolean mShowGrid;
-        private boolean mDebug;
-        private boolean mFinished;
-
-        /**
-         * Constructs a {@code Display} that will display a simulation.
-         * 
-         * @param simulation
-         *            A {@code Simulation} to display
-         */
-
-        public Display(Simulation simulation) {
-                // sanity check
-                if (simulation == null) {
-                        throw new IllegalArgumentException("Simulation must be defined.");
-                }
-                if (simulation.getWorld() == null) {
-                        throw new IllegalArgumentException("World in Simulation must be defined.");
-                }
-
-                // initiates instances
-                mSimulation = simulation;
-                mAnimation = new Animation(simulation.getWorld().getAnimals());
-                mSpeed = DEFAULT_SPEED;
-
-                // default control variables
-                mRunning = true;
-                mPaused = false;
-                mShowGrid = false;
-                mDebug = false;
-                mFinished = false;
-
-                // creates menu
-                createMenu();
-
-                // creates canvas
-                createCanvas();
-
-                // creates window
-                createWindow();
-
-                // sets canvas and menu on frame
-                mFrame.setJMenuBar(mMenuBar);
-                mFrame.add(mCanvas);
-                mFrame.pack();
-                mFrame.setLocationRelativeTo(null);
-
-                // creates buffer strategy
-                mCanvas.createBufferStrategy(BUFFERS_NUMBER);
-                mStrategy = mCanvas.getBufferStrategy();
-
-                // loads images of tiles
-                mTiles = new HashMap<Integer, BufferedImage>();
-                try {
-                        mTiles.put(World.FREE, ImageIO.read(new File("img/tiles/free.png")));
-                        mTiles.put(World.WALL, ImageIO.read(new File("img/tiles/wall.png")));
-                        mTiles.put(World.START, ImageIO.read(new File("img/tiles/start.png")));
-                        mTiles.put(World.EXIT, ImageIO.read(new File("img/tiles/exit.png")));
-                        mTiles.put(World.NOTHING, ImageIO.read(new File("img/tiles/nothing.png")));
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-        }
-
-        @Override
-        public void run() {
-                mFrame.setVisible(true);
-                mainLoop();
-                mFrame.dispose();
-        }
-
-        /**
-         * Sets the debug control.
-         * 
-         * @param debug
-         *            The new debug value
-         */
-
-        public void setDebug(boolean debug) {
-                mDebug = debug;
+    /* constants */
+    public static final Color BACKGROUND_COLOR = Color.GRAY;
+    public static final int SQUARE_SIZE = 42;
+    public static final int BUFFERS_NUMBER = 2;
+    public static final int MAX_SPEED = 32;
+    public static final int DEFAULT_SPEED = 2;
+    public static final int MIN_SPEED = 1;
+    public static final int ANIMATION_SLEEP = 10;
+
+    /* lock for mutual exclusion between human interactions and display */
+    private final Object mLock = new Object();
+
+    /* simulation and animation handlers */
+    private final Simulation mSimulation;
+    private final Animation mAnimation;
+    private volatile float mSpeed;
+
+    /* actual window frame and canvas */
+    private JFrame mFrame;
+    private JMenuBar mMenuBar;
+    private Canvas mCanvas;
+
+    /* drawing buffers */
+    private BufferStrategy mStrategy;
+    private Map<Integer, BufferedImage> mTiles;
+
+    /* control variables */
+    private boolean mRunning;
+    private boolean mPaused;
+    private boolean mShowGrid;
+    private boolean mDebug;
+    private boolean mFinished;
+
+    /**
+     * Constructs a {@code Display} that will display a simulation.
+     *
+     * @param simulation A {@code Simulation} to display
+     */
+
+    public Display(Simulation simulation) {
+        // sanity check
+        if (simulation == null) {
+            throw new IllegalArgumentException("Simulation must be defined.");
+        }
+        if (simulation.getWorld() == null) {
+            throw new IllegalArgumentException("World in Simulation must be defined.");
+        }
+
+        // initiates instances
+        mSimulation = simulation;
+        mAnimation = new Animation(simulation.getWorld().getAnimals());
+        mSpeed = DEFAULT_SPEED;
+
+        // default control variables
+        mRunning = true;
+        mPaused = false;
+        mShowGrid = false;
+        mDebug = false;
+        mFinished = false;
+
+        // creates menu
+        createMenu();
+
+        // creates canvas
+        createCanvas();
+
+        // creates window
+        createWindow();
+
+        // sets canvas and menu on frame
+        mFrame.setJMenuBar(mMenuBar);
+        mFrame.add(mCanvas);
+        mFrame.pack();
+        mFrame.setLocationRelativeTo(null);
+
+        // creates buffer strategy
+        mCanvas.createBufferStrategy(BUFFERS_NUMBER);
+        mStrategy = mCanvas.getBufferStrategy();
+
+        // loads images of tiles
+        mTiles = new HashMap<Integer, BufferedImage>();
+        try {
+            mTiles.put(World.FREE, ImageIO.read(new File("img/tiles/free.png")));
+            mTiles.put(World.WALL, ImageIO.read(new File("img/tiles/wall.png")));
+            mTiles.put(World.START, ImageIO.read(new File("img/tiles/start.png")));
+            mTiles.put(World.EXIT, ImageIO.read(new File("img/tiles/exit.png")));
+            mTiles.put(World.NOTHING, ImageIO.read(new File("img/tiles/nothing.png")));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void run() {
+        mFrame.setVisible(true);
+        mainLoop();
+        mFrame.dispose();
+    }
+
+    /**
+     * Sets the debug control.
+     *
+     * @param debug The new debug value
+     */
+
+    public void setDebug(boolean debug) {
+        mDebug = debug;
+        mShowGrid = debug;
+        createMenu();