Merge branch 'master' into master

docs/DeveloperGuide.adoc

@@ -1042,17 +1042,6 @@ field contents for each row. User then reviews the changes and generates a feedb
 Done by: yuhongherald
 User can set a custom keyword that is not used on top of the original command word.
 
-*Feature contribution*:
-
-- Importing job entries from an excel file (major enhancement)
-Done by: yuhongherald
-User can specify the file path to an excel file containing the job entries in columns, and header fields to indicate the
-field contents for each row. User then reviews the changes and generates a feedback document.
-
-- Setting custom command keywords (minor enhancement)
-Done by: yuhongherald
-User can set a custom keyword that is not used on top of the original command word.
-
 [appendix]
 == User Stories
 

src/main/java/seedu/address/logic/LogicManager.java

@@ -60,6 +60,11 @@ public ObservableList<Employee> getFilteredPersonList() {
         return model.getFilteredJobList();
     }
 
+    @Override
+    public ObservableList<Job> getFilteredJobList() {
+        return model.getFilteredJobList();
+    }
+
     @Override
     public ListElementPointer getHistorySnapshot() {
         return new ListElementPointer(history.getHistory());

src/main/java/seedu/address/model/AddressBook.java

@@ -237,6 +237,11 @@ public ObservableList<Employee> getEmployeeList() {
         return jobs.asObservableList();
     }
 
+    @Override
+    public ObservableList<Job> getJobList() {
+        return jobs.asObservableList();
+    }
+
     @Override
     public ObservableList<Tag> getTagList() {
         return tags.asObservableList();

src/main/java/seedu/address/model/Model.java

@@ -58,15 +58,15 @@ void updatePerson(Employee target, Employee editedEmployee)
     /** Returns an unmodifiable view of the filtered employee list */
     ObservableList<Employee> getFilteredPersonList();
 
-    /** Returns an unmodifiable view of the filtered employee list */
-    ObservableList<Job> getFilteredJobList();
-
     /**
      * Updates the filter of the filtered employee list to filter by the given {@code predicate}.
      * @throws NullPointerException if {@code predicate} is null.
      */
     void updateFilteredPersonList(Predicate<Employee> predicate);
 
+    /** Returns an unmodifiable view of the filtered job list */
+    ObservableList<Job> getFilteredJobList();
+
     /**
      * Updates the filter of the filtered job list to filter by the given {@code predicate}.
      * @throws NullPointerException if {@code predicate} is null.

src/main/java/seedu/address/model/ReadOnlyAddressBook.java

@@ -16,15 +16,14 @@ public interface ReadOnlyAddressBook {
      */
     ObservableList<Employee> getEmployeeList();
 
-    /**
-     * Returns an unmodifiable view of the jobs list.
-     * This list will not contain any duplicate jobs.
-     */
-    ObservableList<Job> getJobList();
-
     /**
      * Returns an unmodifiable view of the tags list.
      * This list will not contain any duplicate tags.
      */
     ObservableList<Tag> getTagList();
+
+    /**
+     * Returns an unmodifiable view of the jobs list.
+     */
+    ObservableList<Job> getJobList();
 }

src/test/java/seedu/address/model/AddressBookTest.java

@@ -77,6 +77,7 @@ private static class AddressBookStub implements ReadOnlyAddressBook {
         private final ObservableList<Employee> employees = FXCollections.observableArrayList();
         private final ObservableList<Job> jobs = FXCollections.observableArrayList();
         private final ObservableList<Tag> tags = FXCollections.observableArrayList();
+        private final ObservableList<Job> jobs = FXCollections.observableArrayList();
 
         AddressBookStub(Collection<Employee> employees, Collection<Job> jobs, Collection<? extends Tag> tags) {
             this.employees.setAll(employees);