From 2a8dff35b6c64ba8f6f5ac3545374e5ef4b669cb Mon Sep 17 00:00:00 2001 From: wynonaK <35650845+wynonaK@users.noreply.github.com> Date: Fri, 30 Mar 2018 11:12:35 +0800 Subject: [PATCH] Updated for merge --- src/main/java/seedu/address/MainApp.java | 2 +- src/main/java/seedu/address/model/Model.java | 3 --- src/main/java/seedu/address/model/ModelManager.java | 5 ----- .../java/seedu/address/logic/commands/EditCommandTest.java | 6 +++--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java index c3a0aacadca4..d8b9d0a4e688 100644 --- a/src/main/java/seedu/address/MainApp.java +++ b/src/main/java/seedu/address/MainApp.java @@ -41,7 +41,7 @@ */ public class MainApp extends Application { - public static final Version VERSION = new Version(0, 6, 0, true); + public static final Version VERSION = new Version(1, 3, 17, true); private static final Logger logger = LogsCenter.getLogger(MainApp.class); diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java index 912690f6b97e..1dbb644240ad 100644 --- a/src/main/java/seedu/address/model/Model.java +++ b/src/main/java/seedu/address/model/Model.java @@ -82,9 +82,6 @@ void updatePerson(Person target, Person editedPerson) */ void updateFilteredAppointmentList(Predicate predicate); - /** Returns an unmodifiable view of the filtered pet patient list */ - ObservableList getFilteredPetPatientList(); - void updateFilteredPetPatientList(Predicate predicate); void addPetPatient(PetPatient petPatient) throws DuplicatePetPatientException; diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index 3d52bead5778..a8d45b51ac71 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -187,11 +187,6 @@ public ObservableList getFilteredPetPatientList() { return FXCollections.unmodifiableObservableList(filteredPetPatients); } - @Override - public ObservableList getFilteredPetPatientList() { - return FXCollections.unmodifiableObservableList(filteredPetPatients); - } - @Override public void updateFilteredPetPatientList(Predicate predicate) { requireNonNull(predicate); diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java index c681e2406827..a8b104d3a81d 100644 --- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/EditCommandTest.java @@ -130,7 +130,7 @@ public void execute_invalidPersonIndexUnfilteredList_failure() { EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build(); EditCommand editCommand = prepareCommand(outOfBoundIndex, descriptor); - assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_DISPLAYED_INDEX); + assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX); } /** @@ -147,7 +147,7 @@ public void execute_invalidPersonIndexFilteredList_failure() { EditCommand editCommand = prepareCommand(outOfBoundIndex, new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build()); - assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_DISPLAYED_INDEX); + assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX); } @Test @@ -183,7 +183,7 @@ public void executeUndoRedo_invalidIndexUnfilteredList_failure() { EditCommand editCommand = prepareCommand(outOfBoundIndex, descriptor); // execution failed -> editCommand not pushed into undoRedoStack - assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_DISPLAYED_INDEX); + assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX); // no commands in undoRedoStack -> undoCommand and redoCommand fail assertCommandFailure(undoCommand, model, UndoCommand.MESSAGE_FAILURE);