Merge branch 'zuul-with-items-v1' into 'master'

Zuul With Items V1

18 files changed, 475 insertions, 353 deletions

diff --git a/report/progression.tex b/report/progression.tex
index 215ab82..6600430 100644
--- a/report/progression.tex
+++ b/report/progression.tex
@@ -183,12 +183,22 @@ separate the logic from the data storage as part of commit bd639caa0.
 
 \subsection{Item}
 
+Item support was added as part of commit 3fc06f393.
+
 \subsection{item description}
 
+In order to respect the MVC pattern, the Performer controller should get the
+description from the Item model and ask the View to display it.
+
 \subsection{items}
 
+A Room can contain multiple items since commit 04f03d128.
+
 \subsection{Collection choice}
 
+The collection chosen to implement the multiple items support was the HashMap in
+order to associate an item name (String) to an Item, so that the user is able
+to perform actions on a particular one (take, drop, use, etc\ldots).
 
 \section{Zuul with history}
 
diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index 5a08f1d..b4bfb59 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -25,28 +25,28 @@ public class Main extends JApplet {
         /**
          * 
          */
-        private static final long serialVersionUID = 1726402114771940798L;
+        private static long serialVersionUID = 1726402114771940798L;
 
         public void init() {
                 // applet
-                Game vGame = new Game();
-                Applet vApplet = new Applet(this);
-                new GameEngine(vGame, vApplet);
+                Game game = new Game();
+                Applet applet = new Applet(this);
+                new GameEngine(game, applet);
         }
 
-        public static void main(final String[] pArgs) {
+        public static void main(String[] args) {
                 // cli or standalone
-                Game vGame = new Game();
-                View vView;
+                Game game = new Game();
+                View view;
 
-                if (Arrays.asList(pArgs).contains("--nogui")) {
-                        vView = new Console();
+                if (Arrays.asList(args).contains("--nogui")) {
+                        view = new Console();
 
                 } else {
-                        vView = new Window();
+                        view = new Window();
                 }
 
-                new GameEngine(vGame, vView);
+                new GameEngine(game, view);
         }
 
 }
diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index 3999cd0..4a1f47f 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -14,35 +14,35 @@ import esieequest.view.View;
  */
 public class GameEngine {
 
-        private Game aGame;
-        private View aView;
+        private Game game;
+        private View view;
 
-        private Interpreter aInterpreter;
+        private Interpreter interpreter;
 
-        public GameEngine(final Game pGame, final View pView) {
-                this.aGame = pGame;
-                this.aView = pView;
+        public GameEngine(Game game, View view) {
+                this.game = game;
+                this.view = view;
 
-                this.aView.setModel(pGame);
-                this.aView.setController(this);
+                this.view.setModel(game);
+                this.view.setController(this);
 
-                this.aInterpreter = new Interpreter(this.aGame, this.aView);
+                this.interpreter = new Interpreter(this.game, this.view);
 
                 this.startGame();
                 this.startView();
         }
 
         private void startGame() {
-                this.aGame.setRunning(true);
-                this.aInterpreter.interpret("new");
+                this.game.setRunning(true);
+                this.interpreter.interpret("new");
         }
 
         private void startView() {
-                this.aView.enable();
+                this.view.enable();
         }
 
-        public void interpret(final String pCommandString) {
-                this.aInterpreter.interpret(pCommandString);
+        public void interpret(String commandString) {
+                this.interpreter.interpret(commandString);
         }
 
 }
diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java
index b4fbb3e..55d468b 100644
--- a/src/esieequest/controller/Interpreter.java
+++ b/src/esieequest/controller/Interpreter.java
@@ -13,52 +13,52 @@ import esieequest.view.View;
  */
 public class Interpreter {
 
-        private Performer aPerformer;
-        private Parser aParser;
+        private Performer performer;
+        private Parser parser;
 
-        public Interpreter(final Game pGame, final View pView) {
-                this.aPerformer = new Performer(pGame, pView);
-                this.aParser = new Parser();
+        public Interpreter(Game game, View view) {
+                this.performer = new Performer(game, view);
+                this.parser = new Parser();
         }
 
-        public void interpret(String pCommandString) {
-                Command vCommand = this.aParser.getCommand(pCommandString);
-                this.dispatch(vCommand);
+        public void interpret(String commandString) {
+                Command command = this.parser.getCommand(commandString);
+                this.dispatch(command);
         }
 
-        public void dispatch(final Command pCommand) {
-                if (pCommand.getAction() != null) {
-                        switch (pCommand.getAction()) {
+        public void dispatch(Command command) {
+                if (command.getAction() != null) {
+                        switch (command.getAction()) {
                         case "new":
-                                this.aPerformer.newGame();
+                                this.performer.newGame();
                                 return;
                         case "load":
-                                this.aPerformer.loadGame();
+                                this.performer.loadGame();
                                 return;
                         case "save":
-                                this.aPerformer.saveGame();
+                                this.performer.saveGame();
                                 return;
                         case "sound":
-                                this.aPerformer.toggleSound();
+                                this.performer.toggleSound();
                                 return;
                         case "go":
-                                this.aPerformer.goTo(pCommand.getOption());
+                                this.performer.goTo(command.getOption());
                                 return;
                         case "look":
-                                this.aPerformer.look();
+                                this.performer.look();