Tag list can work in add command.

CS2103AUG2016-T16-C3 · Oct 30, 2016 · 2439881 · 2439881
1 parent 031d0fd
commit 2439881
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/main/java/seedu/manager/model/TaskManager.java b/src/main/java/seedu/manager/model/TaskManager.java
@@ -53,8 +53,21 @@ public ObservableList<Task> getTasks() {
 
     // @@author A0148042M
     public ObservableList<Tag> getTags() {
-//         return tags.getInternalList();
-        return getTagsFromTaskList(this.getTasks());
+        ObservableList<Tag> internalTagList = tags.getInternalList();
+        ObservableList<Tag> tagListFromTaskList = getTagsFromTaskList(this.getTasks());
+
+        return combineTwoList(internalTagList, tagListFromTaskList);
+    }
+
+    public ObservableList<Tag> combineTwoList(ObservableList<Tag> internalTagList, ObservableList<Tag> tagListFromTaskList) {
+        ObservableList<Tag> combinedTagList = internalTagList;
+        for(int i = 0;i < tagListFromTaskList.size();i++) {
+            if(!internalTagList.contains(tagListFromTaskList.get(i))) {
+                internalTagList.add(tagListFromTaskList.get(i));
+            }
+        }
+
+        return combinedTagList;
     }
 
     public ObservableList<Tag> getTagsFromTaskList(ObservableList<Task> taskList) {