Merge branch 'zuul-with-enums' into 'master'

Zuul With Enums

8 files changed, 63 insertions, 113 deletions

diff --git a/report/progression.tex b/report/progression.tex
index 94cc5b5..ccfff83 100644
--- a/report/progression.tex
+++ b/report/progression.tex
@@ -313,10 +313,15 @@ The commands test file was updated in the commit number 7b610fc05.
 
 \subsection{switch}
 
-\subsection{look with enum}
+The String switch statement was replaced by an enum switch with the
+commit number d24dd6cc9. Instead of using an HashMap to match entered Strings to
+the corresponding enum value, the valueOf() method was used.
 
 \subsection{help with enum}
 
+The help command now generates the list of the available commands from the enum
+with the commit number 159b168b2.
+
 
 \section{Zuul extended}
 
diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java
index 5c60f6d..32adeda 100644
--- a/src/esieequest/controller/Interpreter.java
+++ b/src/esieequest/controller/Interpreter.java
@@ -48,40 +48,40 @@ class Interpreter {
         public void dispatch(final Command command) {
                 if (command.getAction() != null) {
                         switch (command.getAction()) {
-                        case "new":
+                        case NEW:
                                 this.performer.newGame();
                                 return;
-                        case "load":
+                        case LOAD:
                                 this.performer.loadGame();
                                 return;
-                        case "save":
+                        case SAVE:
                                 this.performer.saveGame();
                                 return;
-                        case "sound":
+                        case SOUND:
                                 this.performer.toggleSound();
                                 return;
-                        case "go":
+                        case GO:
                                 this.performer.goTo(command.getOption());
                                 return;
-                        case "back":
+                        case BACK:
                                 this.performer.goBack();
                                 return;
-                        case "look":
+                        case LOOK:
                                 this.performer.look();
                                 return;
-                        case "inventory":
+                        case INVENTORY:
                                 this.performer.listItems();
                                 return;
-                        case "take":
+                        case TAKE:
                                 this.performer.take(command.getOption());
                                 return;
-                        case "drop":
+                        case DROP:
                                 this.performer.drop(command.getOption());
                                 return;
-                        case "help":
+                        case HELP:
                                 this.performer.showHelp();
                                 return;
-                        case "quit":
+                        case QUIT:
                                 this.performer.quitGame();
                                 return;
                         }
diff --git a/src/esieequest/controller/Parser.java b/src/esieequest/controller/Parser.java
index 452c27c..7b07efb 100644
--- a/src/esieequest/controller/Parser.java
+++ b/src/esieequest/controller/Parser.java
@@ -1,6 +1,7 @@
 package esieequest.controller;
 
 import esieequest.model.commands.Command;
+import esieequest.model.commands.CommandWord;
 
 /**
  * The command parser.
@@ -26,25 +27,20 @@ class Parser {
         public Command getCommand(final String commandString) {
                 final String[] elements = commandString.split(" ");
 
-                String action = null;
+                CommandWord action = null;
                 String option = null;
 
-                if (elements.length > 0) {
-                        action = elements[0];
-                }
-                if (elements.length > 1) {
-                        option = elements[1];
+                try {
+                        action = CommandWord.valueOf(elements[0].toUpperCase());
+                } catch (final Exception e) {
+                        action = CommandWord.UNKNOWN;
+                } finally {
+                        if (elements.length > 1) {
+                                option = elements[1];
+                        }
                 }
 
                 return new Command(action, option);
         }
 
-        /**
-         * Checks whether the command contains a valid action with a valid option.
-         */
-        private boolean validateCommand() {
-                // TODO
-                return true;
-        }
-
 }
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index 8f8afeb..7ba8c94 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -1,6 +1,10 @@
 package esieequest.controller;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import esieequest.model.Game;
+import esieequest.model.commands.CommandWord;
 import esieequest.model.items.Inventory;
 import esieequest.model.map.Room;
 import esieequest.view.View;
@@ -88,9 +92,11 @@ class Performer {
          * Displays the help message and the available commands.
          */
         public void showHelp() {
-                this.notImplemented();
-                // this.echo(this.game.getHelpMessage());
-                // TODO: list commands
+                final Set<String> commands = new HashSet<String>();
+                for (final CommandWord command : CommandWord.values()) {
+                        commands.add(command.name().toLowerCase());
+                }
+                this.echo(Utils.list(commands, "Commands:", "No commands."));
         }
 
         /**
diff --git a/src/esieequest/model/commands/Command.java b/src/esieequest/model/commands/Command.java
index ea33c35..15b4322 100644
--- a/src/esieequest/model/commands/Command.java
+++ b/src/esieequest/model/commands/Command.java
@@ -7,7 +7,7 @@ package esieequest.model.commands;
  */
 public class Command {
 
-        private final String action;
+        private final CommandWord action;
         private final String option;
 
         /**
@@ -18,7 +18,7 @@ public class Command {
          * @param option
          *            the option
          */
-        public Command(final String action, final String option) {
+        public Command(final CommandWord action, final String option) {
                 this.action = action;
                 this.option = option;
         }
@@ -28,7 +28,7 @@ public class Command {
          * 
          * @return the action
          */
-        public String getAction() {
+        public CommandWord getAction() {
                 return this.action;
         }
 
diff --git a/src/esieequest/model/commands/CommandWord.java b/src/esieequest/model/commands/CommandWord.java
index 2afa372..555fe15 100644
--- a/src/esieequest/model/commands/CommandWord.java
+++ b/src/esieequest/model/commands/CommandWord.java
@@ -1,71 +1,12 @@
 package esieequest.model.commands;