Refactor graphical and web interfaces

27 files changed, 308 insertions, 226 deletions

diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index df83384..8e53888 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -67,7 +67,7 @@ public class GameEngine {
 
                 final Command command = input.getCommand();
                 if (command == null) {
-                        this.view.echo(Text.UNKNOWN_COMMAND.getText());
+                        this.view.echo(Text.UNKNOWN_COMMAND.toString());
                         return;
                 }
 
diff --git a/src/esieequest/controller/commands/AleaCommand.java b/src/esieequest/controller/commands/AleaCommand.java
index 33f4deb..ff73537 100644
--- a/src/esieequest/controller/commands/AleaCommand.java
+++ b/src/esieequest/controller/commands/AleaCommand.java
@@ -24,12 +24,12 @@ public class AleaCommand implements Executable {
                         try {
                                 destinationRoom = Room.valueOf(forcedRoomName.toUpperCase());
                         } catch (final Exception exception) {
-                                view.echo(Text.NO_SUCH_ROOM.getText());
+                                view.echo(Text.NO_SUCH_ROOM.toString());
                                 return;
                         }
-                        view.echo(Text.ALEA_OVERRIDE_ENABLED.getText());
+                        view.echo(Text.ALEA_OVERRIDE_ENABLED.toString());
                 } else {
-                        view.echo(Text.ALEA_OVERRIDE_DISABLED.getText());
+                        view.echo(Text.ALEA_OVERRIDE_DISABLED.toString());
                 }
 
                 TransporterDoor.forceDestination(destinationRoom);
diff --git a/src/esieequest/controller/commands/Command.java b/src/esieequest/controller/commands/Command.java
index 094b0cf..ca8909c 100644
--- a/src/esieequest/controller/commands/Command.java
+++ b/src/esieequest/controller/commands/Command.java
@@ -94,7 +94,7 @@ public enum Command {
          * @return a String listing all the names of the Command-s
          */
         public static String listCommandsNamesString() {
-                return ListUtils.listToString(Command.listCommandsNames(), Text.HELP_PREFIX.getText(), null, Text.HELP_SUFFIX.getText());
+                return ListUtils.listToString(Command.listCommandsNames(), Text.HELP_PREFIX.toString(), null, Text.HELP_SUFFIX.toString());
         }
 
 }
diff --git a/src/esieequest/controller/commands/DoCommand.java b/src/esieequest/controller/commands/DoCommand.java
index 95269de..646ac2a 100644
--- a/src/esieequest/controller/commands/DoCommand.java
+++ b/src/esieequest/controller/commands/DoCommand.java
@@ -28,7 +28,7 @@ public class DoCommand implements Executable {
                         return;
                 }
 
-                view.echo(Text.NOTHING_TO_DO.getText());
+                view.echo(Text.NOTHING_TO_DO.toString());
 
         }
 
diff --git a/src/esieequest/controller/commands/DropCommand.java b/src/esieequest/controller/commands/DropCommand.java
index b253d98..4e6f877 100644
--- a/src/esieequest/controller/commands/DropCommand.java
+++ b/src/esieequest/controller/commands/DropCommand.java
@@ -19,12 +19,12 @@ public class DropCommand implements Executable {
                 final String itemName = argument;
 
                 if (itemName == null) {
-                        view.echo(Text.NO_ITEM_SPECIFIED.getText());
+                        view.echo(Text.NO_ITEM_SPECIFIED.toString());
                         return;
                 }
 
                 if (!game.getPlayer().getInventory().hasItem(itemName)) {
-                        view.echo(Text.NO_SUCH_ITEM.getText());
+                        view.echo(Text.NO_SUCH_ITEM.toString());
                         return;
                 }
 
diff --git a/src/esieequest/controller/commands/GoCommand.java b/src/esieequest/controller/commands/GoCommand.java
index 1c528fa..f536f64 100644
--- a/src/esieequest/controller/commands/GoCommand.java
+++ b/src/esieequest/controller/commands/GoCommand.java
@@ -22,14 +22,14 @@ public class GoCommand implements Executable {
                 try {
                         direction = Direction.valueOf(argument.toUpperCase());
                 } catch (final Exception exception) {
-                        view.echo(Text.NO_SUCH_DIRECTION.getText());
+                        view.echo(Text.NO_SUCH_DIRECTION.toString());
                         return;
                 }
 
                 final Door door = game.getPlayer().getCurrentRoom().getSide(direction).getDoor();
 
                 if (door == null) {
-                        view.echo(Text.NO_DOOR.getText());
+                        view.echo(Text.NO_DOOR.toString());
                         return;
                 }
 
@@ -43,7 +43,7 @@ public class GoCommand implements Executable {
 
                 // handle challenge mode
                 if (game.getPlayer().walk()) {
-                        view.echo(Text.CHALLENGE_FAILED.getText());
+                        view.echo(Text.CHALLENGE_FAILED.toString());
                         view.disable();
                 }
 
diff --git a/src/esieequest/controller/commands/LoadCommand.java b/src/esieequest/controller/commands/LoadCommand.java
index 807b3b3..8d6fd29 100644
--- a/src/esieequest/controller/commands/LoadCommand.java
+++ b/src/esieequest/controller/commands/LoadCommand.java
@@ -24,7 +24,7 @@ public class LoadCommand implements Executable {
                 try {
                         datas = (JSONObject) JSONValue.parseWithException(jsonString);
                 } catch (final ParseException e) {
-                        view.echo(Text.PARSING_ERROR_PREFIX.getText() + e.getMessage() + Text.PARSING_ERROR_SUFFIX.getText());
+                        view.echo(Text.PARSING_ERROR_PREFIX.toString() + e.getMessage() + Text.PARSING_ERROR_SUFFIX.toString());
                         return;
                 }
 
@@ -32,7 +32,7 @@ public class LoadCommand implements Executable {
                         game.newGame(false, false);
                         game.deserialise(datas);
                 } catch (final Exception e) {
-                        view.echo(Text.DESERIALISING_ERROR_PREFIX.getText() + e.getMessage() + Text.DESERIALISING_ERROR_SUFFIX.getText());
+                        view.echo(Text.DESERIALISING_ERROR_PREFIX.toString() + e.getMessage() + Text.DESERIALISING_ERROR_SUFFIX.toString());
                         e.printStackTrace();
                         return;
                 }
diff --git a/src/esieequest/controller/commands/LookCommand.java b/src/esieequest/controller/commands/LookCommand.java
index 5006a66..ece4ddc 100644
--- a/src/esieequest/controller/commands/LookCommand.java
+++ b/src/esieequest/controller/commands/LookCommand.java
@@ -23,7 +23,7 @@ public class LookCommand implements Executable {
                 informations.add(game.getPlayer().getCurrentRoom().getInformations());
                 informations.add(Text.DIRECTION_PREFIX + game.getPlayer().getCurrentDirection().name().toLowerCase() + Text.DIRECTION_SUFFIX);
 
-                view.echo(Joiner.on(Text.NEW_LINE.getText()).join(informations));
+                view.echo(Joiner.on(Text.NEW_LINE.toString()).join(informations));
 
         }
 }
diff --git a/src/esieequest/controller/commands/NewCommand.java b/src/esieequest/controller/commands/NewCommand.java
index 7b510e4..4ce45d0 100644
--- a/src/esieequest/controller/commands/NewCommand.java
+++ b/src/esieequest/controller/commands/NewCommand.java
@@ -25,7 +25,7 @@ public class NewCommand implements Executable {
                 view.enable();
 
                 view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer().getCurrentDirection(), game.getPlayer().getCurrentSide());