8 files changed, 96 insertions, 31 deletions

diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index fed79d6..c3a8725 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -41,7 +41,7 @@ public class GameEngine {
          *            the command String
          */
         public void interpret(final String inputString) {
-                final Input input = new Input(inputString);
+                final Input input = new Input(inputString.toLowerCase());
 
                 final Command command = input.getCommand();
                 if (command == null) {
diff --git a/src/esieequest/esieequest.gwt.xml b/src/esieequest/esieequest.gwt.xml
index 1a5c10c..b7dbcbf 100644
--- a/src/esieequest/esieequest.gwt.xml
+++ b/src/esieequest/esieequest.gwt.xml
@@ -19,6 +19,7 @@ so that your app can take advantage of the latest GWT module capabilities.
 
         <!-- Other module inherits                                      -->
         <inherits name="com.google.common.collect.Collect" />
+        <inherits name="net.pacien.util.pacienutils" />
 
         <!-- Specify the app entry point class.                         -->
         <entry-point class='esieequest.view.web.Main' />
diff --git a/src/esieequest/model/Player.java b/src/esieequest/model/Player.java
index 4060367..2ab8190 100644
--- a/src/esieequest/model/Player.java
+++ b/src/esieequest/model/Player.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
+import net.pacien.util.IntrinsicMap;
 import esieequest.controller.Utils;
 import esieequest.model.items.Item;
 import esieequest.model.map.Direction;
@@ -22,7 +23,7 @@ public class Player {
         private final Stack<Room> previousRooms;
         private Direction currentDirection;
 
-        private final List<Item> items;
+        private final IntrinsicMap<String, Item> items;
         private final int carryWeightLimit;
 
         private int nbSteps;
@@ -43,9 +44,9 @@ public class Player {
          */
         private Player(final Room currentRoom, final Direction currentDirection, final int carryWeightLimit, final int nbStepsLimit) {
                 this.currentRoom = currentRoom;
-                this.previousRooms = new Stack<Room>();
+                this.previousRooms = new Stack<>();
                 this.currentDirection = currentDirection;
-                this.items = new ArrayList<Item>();
+                this.items = new IntrinsicMap<>();
                 this.carryWeightLimit = carryWeightLimit;
                 this.nbSteps = 0;
                 this.nbStepsLimit = nbStepsLimit;
@@ -166,7 +167,7 @@ public class Player {
          * @return if the Player have the Item
          */
         public boolean hasItem(final Item item) {
-                return this.items.contains(item);
+                return this.items.containsValue(item);
         }
 
         /**
@@ -178,7 +179,7 @@ public class Player {
          * @return if the Player have the Item
          */
         public boolean hasItem(final String itemName) {
-                return this.getItem(itemName) != null;
+                return this.items.containsKey(itemName);
         }
 
         /**
@@ -186,7 +187,7 @@ public class Player {
          */
         public int getItemsWeight() {
                 int totalWeight = 0;
-                for (final Item item : this.items) {
+                for (final Item item : this.items.values()) {
                         totalWeight += item.getWeight();
                 }
                 return totalWeight;
@@ -199,7 +200,7 @@ public class Player {
          *            the Item to add
          */
         public void addItem(final Item item) {
-                this.items.add(item);
+                this.items.put(item);
         }
 
         /**
@@ -223,27 +224,12 @@ public class Player {
         }
 
         /**
-         * Lists all the Player's Item-s names.
-         * 
-         * @return the list of all the names of the Item-s
-         */
-        public List<String> listItemsNames() {
-                final ArrayList<String> itemsNamesList = new ArrayList<String>();
-
-                for (final Item item : this.items) {
-                        itemsNamesList.add(item.getName());
-                }
-
-                return itemsNamesList;
-        }
-
-        /**
          * Lists all the Player's Item-s names in a String.
          * 
          * @return the list of the Item-s in a String
          */
         public String listItemsNamesString() {
-                return Utils.listToString(this.listItemsNames(), Text.INVENTORY_PREFIX.getText(), Text.ITEMS_NO_ITEM.getText(), Text.INVENTORY_SUFFIX.getText());
+                return Utils.listToString(new ArrayList<String>(this.items.keySet()), Text.INVENTORY_PREFIX.getText(), Text.ITEMS_NO_ITEM.getText(), Text.INVENTORY_SUFFIX.getText());
         }
 
         /**
@@ -262,12 +248,7 @@ public class Player {
          * @return the Item
          */
         public Item getItem(final String itemName) {
-                for (final Item item : this.items) {
-                        if (item.getName().toLowerCase().equals(itemName.toLowerCase())) {
-                                return item;
-                        }
-                }
-                return null;
+                return this.items.get(itemName);
         }
 
         /**
diff --git a/src/esieequest/model/items/Item.java b/src/esieequest/model/items/Item.java
index 2a0aa2c..491b3ef 100644
--- a/src/esieequest/model/items/Item.java
+++ b/src/esieequest/model/items/Item.java
@@ -1,9 +1,10 @@
 package esieequest.model.items;
 
+import net.pacien.util.Mappable;
 import esieequest.model.Game;
 import esieequest.view.Viewable;
 
-public enum Item {
+public enum Item implements Mappable {
 
         // @formatter:off
         
@@ -64,4 +65,9 @@ public enum Item {
                 this.item.use(game, view);
         }
 
+        @Override
+        public Object getKey() {
+                return this.item.getName().toLowerCase();
+        }
+
 }
diff --git a/src/net/pacien/util/IntrinsicMap.java b/src/net/pacien/util/IntrinsicMap.java
new file mode 100644
index 0000000..a68dcbe
--- /dev/null
+++ b/src/net/pacien/util/IntrinsicMap.java
@@ -0,0 +1,59 @@
+/**
+ * 
+ */
+package net.pacien.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author pacien
+ *
+ */
+public class IntrinsicMap<K, V extends Mappable> extends HashMap<K, V> {
+
+        /**
+         * 
+         */
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 
+         */
+        public IntrinsicMap() {
+                super();
+        }
+
+        /**
+         * @param initialCapacity
+         */
+        public IntrinsicMap(int initialCapacity) {
+                super(initialCapacity);
+        }
+
+        /**
+         * @param m
+