31 files changed, 84 insertions, 84 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index 4759a6e..974a6be 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -7,7 +7,7 @@ import javax.swing.JApplet;
 
 import esieequest.controller.GameEngine;
 import esieequest.model.Game;
-import esieequest.view.View;
+import esieequest.view.Viewable;
 import esieequest.view.app.Applet;
 import esieequest.view.app.Window;
 import esieequest.view.text.Console;
@@ -48,7 +48,7 @@ public class Main extends JApplet {
         public static void main(final String[] args) {
                 final List<String> arguments = Arrays.asList(args);
                 Game game;
-                View view;
+                Viewable view;
 
                 if (arguments.contains("--file")) {
                         if (arguments.size() < 2) {
diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index df3d34a..fed79d6 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -4,7 +4,7 @@ import esieequest.controller.commands.Command;
 import esieequest.model.Game;
 import esieequest.model.Text;
 import esieequest.model.characters.MovingCharacter;
-import esieequest.view.View;
+import esieequest.view.Viewable;
 
 /**
  * The game main controller class.
@@ -15,7 +15,7 @@ import esieequest.view.View;
 public class GameEngine {
 
         private final Game game;
-        private final View view;
+        private final Viewable view;
 
         /**
          * Instantiates a game engine with the given model and view.
@@ -25,7 +25,7 @@ public class GameEngine {
          * @param view
          *            the view
          */
-        public GameEngine(final Game game, final View view) {
+        public GameEngine(final Game game, final Viewable view) {
                 this.game = game;
                 this.view = view;
 
diff --git a/src/esieequest/controller/commands/AleaCommand.java b/src/esieequest/controller/commands/AleaCommand.java
index 2a5f5c4..33f4deb 100644
--- a/src/esieequest/controller/commands/AleaCommand.java
+++ b/src/esieequest/controller/commands/AleaCommand.java
@@ -4,7 +4,7 @@ import esieequest.model.Game;
 import esieequest.model.Text;
 import esieequest.model.doors.TransporterDoor;
 import esieequest.model.map.Room;
-import esieequest.view.View;
+import esieequest.view.Viewable;
 
 /**
  * Provides a way to override the random behaviour of TransporterDoor-s for
@@ -12,10 +12,10 @@ import esieequest.view.View;
  * 
  * @author Pacien TRAN-GIRARD
  */
-public class AleaCommand implements CommandInterface {
+public class AleaCommand implements Executable {
 
         @Override
-        public void execute(final String argument, final Game game, final View view) {
+        public void execute(final String argument, final Game game, final Viewable view) {
 
                 final String forcedRoomName = argument;
                 Room destinationRoom = null;
diff --git a/src/esieequest/controller/commands/BackCommand.java b/src/esieequest/controller/commands/BackCommand.java
index 8919540..627df59 100644
--- a/src/esieequest/controller/commands/BackCommand.java
+++ b/src/esieequest/controller/commands/BackCommand.java
@@ -1,17 +1,17 @@
 package esieequest.controller.commands;
 
 import esieequest.model.Game;
-import esieequest.view.View;
+import esieequest.view.Viewable;
 
 /**
  * Allows the user to go back on his steps and go to his previous location.
  * 
  * @author Pacien TRAN-GIRARD
  */
-public class BackCommand implements CommandInterface {
+public class BackCommand implements Executable {
 
         @Override
-        public void execute(final String argument, final Game game, final View view) {
+        public void execute(final String argument, final Game game, final Viewable view) {
 
                 game.getPlayer().goToPreviousRoom();
                 view.updateRoom(game.getPlayer().getCurrentRoom());
diff --git a/src/esieequest/controller/commands/Command.java b/src/esieequest/controller/commands/Command.java
index 9b032f7..7ab6961 100644
--- a/src/esieequest/controller/commands/Command.java
+++ b/src/esieequest/controller/commands/Command.java
@@ -6,7 +6,7 @@ import java.util.List;
 import esieequest.controller.Utils;
 import esieequest.model.Game;
 import esieequest.model.Text;
-import esieequest.view.View;
+import esieequest.view.Viewable;
 
 /**
  * The Command-s the user can use.
@@ -47,7 +47,7 @@ public enum Command {
 
         // @formatter:on
 
-        private CommandInterface command;
+        private Executable command;
 
         /**
          * Links an enum constant to a CommandInterface.
@@ -55,7 +55,7 @@ public enum Command {
          * @param command
          *            the CommandInterface
          */
-        Command(final CommandInterface command) {
+        Command(final Executable command) {
                 this.command = command;
         }
 
@@ -69,7 +69,7 @@ public enum Command {
          * @param view
          *            the View
          */
-        public void execute(final String argument, final Game game, final View view) {
+        public void execute(final String argument, final Game game, final Viewable view) {
                 this.command.execute(argument, game, view);
         }
 
diff --git a/src/esieequest/controller/commands/DoCommand.java b/src/esieequest/controller/commands/DoCommand.java
index e99c67d..219dba9 100644
--- a/src/esieequest/controller/commands/DoCommand.java
+++ b/src/esieequest/controller/commands/DoCommand.java
@@ -3,7 +3,7 @@ package esieequest.controller.commands;