Find command

src/main/java/seedu/module/logic/commands/FindCommand.java

@@ -30,7 +30,7 @@ public FindCommand(NameContainsKeywordsPredicate predicate) {
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.updateFilteredArchivedModuleList(predicate);
-        model.changeDisplayedList("ArchivedList");
+        model.displayArchivedList();
         return new CommandResult(
                 String.format(Messages.MESSAGE_MODULES_LISTED_OVERVIEW, model.getFilteredArchivedModuleList().size()));
     }

src/main/java/seedu/module/logic/commands/ListCommand.java

@@ -19,7 +19,7 @@ public class ListCommand extends Command {
     public CommandResult execute(Model model) {
         requireNonNull(model);
         model.updateFilteredModuleList(PREDICATE_SHOW_ALL_MODULES);
-        model.changeDisplayedList("TrackedList");
+        model.displayTrackedList();
         return new CommandResult(MESSAGE_SUCCESS);
     }
 }

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

@@ -16,7 +16,7 @@ public interface Model {
     /**
      * {@code Predicate} that always evaluate to true.
      */
-    Predicate<TrackedModule> PREDICATE_SHOW_ALL_MODULES = unused -> true;
+    Predicate<Module> PREDICATE_SHOW_ALL_MODULES = unused -> true;
 
     /**
      * Replaces user prefs data with the data in {@code userPrefs}.
@@ -97,16 +97,21 @@ public interface Model {
      *
      * @throws NullPointerException if {@code predicate} is null.
      */
-    void updateFilteredModuleList(Predicate<TrackedModule> predicate);
+    void updateFilteredModuleList(Predicate<Module> predicate);
 
     /**
      * Returns an unmodifiable view of the current shown list.
      */
     ObservableList<Module> getDisplayedList();
 
     /**
-     * Changes the current list to be shown.
+     * Changes the current list to be shown to the ArchivedModuleList.
      */
-    void changeDisplayedList(String list);
+    void displayArchivedList();
+
+    /**
+     * Changes the current list to be shown to the TrackedModuleList.
+     */
+    void displayTrackedList();
 }
 

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

@@ -41,7 +41,7 @@ public ModelManager(ReadOnlyModuleBook moduleBook, ReadOnlyUserPrefs userPrefs)
         this.userPrefs = new UserPrefs(userPrefs);
         filteredTrackedModules = new FilteredList<>(this.moduleBook.getModuleList());
         filteredArchivedModules = new FilteredList<>(this.moduleBook.getArchivedModuleList());
