From 1ab862680d6ce5860dbada45b5d42bf276862287 Mon Sep 17 00:00:00 2001 From: Lee ShaoWee Date: Sat, 18 Mar 2023 11:01:54 +0800 Subject: [PATCH] Fix error on list command - Executing command twice renders empty list --- src/main/java/seedu/address/model/ModelManager.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index 97512766cc2..534a11340e5 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -31,7 +31,7 @@ public class ModelManager implements Model { private final Tracker tracker; private final UserPrefs userPrefs; private final Navigation navigation; - private final FilteredList filteredModules; + private FilteredList filteredModules; private FilteredList filteredLectures; private FilteredList filteredVideos; private Level lastListLevel; @@ -241,6 +241,7 @@ public ObservableList getFilteredModuleList() { @Override public void updateFilteredModuleList(Predicate predicate) { requireNonNull(predicate); + filteredModules = new FilteredList<>(this.tracker.getModuleList()); filteredModules.setPredicate(predicate); setLastListLevel(Level.MODULE); @@ -263,10 +264,7 @@ public ObservableList getFilteredLectureList() { @Override public void updateFilteredLectureList(Predicate predicate, ReadOnlyModule module) { requireNonNull(predicate); - if (filteredLectures == null) { - filteredLectures = new FilteredList<>(module.getLectureList()); - } - requireNonNull(filteredLectures); + filteredLectures = new FilteredList<>(module.getLectureList()); filteredLectures.setPredicate(predicate); setLastListLevel(Level.LECTURE); @@ -286,10 +284,7 @@ public ObservableList getFilteredVideoList() { @Override public void updateFilteredVideoList(Predicate predicate, ReadOnlyLecture lecture) { requireNonNull(predicate); - if (filteredVideos == null) { - filteredVideos = new FilteredList<>(lecture.getVideoList()); - } - requireNonNull(filteredVideos); + filteredVideos = new FilteredList<>(lecture.getVideoList()); filteredVideos.setPredicate(predicate); setLastListLevel(Level.VIDEO);