Merge pull request nus-cs2103-AY2021S2#72 from mrweikiat/master

Refractor Person class to Task class

Author: austenjs

src/main/java/seedu/address/logic/Logic.java

@@ -8,7 +8,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.ReadOnlyTaskTracker;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 
 /**
  * API of the Logic component
@@ -36,7 +36,7 @@ public interface Logic {
     /**
      * Returns an unmodifiable view of the filtered list of persons
      */
-    ObservableList<Person> getFilteredPersonList();
+    ObservableList<Task> getFilteredPersonList();
 
     /**
      * Returns the user prefs' address book file path.

src/main/java/seedu/address/logic/LogicManager.java

@@ -14,7 +14,7 @@
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.Model;
 import seedu.address.model.ReadOnlyTaskTracker;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 import seedu.address.storage.Storage;
 
 /**
@@ -61,7 +61,7 @@ public ReadOnlyTaskTracker getTaskTracker() {
     }
 
     @Override
-    public ObservableList<Person> getFilteredPersonList() {
+    public ObservableList<Task> getFilteredPersonList() {
         return model.getFilteredPersonList();
     }
 

src/main/java/seedu/address/logic/commands/AddCommand.java

@@ -9,7 +9,7 @@
 
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 
 /**
  * Adds a person to the address book.
@@ -36,14 +36,14 @@ public class AddCommand extends Command {
     public static final String MESSAGE_SUCCESS = "New person added: %1$s";
     public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
 
-    private final Person toAdd;
+    private final Task toAdd;
 
     /**
      * Creates an AddCommand to add the specified {@code Person}
      */
