Change the way to implement the selection of respective task list whe…

…n tag is clicked.
CS2103AUG2016-T16-C3 · Nov 7, 2016 · d8924c9 · d8924c9
1 parent 59458d8
commit d8924c9
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 44 deletions.
diff --git a/src/main/java/seedu/manager/logic/Logic.java b/src/main/java/seedu/manager/logic/Logic.java
@@ -19,13 +19,6 @@ public interface Logic {
 
     /** Returns the filtered list of tasks */
     ObservableList<ReadOnlyTask> getSortedFilteredTaskList();
-
-    // @@author A0148042M
-    /**
-     * Updates the task list to be related to tag selected.
-     * @param selectedTag
-     */
-    void updateTaskListWhenTagSelected(Tag selectedTag);
 
     /** Returns the filtered list of tags */
     ObservableList<Tag> getSortedFilteredTagList();

diff --git a/src/main/java/seedu/manager/logic/LogicManager.java b/src/main/java/seedu/manager/logic/LogicManager.java
@@ -48,14 +48,6 @@ public ObservableList<ReadOnlyTask> getSortedFilteredTaskList() {
     }
 
     // @@author A0148042M
-    @Override
-    /**
-     * Update the task list that contains selected tag
-     */
-    public void updateTaskListWhenTagSelected(Tag selectedTag) {
-        model.updateFilteredTaskList(selectedTag);
-    }
-
     @Override
     /**
      * Return the sorted and filtered tag list.

diff --git a/src/main/java/seedu/manager/model/Model.java b/src/main/java/seedu/manager/model/Model.java
@@ -87,10 +87,6 @@ public void setSingleCommandWord(String commandToChange, String alias,
     /** Updates the filter of the sorted and filtered task list to filter by the given properties from the find function*/
     void updateFilteredTaskList(HashMap<TaskProperties, Optional<TaskProperty>> propertiesToMatch);
 
-    // @@author A0148042M
-    /** Updates the filter of the sorted and filtered task list to filter by the given tag from the find function*/
-    void updateFilteredTaskList(Tag selectedTag);
-
     // @@author A0147924X
     /** Sorts the sorted and filtered task list by priority */
     void sortSortedFilteredTaskListByPriority();

diff --git a/src/main/java/seedu/manager/model/ModelManager.java b/src/main/java/seedu/manager/model/ModelManager.java
@@ -7,6 +7,7 @@
 import seedu.manager.commons.core.UnmodifiableObservableList;
 import seedu.manager.commons.core.CommandWord.Commands;
 import seedu.manager.commons.events.model.TaskManagerChangedEvent;
+import seedu.manager.commons.events.ui.TagPanelSelectionChangedEvent;
 import seedu.manager.commons.exceptions.IllegalValueException;
 import seedu.manager.model.task.ReadOnlyTask;
 import seedu.manager.model.task.Task;
@@ -22,6 +23,8 @@
 import java.util.Optional;
 import java.util.logging.Logger;
 
+import com.google.common.eventbus.Subscribe;
+
 /**
  * Represents the in-memory model of the task manager data.
  * All changes to any model should be synchronized.
@@ -134,7 +137,7 @@ public synchronized void addTag(Tag tag) {
         try {
             taskManager.addTag(tag);
         } catch (DuplicateTagException e) {
-            e.printStackTrace();
+            // Nothing will happen if there are duplicate tags
         }
         updateFilteredTagListToShowAll();
     }
@@ -221,13 +224,19 @@ public void updateFilteredTagListToShowAll() {
     }
 
     // @@author A0148042M
-    @Override
-    public void updateFilteredTaskList(Tag selectedTag) {
-        HashMap<TaskProperties, Optional<TaskProperty>> TagToMatch = new HashMap<>();
+    @Subscribe
+    private void handleTagListPanelSelectionChangedEvent(TagPanelSelectionChangedEvent event) {
+        logger.info(LogsCenter.getEventHandlingLogMessage(event));
+
+        HashMap<TaskProperties, Optional<TaskProperty>> tagToMatch = new HashMap<>();
+        Tag selectedTag = event.getNewSelection(); 
         Optional<TaskProperty> tag = Optional.of(selectedTag);
-        TagToMatch.put(TaskProperties.TAG, tag);
+        for(TaskProperties prop : TaskProperties.values()) {
+            tagToMatch.put(prop, Optional.empty());
+        }
+        tagToMatch.put(TaskProperties.TAG, tag);
 
-        updateFilteredTaskList(TagToMatch); 
+        updateFilteredTaskList(tagToMatch); 
     }
 
     // @author

diff --git a/src/main/java/seedu/manager/model/TaskManager.java b/src/main/java/seedu/manager/model/TaskManager.java
@@ -67,7 +67,6 @@ public ObservableList<Tag> combineTwoList(ObservableList<Tag> internalTagList,
         if(internalTagList.size() == 0) {
             for(int i = 0;i < tagListFromTaskList.size();i++) {
                 if(!internalTagList.contains(tagListFromTaskList.get(i))) {
-//                    internalTagList.add(tagListFromTaskList.get(i));
                     combinedTagList.add(tagListFromTaskList.get(i));
                 }
             }

diff --git a/src/main/java/seedu/manager/ui/MainWindow.java b/src/main/java/seedu/manager/ui/MainWindow.java
@@ -206,16 +206,6 @@ public TagListPanel getTagListPanel() {
         return this.tagListPanel;
     }
 
-    // @@author A0148042M
-    public void updateTaskListPanel(Tag newSelection) {
-//        logic.updateTaskListWhenTagSelected(newSelection);
-        String commandText = new String(CommandWord.getFindCommandWord());
-//        String commandText = new String("find tag ");
-        commandText += " tag ";
-        commandText += newSelection.toString();
-        logic.execute(commandText);
-    }
-
     // @@author
     /**
      * Rerender Status Bar Footer

diff --git a/src/main/java/seedu/manager/ui/UiManager.java b/src/main/java/seedu/manager/ui/UiManager.java
@@ -137,14 +137,6 @@ private void handleTaskPanelSelectionChangedEvent(TaskPanelSelectionChangedEvent
         logger.info(LogsCenter.getEventHandlingLogMessage(event));
     }
 
-    @Subscribe
-    private void handleTagListPanelSelectionChangedEvent(TagPanelSelectionChangedEvent event) {
-        logger.info(LogsCenter.getEventHandlingLogMessage(event));
-//        System.out.println(event.getNewSelection());
-        mainWindow.updateTaskListPanel(event.getNewSelection());
-
-    }
-
     // @@author A0147924X
     @Subscribe
     /**