Merge remote-tracking branch 'origin/master'

Author: Airels

src/main/java/fr/univ_amu/heromanager/model/job/Job.java

@@ -571,10 +571,18 @@ public List<Item> getInventory() {
         return inventory;
     }
 
+    /**
+     * set inventory to given inventory
+     * @param inventory
+     */
     public void setInventory(List<Item> inventory) {
         this.inventory = inventory;
     }
 
+    /**
+     * remove given equipment from inventory
+     * @param equipment
+     */
     public void removeFromInventory(Equipment equipment) {
         if (equipment == null) {
             return;
@@ -586,7 +594,7 @@ public void removeFromInventory(Equipment equipment) {
             }
 
         }
-        inventory = newInventory;
+        setInventory(newInventory);
     }
 
     /**
@@ -678,6 +686,11 @@ private void setSpellSlots(int level) {
         }
     }
 
+    /**
+     * set spellSlot
+     * @param spellSlots
+     */
+
     public void setSpellSlots(int[] spellSlots) {
         this.spellSlots = spellSlots;
     }