-    public AddCommand(Person person) {
-        requireNonNull(person);
-        toAdd = person;
+    public AddCommand(Task task) {
+        requireNonNull(task);
+        toAdd = task;
     }
 
     @Override

src/main/java/seedu/address/logic/commands/DeleteCommand.java

@@ -8,7 +8,7 @@
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 
 /**
  * Deletes a person identified using it's displayed index from the address book.
@@ -33,15 +33,15 @@ public DeleteCommand(Index targetIndex) {
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
-        List<Person> lastShownList = model.getFilteredPersonList();
+        List<Task> lastShownList = model.getFilteredPersonList();
 
         if (targetIndex.getZeroBased() >= lastShownList.size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
 
-        Person personToDelete = lastShownList.get(targetIndex.getZeroBased());
-        model.deletePerson(personToDelete);
-        return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, personToDelete));
+        Task taskToDelete = lastShownList.get(targetIndex.getZeroBased());
+        model.deletePerson(taskToDelete);
+        return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, taskToDelete));
     }
 
     @Override

src/main/java/seedu/address/logic/commands/DoneCommand.java

@@ -8,7 +8,7 @@
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 
 /**
  * Finishes a task identified using it's displayed index from the task list.
@@ -33,13 +33,13 @@ public DoneCommand(Index targetIndex) {
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
-        List<Person> lastShownList = model.getFilteredPersonList(); //Change to list of task later
+        List<Task> lastShownList = model.getFilteredPersonList(); //Change to list of task later
 
         if (targetIndex.getZeroBased() >= lastShownList.size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
 
-        Person taskToFinish = lastShownList.get(targetIndex.getZeroBased());
+        Task taskToFinish = lastShownList.get(targetIndex.getZeroBased());
         model.deletePerson(taskToFinish); // change to finishTask later
         return new CommandResult(String.format(MESSAGE_DONE_TASK_SUCCESS, taskToFinish));
     }

src/main/java/seedu/address/logic/commands/EditCommand.java

@@ -22,8 +22,8 @@
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Email;
 import seedu.address.model.person.ModuleName;
-import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Task;
 import seedu.address.model.tag.Tag;
 
 /**
@@ -68,38 +68,38 @@ public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
-        List<Person> lastShownList = model.getFilteredPersonList();
+        List<Task> lastShownList = model.getFilteredPersonList();
 
         if (index.getZeroBased() >= lastShownList.size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
 
-        Person personToEdit = lastShownList.get(index.getZeroBased());
-        Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
+        Task taskToEdit = lastShownList.get(index.getZeroBased());
+        Task editedTask = createEditedPerson(taskToEdit, editPersonDescriptor);
 
-        if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
+        if (!taskToEdit.isSamePerson(editedTask) && model.hasPerson(editedTask)) {
             throw new CommandException(MESSAGE_DUPLICATE_PERSON);
         }
 
-        model.setPerson(personToEdit, editedPerson);
+        model.setPerson(taskToEdit, editedTask);
         model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-        return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedPerson));
+        return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedTask));
     }
 
     /**
      * Creates and returns a {@code Person} with the details of {@code personToEdit}
      * edited with {@code editPersonDescriptor}.
      */
-    private static Person createEditedPerson(Person personToEdit, EditPersonDescriptor editPersonDescriptor) {
-        assert personToEdit != null;
+    private static Task createEditedPerson(Task taskToEdit, EditPersonDescriptor editPersonDescriptor) {
+        assert taskToEdit != null;
 
-        ModuleName updatedModuleName = editPersonDescriptor.getModuleName().orElse(personToEdit.getModuleName());
-        Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
-        Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
-        Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
-        Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
+        ModuleName updatedModuleName = editPersonDescriptor.getModuleName().orElse(taskToEdit.getModuleName());
+        Phone updatedPhone = editPersonDescriptor.getPhone().orElse(taskToEdit.getPhone());
+        Email updatedEmail = editPersonDescriptor.getEmail().orElse(taskToEdit.getEmail());
+        Address updatedAddress = editPersonDescriptor.getAddress().orElse(taskToEdit.getAddress());
+        Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(taskToEdit.getTags());
 
-        return new Person(updatedModuleName, updatedPhone, updatedEmail, updatedAddress, updatedTags);
+        return new Task(updatedModuleName, updatedPhone, updatedEmail, updatedAddress, updatedTags);
     }
 
     @Override

src/main/java/seedu/address/logic/parser/AddCommandParser.java

@@ -15,8 +15,8 @@
 import seedu.address.model.person.Address;
 import seedu.address.model.person.Email;
 import seedu.address.model.person.ModuleName;
-import seedu.address.model.person.Person;
 import seedu.address.model.person.Phone;
+import seedu.address.model.person.Task;
 import seedu.address.model.tag.Tag;
 
 /**
@@ -44,9 +44,9 @@ public AddCommand parse(String args) throws ParseException {
         Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
-        Person person = new Person(moduleName, phone, email, address, tagList);
+        Task task = new Task(moduleName, phone, email, address, tagList);
 
-        return new AddCommand(person);
+        return new AddCommand(task);
     }
 
     /**

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

@@ -5,7 +5,7 @@
 
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 
 /**
  * The API of the Model component.
@@ -14,7 +14,7 @@ public interface Model {
     /**
      * {@code Predicate} that always evaluate to true
      */
-    Predicate<Person> PREDICATE_SHOW_ALL_PERSONS = unused -> true;
+    Predicate<Task> PREDICATE_SHOW_ALL_PERSONS = unused -> true;
 
     /**
      * Replaces user prefs data with the data in {@code userPrefs}.
@@ -60,36 +60,36 @@ public interface Model {
     /**
      * Returns true if a person with the same identity as {@code person} exists in the address book.
      */
-    boolean hasPerson(Person person);
+    boolean hasPerson(Task task);
 
     /**
      * Deletes the given person.
      * The person must exist in the address book.
      */
-    void deletePerson(Person target);
+    void deletePerson(Task target);
 
     /**
      * Adds the given person.
      * {@code person} must not already exist in the address book.
      */
-    void addPerson(Person person);
+    void addPerson(Task task);
 
     /**
      * Replaces the given person {@code target} with {@code editedPerson}.
      * {@code target} must exist in the address book.
      * The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
      */
-    void setPerson(Person target, Person editedPerson);
+    void setPerson(Task target, Task editedTask);
 
     /**
      * Returns an unmodifiable view of the filtered person list
      */
-    ObservableList<Person> getFilteredPersonList();
+    ObservableList<Task> getFilteredPersonList();
 
     /**
      * Updates the filter of the filtered person list to filter by the given {@code predicate}.
      *
      * @throws NullPointerException if {@code predicate} is null.
      */
-    void updateFilteredPersonList(Predicate<Person> predicate);
+    void updateFilteredPersonList(Predicate<Task> predicate);
 }

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

@@ -11,7 +11,7 @@
 import javafx.collections.transformation.FilteredList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 
 /**
  * Represents the in-memory model of the address book data.
@@ -21,7 +21,7 @@ public class ModelManager implements Model {
 
     private final TaskTracker taskTracker;
     private final UserPrefs userPrefs;
-    private final FilteredList<Person> filteredPersons;
+    private final FilteredList<Task> filteredTasks;
 
     /**
      * Initializes a ModelManager with the given taskTracker and userPrefs.
@@ -35,7 +35,7 @@ public ModelManager(ReadOnlyTaskTracker taskTracker, ReadOnlyUserPrefs userPrefs
 
         this.taskTracker = new TaskTracker(taskTracker);
         this.userPrefs = new UserPrefs(userPrefs);
-        filteredPersons = new FilteredList<>(this.taskTracker.getPersonList());
+        filteredTasks = new FilteredList<>(this.taskTracker.getPersonList());
     }
 
     public ModelManager() {
@@ -91,27 +91,27 @@ public ReadOnlyTaskTracker getTaskTracker() {
     }
 
     @Override
-    public boolean hasPerson(Person person) {
-        requireNonNull(person);
-        return taskTracker.hasPerson(person);
+    public boolean hasPerson(Task task) {
+        requireNonNull(task);
+        return taskTracker.hasPerson(task);
     }
 
     @Override
-    public void deletePerson(Person target) {
+    public void deletePerson(Task target) {
         taskTracker.removePerson(target);
     }
 
     @Override
-    public void addPerson(Person person) {
-        taskTracker.addPerson(person);
+    public void addPerson(Task task) {
+        taskTracker.addPerson(task);
         updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
     }
 
     @Override
-    public void setPerson(Person target, Person editedPerson) {
-        requireAllNonNull(target, editedPerson);
+    public void setPerson(Task target, Task editedTask) {
+        requireAllNonNull(target, editedTask);
 
-        taskTracker.setPerson(target, editedPerson);
+        taskTracker.setPerson(target, editedTask);
     }
 
     //=========== Filtered Person List Accessors =============================================================
@@ -121,14 +121,14 @@ public void setPerson(Person target, Person editedPerson) {
      * {@code versionedTaskTracker}
      */
     @Override
-    public ObservableList<Person> getFilteredPersonList() {
-        return filteredPersons;
+    public ObservableList<Task> getFilteredPersonList() {
+        return filteredTasks;
     }
 
     @Override
-    public void updateFilteredPersonList(Predicate<Person> predicate) {
+    public void updateFilteredPersonList(Predicate<Task> predicate) {
         requireNonNull(predicate);
-        filteredPersons.setPredicate(predicate);
+        filteredTasks.setPredicate(predicate);
     }
 
     @Override
@@ -147,7 +147,7 @@ public boolean equals(Object obj) {
         ModelManager other = (ModelManager) obj;
         return taskTracker.equals(other.taskTracker)
                 && userPrefs.equals(other.userPrefs)
-                && filteredPersons.equals(other.filteredPersons);
+                && filteredTasks.equals(other.filteredTasks);
     }
 
 }

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

@@ -1,7 +1,7 @@
 package seedu.address.model;
 
 import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
+import seedu.address.model.person.Task;
 
 /**
  * Unmodifiable view of an address book
@@ -12,6 +12,6 @@ public interface ReadOnlyTaskTracker {
      * Returns an unmodifiable view of the persons list.
      * This list will not contain any duplicate persons.
      */
-    ObservableList<Person> getPersonList();
+    ObservableList<Task> getPersonList();
 
 }