24 files changed, 155 insertions, 64 deletions

diff --git a/src/esieequest/controller/commands/AleaCommand.java b/src/esieequest/controller/commands/AleaCommand.java
index ff73537..093f088 100644
--- a/src/esieequest/controller/commands/AleaCommand.java
+++ b/src/esieequest/controller/commands/AleaCommand.java
@@ -20,7 +20,7 @@ public class AleaCommand implements Executable {
                 final String forcedRoomName = argument;
                 Room destinationRoom = null;
 
-                if (forcedRoomName != null) {
+                if (!forcedRoomName.isEmpty()) {
                         try {
                                 destinationRoom = Room.valueOf(forcedRoomName.toUpperCase());
                         } catch (final Exception exception) {
diff --git a/src/esieequest/controller/commands/BackCommand.java b/src/esieequest/controller/commands/BackCommand.java
index d7ed8a3..b2322ed 100644
--- a/src/esieequest/controller/commands/BackCommand.java
+++ b/src/esieequest/controller/commands/BackCommand.java
@@ -1,6 +1,7 @@
 package esieequest.controller.commands;
 
 import esieequest.model.Game;
+import esieequest.model.Text;
 import esieequest.view.Viewable;
 
 /**
@@ -13,6 +14,11 @@ public class BackCommand implements Executable {
         @Override
         public void execute(final String argument, final Game game, final Viewable view) {
 
+                if (!argument.isEmpty()) {
+                        view.echo(Text.TOO_MANY_ARGUMENTS.toString());
+                        return;
+                }
+
                 game.getPlayer().goToPreviousRoom();
 
                 view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
diff --git a/src/esieequest/controller/commands/Command.java b/src/esieequest/controller/commands/Command.java
index 829ebf8..651d3da 100644
--- a/src/esieequest/controller/commands/Command.java
+++ b/src/esieequest/controller/commands/Command.java
@@ -28,7 +28,6 @@ public enum Command {
 
         // map related
         GO(new GoCommand()),
-        FORWARD(new ForwardCommand()),
         BACK(new BackCommand()),
         TURN(new TurnCommand()),
         LOOK(new LookCommand()),
@@ -70,7 +69,8 @@ public enum Command {
          *            the View
          */
         public void execute(final String argument, final Game game, final Viewable view) {
-                this.command.execute(argument, game, view);
+                final String arg = argument == null ? "" : argument;
+                this.command.execute(arg, game, view);
         }
 
         /**
diff --git a/src/esieequest/controller/commands/DoCommand.java b/src/esieequest/controller/commands/DoCommand.java
index 646ac2a..cb596e8 100644
--- a/src/esieequest/controller/commands/DoCommand.java
+++ b/src/esieequest/controller/commands/DoCommand.java
@@ -16,6 +16,11 @@ public class DoCommand implements Executable {
         @Override
         public void execute(final String argument, final Game game, final Viewable view) {
 
+                if (!argument.isEmpty()) {
+                        view.echo(Text.TOO_MANY_ARGUMENTS.toString());
+                        return;
+                }
+
                 final Side currentSide = game.getPlayer().getCurrentSide();
 
                 if (currentSide.hasCharacter()) {
diff --git a/src/esieequest/controller/commands/DropCommand.java b/src/esieequest/controller/commands/DropCommand.java
index dbdf03c..6ed2b81 100644
--- a/src/esieequest/controller/commands/DropCommand.java
+++ b/src/esieequest/controller/commands/DropCommand.java
@@ -18,7 +18,7 @@ public class DropCommand implements Executable {
 
                 final String itemName = argument;
 
-                if (itemName == null) {
+                if (itemName.isEmpty()) {
                         view.echo(Text.NO_ITEM_SPECIFIED.toString());
                         return;
                 }
diff --git a/src/esieequest/controller/commands/Executable.java b/src/esieequest/controller/commands/Executable.java
index 156fc1c..ab84b78 100644
--- a/src/esieequest/controller/commands/Executable.java
+++ b/src/esieequest/controller/commands/Executable.java
@@ -14,7 +14,7 @@ public interface Executable {
          * Performs the task corresponding to the Command.
          * 
          * @param argument
-         *            the argument to pass to the Command
+         *            the argument to pass to the Command (null if empty String)
          * @param game
          *            the Game model
          * @param view
diff --git a/src/esieequest/controller/commands/ForwardCommand.java b/src/esieequest/controller/commands/ForwardCommand.java
deleted file mode 100644
index 9134fdc..0000000
--- a/src/esieequest/controller/commands/ForwardCommand.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package esieequest.controller.commands;
-
-import esieequest.model.Game;
-import esieequest.model.map.Direction;
-import esieequest.view.Viewable;
-
-/**
- * Allows the user to move forward in the Map (in the Room at the Direction he
- * is facing).
- * 
- * @author Pacien TRAN-GIRARD
- */
-public class ForwardCommand implements Executable {
-
-        @Override
-        public void execute(final String argument, final Game game, final Viewable view) {
-
-                final Direction direction = game.getPlayer().getCurrentDirection();
-
-                Command.GO.execute(direction.name(), game, view);
-
-        }
-
-}
diff --git a/src/esieequest/controller/commands/GoCommand.java b/src/esieequest/controller/commands/GoCommand.java
index a68f5ad..4bcd0e1 100644
--- a/src/esieequest/controller/commands/GoCommand.java
+++ b/src/esieequest/controller/commands/GoCommand.java
@@ -17,22 +17,30 @@ public class GoCommand implements Executable {
         @Override
         public void execute(final String argument, final Game game, final Viewable view) {
 
-                final Direction direction;
+                Direction direction;
 
-                try {
-                        direction = Direction.valueOf(argument.toUpperCase());
-                } catch (final Exception exception) {
-                        view.echo(Text.NO_SUCH_DIRECTION.toString());
-                        return;
-                }
+                if (!argument.isEmpty()) {
 
-                final Door door = game.getPlayer().getCurrentRoom().getSide(direction).getDoor();
+                        try {
+                                direction = Direction.valueOf(argument.toUpperCase());
+                        } catch (final IllegalArgumentException e) {
+                                view.echo(Text.NO_SUCH_DIRECTION.toString());
+                                return;
+                        }
+
+                } else {
+
+                        direction = game.getPlayer().getCurrentDirection();
 
-                if (door == null) {
+                }
+
+                if (!game.getPlayer().getCurrentRoom().getSide(direction).hasDoor()) {
                         view.echo(Text.NO_DOOR.toString());
                         return;
                 }
 
+                final Door door = game.getPlayer().getCurrentRoom().getSide(direction).getDoor();
+
                 final boolean crossed = door.cross(game, view);