-        changeDisplayedList("TrackedList");
+        displayTrackedList();
     }
 
     public ModelManager() {
@@ -124,7 +124,7 @@ public ObservableList<TrackedModule> getFilteredModuleList() {
     }
 
     @Override
-    public void updateFilteredModuleList(Predicate<TrackedModule> predicate) {
+    public void updateFilteredModuleList(Predicate<Module> predicate) {
         requireNonNull(predicate);
         filteredTrackedModules.setPredicate(predicate);
     }
@@ -157,22 +157,18 @@ public ObservableList<Module> getDisplayedList() {
     }
 
     @Override
-    public void changeDisplayedList(String list) {
-        switch (list) {
-        case "ArchivedList":
-            this.displayedList.clear();
-            for (Module i : filteredArchivedModules) {
-                displayedList.add(i);
-            }
-            break;
-        case "TrackedList":
-            this.displayedList.clear();
-            for (Module i : filteredTrackedModules) {
-                displayedList.add(i);
-            }
-            break;
-        default:
-            break;
+    public void displayArchivedList() {
+        this.displayedList.clear();
+        for (Module i : filteredArchivedModules) {
+            displayedList.add(i);
+        }
+    }
+
+    @Override
+    public void displayTrackedList() {
+        this.displayedList.clear();
+        for (Module i : filteredTrackedModules) {
+            displayedList.add(i);
         }
     }
 

src/main/java/seedu/module/model/module/NameContainsKeywordsPredicate.java

@@ -16,9 +16,9 @@ public NameContainsKeywordsPredicate(List<String> keywords) {
     }
 
     @Override
-    public boolean test(Module trackedModule) {
+    public boolean test(Module Module) {
         return keywords.stream()
-                .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(trackedModule.getModuleCode(), keyword));
+                .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(Module.getModuleCode(), keyword));
     }
 
     @Override

src/main/java/seedu/module/storage/JsonAdaptedModule.java

@@ -29,7 +29,7 @@ public JsonAdaptedModule(@JsonProperty("moduleCode") String moduleCode, @JsonPro
     }
 
     /**
-     * Converts a given {@code Module} into this class for Jackson use.
+     * Converts a given {@code TrackedModule} into this class for Jackson use.
      */
     public JsonAdaptedModule(TrackedModule source) {
         moduleCode = source.getModuleCode();

src/main/resources/view/MainWindow.fxml

@@ -45,7 +45,7 @@
                     </padding>
                 </StackPane>
 
-                <VBox fx:id="trackedModuleList" styleClass="pane-with-border" minWidth="340" prefWidth="340"
+                <VBox fx:id="ModuleList" styleClass="pane-with-border" minWidth="340" prefWidth="340"
                       VBox.vgrow="ALWAYS">
                     <padding>
                         <Insets top="10" right="10" bottom="10" left="10"/>

src/test/java/seedu/module/logic/commands/CommandTestUtil.java

@@ -1,15 +1,19 @@
 package seedu.module.logic.commands;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.module.testutil.Assert.assertThrows;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import seedu.module.commons.core.index.Index;
 import seedu.module.logic.commands.exceptions.CommandException;
 import seedu.module.model.Model;
 import seedu.module.model.ModuleBook;
-import seedu.module.model.module.TrackedModule;
+import seedu.module.model.module.Module;
+import seedu.module.model.module.NameContainsKeywordsPredicate;
 
 /**
  * Contains helper methods for testing commands.
@@ -51,7 +55,7 @@ public static void assertCommandFailure(Command command, Model actualModel, Stri
         // we are unable to defensively copy the model for comparison later, so we can
         // only do so by copying its components.
         ModuleBook expectedAddressBook = new ModuleBook(actualModel.getModuleBook());
-        List<TrackedModule> expectedFilteredList = new ArrayList<>(actualModel.getFilteredModuleList());
+        List<Module> expectedFilteredList = new ArrayList<>(actualModel.getFilteredModuleList());
 
         assertThrows(CommandException.class, expectedMessage, () -> command.execute(actualModel));
         assertEquals(expectedAddressBook, actualModel.getModuleBook());
@@ -62,14 +66,14 @@ public static void assertCommandFailure(Command command, Model actualModel, Stri
      * Updates {@code model}'s filtered list to show only the module at the given {@code targetIndex} in the
      * {@code model}'s address book.
      */
-    //public static void showModuleAtIndex(Model model, Index targetIndex) {
-    //assertTrue(targetIndex.getZeroBased() < model.getFilteredModuleList().size());
+    public static void showModuleAtIndex(Model model, Index targetIndex) {
+        assertTrue(targetIndex.getZeroBased() < model.getFilteredModuleList().size());
 
-    //TrackedModule trackedModule = model.getFilteredModuleList().get(targetIndex.getZeroBased());
-    //final String[] splitName = trackedModule.getTitle().split("\\s+");
-    //model.updateFilteredModuleList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
+        Module trackedModule = model.getFilteredModuleList().get(targetIndex.getZeroBased());
+        final String[] splitName = trackedModule.getTitle().split("\\s+");
+        model.updateFilteredModuleList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
 
-    //assertEquals(1, model.getFilteredModuleList().size());
-    //}
+        assertEquals(1, model.getFilteredModuleList().size());
+    }
 
 }

src/test/java/seedu/module/storage/JsonArchivedModuleListTest.java

@@ -9,7 +9,7 @@
 import seedu.module.model.module.ArchivedModuleList;
 
 
-class JsonArchivedTrackedModuleListTest {
+class JsonArchivedModuleListTest {
     private static final String VALID_ARCHIVED_MODULES_FILE_PATH = "data/archivedModules.json";
     private static final String INVALID_ARCHIVED_MODULES_FILE_PATH = "data/doesntexist.json";
     // To trigger URISyntaxException

src/test/java/seedu/module/testutil/TestUtil.java

@@ -33,23 +33,23 @@ public static Path getFilePathInSandboxFolder(String fileName) {
     }
 
     /**
-     * Returns the middle index of the person in the {@code model}'s person list.
+     * Returns the middle index of the tracked module in the {@code model}'s tracked module list.
      */
     public static Index getMidIndex(Model model) {
         return Index.fromOneBased(model.getFilteredModuleList().size() / 2);
     }
 
     /**
-     * Returns the last index of the person in the {@code model}'s person list.
+     * Returns the last index of the tracked module in the {@code model}'s tracked module list.
      */
     public static Index getLastIndex(Model model) {
         return Index.fromOneBased(model.getFilteredModuleList().size());
     }
 
     /**
-     * Returns the person in the {@code model}'s person list at {@code index}.
+     * Returns the tracked module in the {@code model}'s  tracked module list at {@code index}.
      */
-    public static TrackedModule getPerson(Model model, Index index) {
+    public static TrackedModule getModule(Model model, Index index) {
         return model.getFilteredModuleList().get(index.getZeroBased());
     }
 }