forked from se-edu/addressbook-level2
-
Notifications
You must be signed in to change notification settings - Fork 125
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
[T4A4][W14-A4]Lee Jin Shun #1066
Open
jinshunlee
wants to merge
1
commit into
nus-cs2103-AY1617S2:master
Choose a base branch
from
jinshunlee:T4A4
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.
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,12 +6,14 @@ | |
* 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 = | ||
"Person emails should be 2 alphanumeric/period strings separated by '@'"; | ||
public static final String EMAIL_VALIDATION_REGEX = "[\\w\\.]+@[\\w\\.]+"; | ||
public static final String EMAIL_PREFIX_STR = "Email: "; | ||
public static final String ACCESS_DENIED = "Access Denied! Private Email!"; | ||
|
||
public final String value; | ||
private boolean isPrivate; | ||
|
@@ -58,4 +60,13 @@ public int hashCode() { | |
public boolean isPrivate() { | ||
return isPrivate; | ||
} | ||
|
||
@Override | ||
public String getPrintableString() { | ||
if(isPrivate){ | ||
return ACCESS_DENIED; | ||
} else { | ||
return EMAIL_PREFIX_STR + toString(); | ||
} | ||
} | ||
} |
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 |
---|---|---|
|
@@ -84,4 +84,16 @@ public String toString() { | |
return getAsTextShowAll(); | ||
} | ||
|
||
|
||
|
||
@Override | ||
public String getPrintableString(Printable... printable) { | ||
String printedText = ""; | ||
for(Printable element : printable){ | ||
printedText += element.getPrintableString() + ", "; | ||
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. Take note of magic strings. |
||
} | ||
// remove ", " for the last printable element | ||
return printedText.substring(0, printedText.length() - 2); | ||
|
||
} | ||
} |
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,13 @@ | ||
package seedu.addressbook.data.person; | ||
|
||
/** | ||
* An interface to help beautify objects to a nicer string representation. | ||
*/ | ||
public interface Printable { | ||
|
||
/** | ||
* Returns a string of the object in the terms of Name, Phone, Email, Address | ||
* eg. Name: John Smith, Phone: 12349862 | ||
*/ | ||
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
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.
Maybe
printables
sounds more appropriate here