Updated for merge

wynonaK · Mar 30, 2018 · 2a8dff3 · 2a8dff3
1 parent 6293d7a
commit 2a8dff3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -82,9 +82,6 @@ void updatePerson(Person target, Person editedPerson)
      */
     void updateFilteredAppointmentList(Predicate<Appointment> predicate);
 
-    /** Returns an unmodifiable view of the filtered pet patient list */
-    ObservableList<PetPatient> getFilteredPetPatientList();
-
     void updateFilteredPetPatientList(Predicate<PetPatient> 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
@@ -187,11 +187,6 @@ public ObservableList<PetPatient> getFilteredPetPatientList() {
         return FXCollections.unmodifiableObservableList(filteredPetPatients);
     }
 
-    @Override
-    public ObservableList<PetPatient> getFilteredPetPatientList() {
-        return FXCollections.unmodifiableObservableList(filteredPetPatients);
-    }
-
     @Override
     public void updateFilteredPetPatientList(Predicate<PetPatient> 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
@@ -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);