Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[W6.4h][W15-B1]Yang Yuqing #753

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/seedu/addressbook/data/person/Address.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Represents a Person's address in the address book.
* Guarantees: immutable; is valid as declared in {@link #isValidAddress(String)}
*/
public class Address {
public class Address implements Printable{

public static final String EXAMPLE = "123, some street";
public static final String MESSAGE_ADDRESS_CONSTRAINTS = "Person addresses can be in any format";
Expand Down Expand Up @@ -52,6 +52,15 @@ public int hashCode() {
return value.hashCode();
}

@Override
public String getPrintableString() {
if(isPrivate()) {
return "Address: (private) " + value;
} else {
return "Address: " + value;
}
}

public boolean isPrivate() {
return isPrivate;
}
Expand Down
11 changes: 9 additions & 2 deletions src/seedu/addressbook/data/person/Email.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Represents a Person's email in the address book.
* Guarantees: immutable; is valid as declared in {@link #isValidEmail(String)}
*/
public class Email {
public class Email implements Printable{

public static final String EXAMPLE = "[email protected]";
public static final String MESSAGE_EMAIL_CONSTRAINTS =
Expand Down Expand Up @@ -54,7 +54,14 @@ public int hashCode() {
return value.hashCode();
}


@Override
public String getPrintableString() {
if(isPrivate()) {
return "Email: (private) " + value;
} else {
return "Email: " + value;
}
}
public boolean isPrivate() {
return isPrivate;
}
Expand Down
6 changes: 5 additions & 1 deletion src/seedu/addressbook/data/person/Name.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Represents a Person's name in the address book.
* Guarantees: immutable; is valid as declared in {@link #isValidName(String)}
*/
public class Name {
public class Name implements Printable{

public static final String EXAMPLE = "John Doe";
public static final String MESSAGE_NAME_CONSTRAINTS = "Person names should be spaces or alphanumeric characters";
Expand Down Expand Up @@ -61,4 +61,8 @@ public int hashCode() {
return fullName.hashCode();
}

@Override
public String getPrintableString() {
return "Name: " + fullName;
}
}
11 changes: 10 additions & 1 deletion src/seedu/addressbook/data/person/Phone.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Represents a Person's phone number in the address book.
* Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
*/
public class Phone {
public class Phone implements Printable{

public static final String EXAMPLE = "123456789";
public static final String MESSAGE_PHONE_CONSTRAINTS = "Person phone numbers should only contain numbers";
Expand Down Expand Up @@ -53,6 +53,15 @@ public int hashCode() {
return value.hashCode();
}

@Override
public String getPrintableString() {
if(isPrivate()) {
return "Phone: (private) " + value;
} else {
return "Phone: " + value;
}
}

public boolean isPrivate() {
return isPrivate;
}
Expand Down
15 changes: 15 additions & 0 deletions src/seedu/addressbook/data/person/Printable.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package seedu.addressbook.data.person;


/**
* This is an interface to provide an object's printable representation.
*/
public interface Printable {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job in remembering to write comments for the new interface.



/**
* Returns a String representation of an object
*/

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid spaces in between comments and code.

String getPrintableString();
}
36 changes: 15 additions & 21 deletions src/seedu/addressbook/data/person/ReadOnlyPerson.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import seedu.addressbook.data.tag.Tag;
import seedu.addressbook.data.tag.UniqueTagList;
import java.util.StringJoiner;

/**
* A read-only immutable interface for a Person in the addressbook.
Expand Down Expand Up @@ -36,29 +37,14 @@ default boolean isSameStateAs(ReadOnlyPerson other) {
* Formats the person as text, showing all contact details.
*/
default String getAsTextShowAll() {
final StringBuilder builder = new StringBuilder();
final String detailIsPrivate = "(private) ";
builder.append(getName())
.append(" Phone: ");
if (getPhone().isPrivate()) {
builder.append(detailIsPrivate);
}
builder.append(getPhone())
.append(" Email: ");
if (getEmail().isPrivate()) {
builder.append(detailIsPrivate);
}
builder.append(getEmail())
.append(" Address: ");
if (getAddress().isPrivate()) {
builder.append(detailIsPrivate);
}
builder.append(getAddress())
.append(" Tags: ");
String info = getPrintableString(getName(), getPhone(), getEmail(), getAddress());
final StringBuilder sb = new StringBuilder();
sb.append(info);
sb.append(" Tags: ");
for (Tag tag : getTags()) {
builder.append(tag);
sb.append(tag);
}
return builder.toString();
return sb.toString();
}

/**
Expand All @@ -82,4 +68,12 @@ default String getAsTextHidePrivate() {
}
return builder.toString();
}

default String getPrintableString(Printable... printables) {
StringJoiner sj = new StringJoiner(" ");

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

StringBuilder or StringJoiner can both be used. Good that one of the mentioned is used here.

for (Printable printable: printables) {
sj.add(printable.getPrintableString());
}
return sj.toString();
}
}