Merge d732396 into d2ca28b

CS2103-AY1819S2-W10-3 · Mar 20, 2019 · eda201b · eda201b
2 parents d2ca28b + d732396
commit eda201b
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/src/main/java/seedu/address/model/EquipmentManager.java b/src/main/java/seedu/address/model/EquipmentManager.java
@@ -11,8 +11,6 @@
 import seedu.address.commons.util.InvalidationListenerManager;
 import seedu.address.model.equipment.Equipment;
 import seedu.address.model.equipment.UniqueEquipmentList;
-import seedu.address.model.equipment.UniqueWorkListList;
-import seedu.address.model.equipment.WorkList;
 import seedu.address.model.tag.Tag;
 
 /**

diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
@@ -7,7 +7,6 @@
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.model.equipment.Equipment;
-import seedu.address.model.equipment.WorkList;
 import seedu.address.model.tag.Tag;
 
 /**

diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -16,7 +16,6 @@
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.model.equipment.Equipment;
-import seedu.address.model.equipment.WorkList;
 import seedu.address.model.equipment.exceptions.EquipmentNotFoundException;
 import seedu.address.model.tag.Tag;
 

diff --git a/...s/model/equipment/UniqueWorkListList.java → ...edu/address/model/UniqueWorkListList.java b/...s/model/equipment/UniqueWorkListList.java → ...edu/address/model/UniqueWorkListList.java
@@ -1,4 +1,4 @@
-package seedu.address.model.equipment;
+package seedu.address.model;
 
 import static java.util.Objects.requireNonNull;
 //import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;

diff --git a/...edu/address/model/equipment/WorkList.java → ...in/java/seedu/address/model/WorkList.java b/...edu/address/model/equipment/WorkList.java → ...in/java/seedu/address/model/WorkList.java
@@ -1,11 +1,13 @@
-package seedu.address.model.equipment;
+package seedu.address.model;
 
 import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import seedu.address.model.equipment.Equipment;
+
 /**
  * Representing a WorkList containing the equipments users want to work on.
  */

diff --git a/...u/address/model/equipment/WorkListId.java → .../java/seedu/address/model/WorkListId.java b/...u/address/model/equipment/WorkListId.java → .../java/seedu/address/model/WorkListId.java
@@ -1,4 +1,4 @@
-package seedu.address.model.equipment;
+package seedu.address.model;
 
 /**
  * Representing the worklistid and the id is increasing based on the id history.

diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
@@ -23,8 +23,8 @@
 import seedu.address.model.Model;
 import seedu.address.model.ReadOnlyEquipmentManager;
 import seedu.address.model.ReadOnlyUserPrefs;
+import seedu.address.model.WorkList;
 import seedu.address.model.equipment.Equipment;
-import seedu.address.model.equipment.WorkList;
 import seedu.address.model.tag.Tag;
 import seedu.address.testutil.EquipmentBuilder;
 

diff --git a/...del/equipment/UniqueWorkListListTest.java → ...address/model/UniqueWorkListListTest.java b/...del/equipment/UniqueWorkListListTest.java → ...address/model/UniqueWorkListListTest.java
@@ -1,4 +1,4 @@
-package seedu.address.model.equipment;
+package seedu.address.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -21,6 +21,9 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+//import seedu.address.model.UniqueWorkListList;
+//import seedu.address.model.WorkList;
+
 import seedu.address.model.equipment.exceptions.DuplicateEquipmentException;
 import seedu.address.model.equipment.exceptions.EquipmentNotFoundException;
 //import seedu.address.testutil.EquipmentBuilder;

diff --git a/...address/model/equipment/WorkListTest.java → ...ava/seedu/address/model/WorkListTest.java b/...address/model/equipment/WorkListTest.java → ...ava/seedu/address/model/WorkListTest.java
@@ -1,4 +1,4 @@
-package seedu.address.model.equipment;
+package seedu.address.model;
 
 import static org.junit.Assert.assertTrue;
 //import static seedu.address.testutil.TypicalEquipments.ACHORVALECC;

diff --git a/src/test/java/seedu/address/testutil/TypicalWorkLists.java b/src/test/java/seedu/address/testutil/TypicalWorkLists.java
@@ -9,7 +9,7 @@
 
 import seedu.address.model.EquipmentManager;
 //import seedu.address.model.equipment.Equipment;
-import seedu.address.model.equipment.WorkList;
+import seedu.address.model.WorkList;
 
 /**
  * A utility class containing a list of {@code WorkList} objects to be used in tests.