From 0f3cbd536a223bd54b4a903e6df01ab2674cec39 Mon Sep 17 00:00:00 2001 From: yungyung04 Date: Sun, 25 Mar 2018 01:28:39 +0800 Subject: [PATCH] coding standard --- src/main/java/seedu/address/model/AddressBook.java | 3 +-- src/main/java/seedu/address/model/Model.java | 7 ------- src/main/java/seedu/address/model/ModelManager.java | 3 --- .../java/seedu/address/model/person/UniquePersonList.java | 1 - .../java/seedu/address/storage/XmlAdaptedPersonTest.java | 1 - 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java index 5db845878463..2214b69fe0b0 100644 --- a/src/main/java/seedu/address/model/AddressBook.java +++ b/src/main/java/seedu/address/model/AddressBook.java @@ -72,7 +72,6 @@ public void resetData(ReadOnlyAddressBook newData) { try { setPersons(syncedPersonList); - setTutees(syncedPersonList); } catch (DuplicatePersonException e) { throw new AssertionError("AddressBooks should not have duplicate persons"); } @@ -135,7 +134,7 @@ private Person syncWithMasterTagList(Person person) { personTags.forEach(tag -> correctTagReferences.add(masterTagObjects.get(tag))); if (person instanceof Tutee) { - return new Tutee( person.getName(), person.getPhone(), person.getEmail(), person.getAddress(), + return new Tutee(person.getName(), person.getPhone(), person.getEmail(), person.getAddress(), ((Tutee) person).getSubject(), ((Tutee) person).getGrade(), ((Tutee) person).getEducationLevel(), ((Tutee) person).getSchool(), correctTagReferences); diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java index 8db6c38444a4..a59a92aaafc8 100644 --- a/src/main/java/seedu/address/model/Model.java +++ b/src/main/java/seedu/address/model/Model.java @@ -7,7 +7,6 @@ import seedu.address.model.person.exceptions.DuplicatePersonException; import seedu.address.model.person.exceptions.PersonNotFoundException; import seedu.address.model.tag.Tag; -import seedu.address.model.tutee.Tutee; /** * The API of the Model component. @@ -47,12 +46,6 @@ void updatePerson(Person target, Person editedPerson) */ void updateFilteredPersonList(Predicate predicate); - ///** - //* Updates the filter of the filtered tutee list to filter by the given {@code predicate}. - //* @throws NullPointerException if {@code predicate} is null. - //*/ - //void updateFilteredTuteeList(String category, String[] keywords); - /** * Removes the given {@code tag} from the specified {@code person}. */ diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index 1fa1fd2201d0..d23241c1cfa0 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -16,7 +16,6 @@ import seedu.address.model.person.exceptions.DuplicatePersonException; import seedu.address.model.person.exceptions.PersonNotFoundException; import seedu.address.model.tag.Tag; -import seedu.address.model.tutee.Tutee; /** * Represents the in-memory model of the address book data. @@ -89,8 +88,6 @@ public void deleteTag(Tag tag, Person person) { addressBook.removeTagFromPerson(tag, person); } - //=========== Filtered Person List Accessors ============================================================= - /** * Returns an unmodifiable view of the list of {@code Person} backed by the internal list of * {@code addressBook} diff --git a/src/main/java/seedu/address/model/person/UniquePersonList.java b/src/main/java/seedu/address/model/person/UniquePersonList.java index 93c9cdcdc573..f2c4c4c585e4 100644 --- a/src/main/java/seedu/address/model/person/UniquePersonList.java +++ b/src/main/java/seedu/address/model/person/UniquePersonList.java @@ -11,7 +11,6 @@ import seedu.address.commons.util.CollectionUtil; import seedu.address.model.person.exceptions.DuplicatePersonException; import seedu.address.model.person.exceptions.PersonNotFoundException; -import seedu.address.model.tutee.Tutee; /** * A list of persons that enforces uniqueness between its elements and does not allow nulls. diff --git a/src/test/java/seedu/address/storage/XmlAdaptedPersonTest.java b/src/test/java/seedu/address/storage/XmlAdaptedPersonTest.java index 0c6d4c58280e..4f6de18d4754 100644 --- a/src/test/java/seedu/address/storage/XmlAdaptedPersonTest.java +++ b/src/test/java/seedu/address/storage/XmlAdaptedPersonTest.java @@ -4,7 +4,6 @@ import static seedu.address.storage.XmlAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT; import static seedu.address.testutil.TypicalPersons.BENSON; import static seedu.address.testutil.TypicalTutees.ALICETUTEE; -import static seedu.address.testutil.TypicalTutees.CARLTUTEE; import java.util.ArrayList; import java.util.List;