Skip to content

Commit 58fab50

Browse files
authored
Merge pull request nus-cs2103-AY2223S2#118 from shaowi/list-command-bug-fix
Fix error on list command
2 parents 6bd761f + 1ab8626 commit 58fab50

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class ModelManager implements Model {
3131
private final Tracker tracker;
3232
private final UserPrefs userPrefs;
3333
private final Navigation navigation;
34-
private final FilteredList<? extends ReadOnlyModule> filteredModules;
34+
private FilteredList<? extends ReadOnlyModule> filteredModules;
3535
private FilteredList<? extends ReadOnlyLecture> filteredLectures;
3636
private FilteredList<? extends Video> filteredVideos;
3737
private Level lastListLevel;
@@ -241,6 +241,7 @@ public ObservableList<? extends ReadOnlyModule> getFilteredModuleList() {
241241
@Override
242242
public void updateFilteredModuleList(Predicate<? super ReadOnlyModule> predicate) {
243243
requireNonNull(predicate);
244+
filteredModules = new FilteredList<>(this.tracker.getModuleList());
244245
filteredModules.setPredicate(predicate);
245246
setLastListLevel(Level.MODULE);
246247

@@ -263,10 +264,7 @@ public ObservableList<? extends ReadOnlyLecture> getFilteredLectureList() {
263264
@Override
264265
public void updateFilteredLectureList(Predicate<? super ReadOnlyLecture> predicate, ReadOnlyModule module) {
265266
requireNonNull(predicate);
266-
if (filteredLectures == null) {
267-
filteredLectures = new FilteredList<>(module.getLectureList());
268-
}
269-
requireNonNull(filteredLectures);
267+
filteredLectures = new FilteredList<>(module.getLectureList());
270268
filteredLectures.setPredicate(predicate);
271269
setLastListLevel(Level.LECTURE);
272270

@@ -286,10 +284,7 @@ public ObservableList<? extends Video> getFilteredVideoList() {
286284
@Override
287285
public void updateFilteredVideoList(Predicate<? super Video> predicate, ReadOnlyLecture lecture) {
288286
requireNonNull(predicate);
289-
if (filteredVideos == null) {
290-
filteredVideos = new FilteredList<>(lecture.getVideoList());
291-
}
292-
requireNonNull(filteredVideos);
287+
filteredVideos = new FilteredList<>(lecture.getVideoList());
293288
filteredVideos.setPredicate(predicate);
294289
setLastListLevel(Level.VIDEO);
295290

0 commit comments

Comments
 (0)