Skip to content

Commit

Permalink
Merge pull request #130 from Yskie/branch-edit-command
Browse files Browse the repository at this point in the history
Fix task to string issue
  • Loading branch information
Kaya3842 authored Apr 11, 2024
2 parents a9f4d4c + 6dacf8c commit b2fa82c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
7 changes: 3 additions & 4 deletions src/main/java/seedu/address/logic/Messages.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ public class Messages {
public static String getErrorMessageForDuplicatePrefixes(Prefix... duplicatePrefixes) {
assert duplicatePrefixes.length > 0;

Set<String> duplicateFields =
Stream.of(duplicatePrefixes).map(Prefix::toString).collect(Collectors.toSet());
Set<String> duplicateFields = Stream.of(duplicatePrefixes).map(Prefix::toString).collect(Collectors.toSet());

return MESSAGE_DUPLICATE_FIELDS + String.join(" ", duplicateFields);
}
Expand All @@ -47,8 +46,8 @@ public static String format(Person person) {
.append(person.getEmail())
.append("; Address: ")
.append(person.getAddress())
.append("; Tasks: ");
person.getTasks().forEach(builder::append);
.append("; Tasks: ")
.append(person.getTaskString());
return builder.toString();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/seedu/address/model/person/Person.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,18 @@ public boolean isSamePerson(Person otherPerson) {
&& otherPerson.getName().equals(getName());
}

/**
* Returns all the assigned task in string.
*/
public String getTaskString() {
final StringBuilder builder = new StringBuilder();
tasks.forEach(builder::append);
if (builder.length() != 0) {
return builder.substring(0, builder.length() - 2);
}
return builder.toString();
}

/**
* Returns true if both persons have the same identity and data fields.
* This defines a stronger notion of equality between two persons.
Expand Down Expand Up @@ -151,5 +163,4 @@ public String toString() {
.add("tasks", tasks)
.toString();
}

}
5 changes: 5 additions & 0 deletions src/main/java/seedu/address/model/task/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ public int hashCode() {
return Objects.hash(name, description, priority, deadline);
}

@Override
public String toString() {
return name.toString() + ", ";
}

/**
* Compare with other tasks for sorting in tags.
* @param otherTask Task to be compared to
Expand Down

0 comments on commit b2fa82c

Please sign in to comment.