10 files changed, 138 insertions, 79 deletions

diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 830b48c..6267d1a 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -7,9 +7,7 @@ import esieequest.model.doors.HiddenDoor;
 import esieequest.model.doors.LockedDoor;
 import esieequest.model.doors.TransporterDoor;
 import esieequest.model.doors.TrapDoor;
-import esieequest.model.items.Beamer;
 import esieequest.model.items.Item;
-import esieequest.model.items.KeyCard;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
 
@@ -86,8 +84,15 @@ public class Game {
                 this.d(Room.SECRET_CORRIDOR_ENTRANCE, Direction.SOUTH, Room.SECRET_LAB);
                 this.d(Room.SECRET_CORRIDOR_ENTRANCE, Direction.EAST, Room.SECRET_CORRIDOR_END);
                 this.d(Room.SECRET_CORRIDOR_END, Direction.NORTH, new TrapDoor(Room.DEAD_END));
-                this.d(Room.SECRET_CORRIDOR_END, Direction.SOUTH, new LockedDoor(Room.LOCKED_ROOM));
-                this.d(Room.LOCKED_ROOM, Direction.NORTH, new LockedDoor(Room.SECRET_CORRIDOR_END));
+
+                final LockedDoor lockedDoorEnter = new LockedDoor(Room.LOCKED_ROOM);
+                lockedDoorEnter.setKey(Item.KEYCARD);
+                this.d(Room.SECRET_CORRIDOR_END, Direction.SOUTH, lockedDoorEnter);
+
+                final LockedDoor lockedDoorExit = new LockedDoor(Room.SECRET_CORRIDOR_END);
+                lockedDoorExit.setKey(Item.KEYCARD);
+                this.d(Room.LOCKED_ROOM, Direction.NORTH, lockedDoorExit);
+
                 this.d(Room.SECRET_CORRIDOR_END, Direction.EAST, new TransporterDoor(Room.values()));
         }
 
