19 files changed, 62 insertions, 280 deletions

diff --git a/src/com/wordpress/tipsforjava/swing/StretchIcon.java b/src/com/wordpress/tipsforjava/swing/StretchIcon.java
index d41bbfe..7c7181f 100644
--- a/src/com/wordpress/tipsforjava/swing/StretchIcon.java
+++ b/src/com/wordpress/tipsforjava/swing/StretchIcon.java
@@ -31,6 +31,11 @@ import javax.swing.ImageIcon;
 public class StretchIcon extends ImageIcon {
 
         /**
+         * 
+         */
+        private static final long serialVersionUID = 6948448082634127156L;
+
+        /**
          * Determines whether the aspect ratio of the image is maintained. Set to
          * <code>false</code> to distort the image to fill the component.
          */
diff --git a/src/esieequest/controller/Input.java b/src/esieequest/controller/Input.java
index 4b4ada5..784985e 100644
--- a/src/esieequest/controller/Input.java
+++ b/src/esieequest/controller/Input.java
@@ -1,5 +1,6 @@
 package esieequest.controller;
 
+import lombok.Getter;
 import esieequest.controller.commands.Command;
 
 /**
@@ -9,7 +10,9 @@ import esieequest.controller.commands.Command;
  */
 public class Input {
 
+        @Getter
         private Command command;
+        @Getter
         private final String argument;
 
         /**
@@ -42,18 +45,4 @@ public class Input {
                 }
         }
 
-        /**
-         * @return the command
-         */
-        public Command getCommand() {
-                return this.command;
-        }
-
-        /**
-         * @return the argument
-         */
-        public String getArgument() {
-                return this.argument;
-        }
-
 }
diff --git a/src/esieequest/controller/commands/Executable.java b/src/esieequest/controller/commands/Executable.java
index 36ec6be..156fc1c 100644
--- a/src/esieequest/controller/commands/Executable.java
+++ b/src/esieequest/controller/commands/Executable.java
@@ -20,6 +20,6 @@ public interface Executable {
          * @param view
          *            the View
          */
-        public void execute(String argument, Game game, Viewable view);
+        public void execute(final String argument, final Game game, final Viewable view);
 
 }
diff --git a/src/esieequest/controller/utils/SerialisableObject.java b/src/esieequest/controller/utils/SerialisableObject.java
index 30b9c19..334f408 100644
--- a/src/esieequest/controller/utils/SerialisableObject.java
+++ b/src/esieequest/controller/utils/SerialisableObject.java
@@ -19,8 +19,9 @@ public interface SerialisableObject {
         /**
          * Deserialises from a JSONObject.
          * 
-         * @param o the JSONObject
+         * @param o
+         *            the JSONObject
          */
-        public void deserialise(JSONObject o);
+        public void deserialise(final JSONObject o);
 
 }
diff --git a/src/esieequest/controller/utils/package-info.java b/src/esieequest/controller/utils/package-info.java
index 088a127..2e6d871 100644
--- a/src/esieequest/controller/utils/package-info.java
+++ b/src/esieequest/controller/utils/package-info.java
@@ -2,3 +2,4 @@
  * A general utility package.
  */
 package esieequest.controller.utils;
+
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 7f124e7..05fdcd2 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -1,5 +1,7 @@
 package esieequest.model;
 
+import lombok.Getter;
+import lombok.Setter;
 import net.pacien.util.CleanJSONObject;
 
 import org.json.simple.JSONArray;
@@ -33,6 +35,8 @@ public class Game implements SerialisableObject {
         private final boolean challenge;
 
         private static final String PLAYER_LABEL = "P";
+        @Getter
+        @Setter
         private Player player;
 
         private static final String ROOMS_LABEL = "R";
@@ -72,23 +76,6 @@ public class Game implements SerialisableObject {
         }
 
         /**
-         * @return the player
-         */
-        public Player getPlayer() {
-                return this.player;
-        }
-
-        /**
-         * Sets the player
-         * 
-         * @param player
-         *            the Player to set
-         */
-        public void setPlayer(final Player player) {
-                this.player = player;
-        }
-
-        /**
          * Connects Room-s together using Door-s.
          */
         public void connectRooms() {
diff --git a/src/esieequest/model/Player.java b/src/esieequest/model/Player.java
index 371de84..68930e2 100644
--- a/src/esieequest/model/Player.java
+++ b/src/esieequest/model/Player.java
@@ -3,6 +3,8 @@ package esieequest.model;
 import java.util.ArrayList;
 import java.util.Stack;
 
+import lombok.Getter;
+import lombok.Setter;
 import net.pacien.util.CleanJSONObject;
 import net.pacien.util.IntrinsicMap;
 
@@ -26,18 +28,23 @@ import esieequest.model.map.Side;
 public class Player implements SerialisableObject {
 
         private static final String CURRENT_ROOM_LABEL = "R";
+        @Getter
+        @Setter
         private Room currentRoom;
 
         private static final String PREVIOUS_ROOMS_LABEL = "H";
         private final Stack<Room> previousRooms;
 
         private static final String CURRENT_DIRECTION_LABEL = "D";
+        @Getter
+        @Setter
         private Direction currentDirection;
 
         private static final String ITEMS_LABEL = "I";
         private final IntrinsicMap<String, Item> items;
 
         private static final String INVENTORY_WEIGHT_LIMIT_LABEL = "W";
+        @Getter
         private int inventoryWeightLimit;
 
         private static final String NB_STEPS_LABEL = "S";
@@ -70,72 +77,6 @@ public class Player implements SerialisableObject {
         }
 
         /**
-         * @return the current Room
-         */
-        public Room getCurrentRoom() {
-                return this.currentRoom;
-        }
-
-        /**
-         * @param currentRoom
-         *            the current Room to set