From b51057b50b9ad0910bf256a3bf58256eb7dcac58 Mon Sep 17 00:00:00 2001 From: Niu BoQian Date: Wed, 5 Apr 2023 23:48:42 +0800 Subject: [PATCH] fix ped bug where commands consider names in a case-sensitive manner. --- src/main/java/seedu/address/model/ModelManager.java | 12 ++++++------ .../seedu/address/model/student/NamePredicate.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java index b30e92b7259..0d71220918b 100644 --- a/src/main/java/seedu/address/model/ModelManager.java +++ b/src/main/java/seedu/address/model/ModelManager.java @@ -154,7 +154,7 @@ public boolean equals(Object obj) { public boolean hasDuplicateName(String name) { int count = 0; for (Student s : filteredPersons) { - if (s.getName().toString().contains(name)) { + if (s.getName().toString().toLowerCase().contains(name.toLowerCase())) { count++; } } @@ -165,7 +165,7 @@ public boolean hasDuplicateName(String name) { public boolean hasDuplicateNameAdd(String name) { int count = 0; for (Student s : filteredPersons) { - if (s.getName().toString().contains(name)) { + if (s.getName().toString().toLowerCase().contains(name.toLowerCase())) { count++; } } @@ -176,7 +176,7 @@ public boolean hasDuplicateNameAdd(String name) { public boolean hasDuplicateNameEdit(String name, Integer index) { int count = 0; for (int i = 0; i < filteredPersons.size(); i++) { - if (filteredPersons.get(i).getName().toString().contains(name) && i != index) { + if (filteredPersons.get(i).getName().toString().toLowerCase().contains(name.toLowerCase()) && i != index) { count++; } } @@ -190,7 +190,7 @@ public boolean hasDuplicateNameEdit(String name, Integer index) { public boolean hasExtendedName(String name) { int count = 0; for (Student s : filteredPersons) { - if (name.contains(s.getName().toString())) { + if (name.toLowerCase().contains(s.getName().toString().toLowerCase())) { count++; } } @@ -201,7 +201,7 @@ public boolean hasExtendedName(String name) { public boolean hasExtendedNameEdit(String name, Integer index) { int count = 0; for (int i = 0; i < filteredPersons.size(); i++) { - if (name.contains(filteredPersons.get(i).getName().toString()) && i != index) { + if (name.toLowerCase().contains(filteredPersons.get(i).getName().toString().toLowerCase()) && i != index) { count++; } } @@ -211,7 +211,7 @@ public boolean hasExtendedNameEdit(String name, Integer index) { @Override public boolean noSuchStudent(String name) { for (Student s : filteredPersons) { - if (s.getName().toString().contains(name)) { + if (s.getName().toString().toLowerCase().contains(name.toLowerCase())) { return false; } } diff --git a/src/main/java/seedu/address/model/student/NamePredicate.java b/src/main/java/seedu/address/model/student/NamePredicate.java index a081d18fa41..bcff1188c5f 100644 --- a/src/main/java/seedu/address/model/student/NamePredicate.java +++ b/src/main/java/seedu/address/model/student/NamePredicate.java @@ -26,7 +26,7 @@ public NamePredicate(List names) { @Override public boolean test(Student student) { for (String name : names) { - if (student.getName().toString().contains(name)) { + if (student.getName().toString().toLowerCase().contains(name.toLowerCase())) { return true; } }