Merge remote-tracking branch 'team-tp/master' into ppp-update

Author: totoyoyo

docs/DeveloperGuide.md

@@ -105,7 +105,7 @@ Given below is the Sequence Diagram for interactions within the `Logic` componen
 
 ![Interactions Inside the Logic Component for the `delete 1` Command](images/DeleteSequenceDiagram.png)
 
-<div markdown="span" class="alert alert-info">:information_source: **Note:** The lifeline for `DeleteCommandParser` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline reaches the end of diagram.
+<div markdown="span" class="alert alert-info">:information_source: **Note:** The lifeline for `DeletePersonCommandParser` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline reaches the end of diagram.
 </div>
 
 

docs/diagrams/DeleteSequenceDiagram.puml

@@ -6,8 +6,8 @@
 box Logic LOGIC_COLOR_T1
 participant ":LogicManager" as LogicManager LOGIC_COLOR
 participant ":MeetBuddyParser" as MeetBuddyParser LOGIC_COLOR
-participant ":DeleteCommandParser" as DeleteCommandParser LOGIC_COLOR
-participant "d:DeleteCommand" as DeleteCommand LOGIC_COLOR
+participant ":DeletePersonCommandParser" as DeletePersonCommandParser LOGIC_COLOR
+participant "d:DeletePersonCommand" as DeletePersonCommand LOGIC_COLOR
 participant ":CommandResult" as CommandResult LOGIC_COLOR
 end box
 
@@ -21,50 +21,50 @@ activate LogicManager
 LogicManager -> MeetBuddyParser : parseCommand("delete 1")
 activate MeetBuddyParser
 
-create DeleteCommandParser
-MeetBuddyParser -> DeleteCommandParser
-activate DeleteCommandParser
+create DeletePersonCommandParser
+MeetBuddyParser -> DeletePersonCommandParser
+activate DeletePersonCommandParser
 
-DeleteCommandParser --> MeetBuddyParser
-deactivate DeleteCommandParser
+DeletePersonCommandParser --> MeetBuddyParser
+deactivate DeletePersonCommandParser
 
-MeetBuddyParser -> DeleteCommandParser : parse("1")
-activate DeleteCommandParser
+MeetBuddyParser -> DeletePersonCommandParser : parse("1")
+activate DeletePersonCommandParser
 
-create DeleteCommand
-DeleteCommandParser -> DeleteCommand
-activate DeleteCommand
+create DeletePersonCommand
+DeletePersonCommandParser -> DeletePersonCommand
+activate DeletePersonCommand
 
-DeleteCommand --> DeleteCommandParser : d
-deactivate DeleteCommand
+DeletePersonCommand --> DeletePersonCommandParser : d
+deactivate DeletePersonCommand
 
-DeleteCommandParser --> MeetBuddyParser : d
-deactivate DeleteCommandParser
+DeletePersonCommandParser --> MeetBuddyParser : d
+deactivate DeletePersonCommandParser
 'Hidden arrow to position the destroy marker below the end of the activation bar.
-DeleteCommandParser -[hidden]-> MeetBuddyParser
-destroy DeleteCommandParser
+DeletePersonCommandParser -[hidden]-> MeetBuddyParser
+destroy DeletePersonCommandParser
 
 MeetBuddyParser --> LogicManager : d
 deactivate MeetBuddyParser
 
-LogicManager -> DeleteCommand : execute()
-activate DeleteCommand
+LogicManager -> DeletePersonCommand : execute()
+activate DeletePersonCommand
 
-DeleteCommand -> Model : deletePerson(1)
+DeletePersonCommand -> Model : deletePerson(1)
 activate Model
 
-Model --> DeleteCommand
+Model --> DeletePersonCommand
 deactivate Model
 
 create CommandResult
-DeleteCommand -> CommandResult
+DeletePersonCommand -> CommandResult
 activate CommandResult
 
-CommandResult --> DeleteCommand
+CommandResult --> DeletePersonCommand
 deactivate CommandResult
 
