forked from se-edu/addressbook-level25
-
Notifications
You must be signed in to change notification settings - Fork 141
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
Yoochard
wants to merge
3
commits into
nus-cs2103-AY1718S2:master
Choose a base branch
from
Yoochard:Branch-6.4h
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+64
−26
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 = | ||
|
@@ -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; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 { | ||
|
||
|
||
/** | ||
* Returns a String representation of an object | ||
*/ | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please avoid spaces in between comments and code. |
||
String getPrintableString(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. | ||
|
@@ -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(); | ||
} | ||
|
||
/** | ||
|
@@ -82,4 +68,12 @@ default String getAsTextHidePrivate() { | |
} | ||
return builder.toString(); | ||
} | ||
|
||
default String getPrintableString(Printable... printables) { | ||
StringJoiner sj = new StringJoiner(" "); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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(); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.