@@ -124,16 +129,13 @@ public class Game {
          * Adds Item-s in the map.
          */
         private void addItems() {
-                this.i(Room.STORAGE_ROOM, Direction.WEST, new Item("Weighted Storage Cube", 5, true));
-                this.i(Room.STORAGE_ROOM, Direction.EAST, new Item("Edgeless Safety Cube", 5, true));
-                this.i(Room.STORAGE_ROOM, Direction.NORTH, new Item("Portable black-hole", -10, false));
+                this.i(Room.STORAGE_ROOM, Direction.WEST, Item.STORAGE_CUBE);
+                this.i(Room.STORAGE_ROOM, Direction.EAST, Item.SAFETY_CUBE);
+                this.i(Room.STORAGE_ROOM, Direction.NORTH, Item.BLACK_HOLE);
 
-                this.i(Room.SECRET_LAB, Direction.SOUTH, new Beamer("Beamer"));
+                this.i(Room.SECRET_LAB, Direction.SOUTH, Item.BEAMER);
 
-                KeyCard keyCard = new KeyCard("KeyCard");
-                this.i(Room.DEAD_END, Direction.NORTH, keyCard);
-                ((LockedDoor) Room.SECRET_CORRIDOR_END.getSide(Direction.SOUTH).getDoor()).setKey(keyCard);
-                ((LockedDoor) Room.LOCKED_ROOM.getSide(Direction.NORTH).getDoor()).setKey(keyCard);
+                this.i(Room.DEAD_END, Direction.NORTH, Item.KEYCARD);
         }
 
         /**
diff --git a/src/esieequest/model/doors/LockedDoor.java b/src/esieequest/model/doors/LockedDoor.java
index 28c535e..49f61be 100644
--- a/src/esieequest/model/doors/LockedDoor.java
+++ b/src/esieequest/model/doors/LockedDoor.java
@@ -3,7 +3,7 @@ package esieequest.model.doors;
 import esieequest.model.Game;
 import esieequest.model.Player;
 import esieequest.model.Text;
-import esieequest.model.items.KeyCard;
+import esieequest.model.items.Item;
 import esieequest.model.map.Room;
 import esieequest.view.Viewable;
 
@@ -15,7 +15,7 @@ import esieequest.view.Viewable;
  */
 public class LockedDoor extends Door {
 
-        private KeyCard keyCard;
+        private Item key;
 
         /**
          * Creates a new locked door.
@@ -32,18 +32,18 @@ public class LockedDoor extends Door {
          * 
          * @return the KeyCard
          */
-        public KeyCard getKey() {
-                return this.keyCard;
+        public Item getKey() {
+                return this.key;
         }
 
         /**
          * Sets the KeyCard authorised to open this door.
          * 
-         * @param keyCard
+         * @param key
          *            the KeyCard to set
          */
-        public void setKey(final KeyCard keyCard) {
-                this.keyCard = keyCard;
+        public void setKey(final Item key) {
+                this.key = key;
         }
 
         @Override
@@ -65,7 +65,7 @@ public class LockedDoor extends Door {
          * @return if the Player is authorised to pass
          */
         private boolean isAuthorised(final Player player) {
-                return player.hasItem(this.keyCard);
+                return player.hasItem(this.key);
         }
 
 }
diff --git a/src/esieequest/model/items/Beamer.java b/src/esieequest/model/items/Beamer.java
index 61bef94..3a4ade9 100644
--- a/src/esieequest/model/items/Beamer.java
+++ b/src/esieequest/model/items/Beamer.java
@@ -12,7 +12,7 @@ import esieequest.view.Viewable;
  * 
  * @author Pacien TRAN-GIRARD
  */
-public class Beamer extends Item {
+public class Beamer extends SimpleItem {
 
         private Room room;
 
diff --git a/src/esieequest/model/items/Item.java b/src/esieequest/model/items/Item.java
index c6f872f..2a0aa2c 100644
--- a/src/esieequest/model/items/Item.java
+++ b/src/esieequest/model/items/Item.java
@@ -1,37 +1,28 @@
 package esieequest.model.items;
 
 import esieequest.model.Game;
-import esieequest.model.Text;
 import esieequest.view.Viewable;
 
-/**
- * Represents an item with a description and a weight, stored in a room. Can be
- * picked, used and dropped.
- * 
- * @author Pacien TRAN-GIRARD
- */
-public class Item {
+public enum Item {
 
-        private final String name;
-        private final int weight;
-        private final boolean droppable;
+        // @formatter:off
+        
+        STORAGE_CUBE(new SimpleItem("Weighted Storage Cube", 5, true)),
+        SAFETY_CUBE(new SimpleItem("Edgeless Safety Cube", 5, true)),
+        BLACK_HOLE(new SimpleItem("Portable black-hole", -10, false)),
+        
+        KEYCARD(new SimpleItem("KeyCard", 0, false)),
 
-        /**
-         * Creates an item with the given characteristics.
-         * 
-         * @param name
-         *            the description of the item
-         * @param weight
-         *            the weight of the item
-         */
-        public Item(final String name, final int weight, final boolean droppable) {
-                this.name = name;
-                this.weight = weight;
-                this.droppable = droppable;
-        }
+        BEAMER(new Beamer("Beamer")),
+        
+        ;
+        
+        // @formatter:on
+
+        private final SimpleItem item;
 
-        public Item(final String description, final boolean droppable) {
-                this(description, 0, droppable);
+        Item(final SimpleItem item) {
+                this.item = item;
         }
 
         /**
@@ -40,7 +31,7 @@ public class Item {
          * @return the description
          */
         public String getName() {
-                return this.name;
+                return this.item.getName();
         }
 
         /**
@@ -49,7 +40,7 @@ public class Item {
          * @return the weight
          */
         public int getWeight() {
-                return this.weight;
+                return this.item.getWeight();
         }