-DeleteCommand --> LogicManager : result
-deactivate DeleteCommand
+DeletePersonCommand --> LogicManager : result
+deactivate DeletePersonCommand
 
 [<--LogicManager
 deactivate LogicManager

docs/images/DeleteSequenceDiagram.png

@@ -1,5 +1,14 @@
 package seedu.address.model;
 
+import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
@@ -15,15 +24,6 @@
 import seedu.address.model.person.UniquePersonList;
 import seedu.address.model.reminder.ReadOnlyReminderBook;
 
-import java.nio.file.Path;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Predicate;
-
 /**
  * The API of the Model component.
  */
@@ -163,7 +163,7 @@ public interface Model {
      */
     ObservableList<Meeting> getUnmodifiableMeetingList();
 
-        // ============= Clashing Meetings  ========================================================
+    // ============= Clashing Meetings  ========================================================
 
     /**
      * Checks if there is a clash in meeting times within the model.

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

@@ -1,5 +1,18 @@
 package seedu.address.model;
 
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.logging.Logger;
+
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
@@ -23,19 +36,6 @@
 import seedu.address.model.reminder.ReminderBook;
 import seedu.address.model.schedule.TimetablePrefs;
 
-import java.nio.file.Path;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.logging.Logger;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
 /**
  * Represents the in-memory model of the address book data.
  */

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

@@ -3,7 +3,6 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import seedu.address.model.group.Group;
 import seedu.address.model.meeting.Meeting;
 import seedu.address.model.person.Person;
 
@@ -20,14 +19,6 @@ public boolean test(Person person) {
         return personsInMeeting.stream()
                 .anyMatch(p -> p.equals(person));
 
-        /* The code below is to be used only if the people in the meeting groups are to be displayed too (i.e. in v1.5) */
-        /*Set<Group> groupsInMeeting = this.meeting.getGroups();
-        Set<Group> groupsForPerson = person.getGroups();
-        return groupsInMeeting.stream()
-                .anyMatch(mGroup ->
-                        groupsForPerson.stream().anyMatch(pGroup ->
-                                pGroup.equals(mGroup))) ||
-                personsInMeeting.stream().anyMatch(p -> p.equals(person));*/
     }
 
     @Override

src/main/java/seedu/address/model/connection/PersonInMeetingPredicate.java

@@ -1,5 +1,9 @@
 package seedu.address.model.connection;
 
+import static java.util.Objects.requireNonNull;
+
+import java.util.HashMap;
+
 import seedu.address.model.connection.exceptions.ConnectionNoFoundException;
 import seedu.address.model.connection.exceptions.DuplicateConnectionException;
 import seedu.address.model.meeting.Meeting;
@@ -8,10 +12,6 @@
 import seedu.address.model.person.UniquePersonList;
 import seedu.address.model.person.exceptions.DuplicatePersonException;
 
-import java.util.HashMap;
-
-import static java.util.Objects.requireNonNull;
-
 /**
  * Represents a connection between persons and meetings.
  * Uses two hashmaps to store the connections, use both meeting and person as a connection.
@@ -102,7 +102,7 @@ public void deleteSinglePersonMeetingConnection(Person person, Meeting meeting)
         } else {
             personsInMeeting.put(meeting, personList);
         }
-        if( meetingList.isEmpty()) {
+        if (meetingList.isEmpty()) {
             meetingsInPerson.remove(person);
         } else {
             meetingsInPerson.put(person, meetingList);

src/main/java/seedu/address/model/connection/PersonMeetingConnection.java

@@ -1,16 +1,15 @@
 package seedu.address.model.meeting;
 
 
-import seedu.address.logic.parser.DateTimeUtil;
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
+import seedu.address.logic.parser.DateTimeUtil;
 
 /**
  * Represents a Meeting's DateTime in a meeting.
@@ -88,7 +87,7 @@ public LocalDateTime toLocalDateTime() {
     public int compareTo(DateTime other) {
         if (value.isBefore(other.value)) {
             return -1;
-        } else if (value.isEqual(other.value)){
+        } else if (value.isEqual(other.value)) {
             return 0;
         }
         return 1;

src/main/java/seedu/address/model/meeting/DateTime.java

@@ -1,10 +1,7 @@
 package seedu.address.model.meeting;
 
-import seedu.address.model.connection.PersonMeetingConnection;
-import seedu.address.model.group.Group;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.UniquePersonList;
-import seedu.address.model.schedule.Schedulable;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -13,8 +10,11 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static seedu.address.commons.util.AppUtil.checkArgument;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import seedu.address.model.connection.PersonMeetingConnection;
+import seedu.address.model.group.Group;
+import seedu.address.model.person.Person;
+import seedu.address.model.person.UniquePersonList;
+import seedu.address.model.schedule.Schedulable;
 
 
 /**
@@ -153,7 +153,9 @@ public boolean containsName(MeetingName name) {
     public boolean containsDescription(Description desc) {
         return description.toString().contains(desc.toString());
     }
-
+    /**
+     * Returns whether a meeting is related to a certain person.
+     */
     public boolean containsPerson(Person person) {
         Set<Person> allPersons = getConnectionToPerson();
         return allPersons.contains(person);
@@ -162,7 +164,9 @@ public boolean containsPerson(Person person) {
     public boolean containsGroup(Group group) {
         return groups.contains(group);
     }
-
+    /**
+     * Returns whether a meeting contains a point of time.
+     */
     public boolean containsTime(DateTime time) {
         boolean afterOrAtStart = time.compareTo(start) >= 0;
         boolean beforeOrAtEnd = time.compareTo(terminate) <= 0;

src/main/java/seedu/address/model/meeting/Meeting.java

@@ -1,14 +1,14 @@
 package seedu.address.model.meeting;
 
 
-import javafx.collections.ObservableList;
-import seedu.address.model.connection.PersonMeetingConnection;
+import static java.util.Objects.requireNonNull;
 
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
-import static java.util.Objects.requireNonNull;
+import javafx.collections.ObservableList;
+import seedu.address.model.connection.PersonMeetingConnection;
 
 public class MeetingBook implements ReadOnlyMeetingBook {
     private final UniqueMeetingList meetings;
@@ -81,7 +81,9 @@ public void setMeeting(Meeting target, Meeting editedMeeting) {
         requireNonNull(editedMeeting);
         meetings.setMeeting(target, editedMeeting);
     }
-
+    /**
+     * Updates a meeting.
+     */
     public void updateMeeting(Meeting target, Meeting editedMeeting) {
         requireNonNull(editedMeeting);
         meetings.updateMeeting(target, editedMeeting);