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.

Sign up for GitHub

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

Improve code #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve code #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 45 additions & 38 deletions src/main/java/Contacts0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@

public class Contacts0 {

public static final int MAX_RECORDS = 100;
public static final String WORD_SEPARATOR = "|| ";
Comment on lines +6 to +7
Copy link
Contributor

Choose a reason for hiding this comment

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

Good job on extracting the constants


public static void main(String[] args) {
final Scanner SCANNER = new Scanner(System.in);
System.out.println("|| ===================================================");
System.out.println("|| ===================================================");
System.out.println("|| Contacts - Version 0.0");
System.out.println("|| Welcome to Contacts!");
System.out.println("|| ===================================================");
String[][] list = new String[100][3];
showWelcomeMessage();
String[][] list = new String[MAX_RECORDS][3];
int count = 0;
while (true) {
System.out.print("|| " + "Enter command: ");
System.out.print(WORD_SEPARATOR + "Enter command: ");
String inputLine = SCANNER.nextLine();
while (inputLine.trim().isEmpty() || inputLine.trim().charAt(0) == '#') {
inputLine = SCANNER.nextLine();
Expand Down Expand Up @@ -62,12 +61,12 @@ public static void main(String[] args) {
&& !person1[2].isEmpty() && person1[2].contains("@") ? person1 : null;
}
if (decodeResult == null) {
feedback = String.format("Invalid command format: %1$s " + (System.lineSeparator() + "|| ")
+ "%2$s", "add", String.format("%1$s: %2$s", "add", "Adds a person to contacts.") + (System.lineSeparator() + "|| ")
feedback = String.format("Invalid command format: %1$s " + (System.lineSeparator() + WORD_SEPARATOR)
+ "%2$s", "add", String.format("%1$s: %2$s", "add", "Adds a person to contacts.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tParameters: %1$s", "NAME "
+ "p/" + "PHONE_NUMBER "
+ "e/" + "EMAIL") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "add" + " John Doe p/98765432 e/[email protected]") + (System.lineSeparator() + "|| "));
+ "e/" + "EMAIL") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "add" + " John Doe p/98765432 e/[email protected]") + (System.lineSeparator() + WORD_SEPARATOR));
break;
}
list[count] = decodeResult;
Expand All @@ -83,67 +82,75 @@ public static void main(String[] args) {
final int displayIndex = i + 1;
messageAccumulator.append('\t').append(String.format("%1$d. ", displayIndex))
.append(String.format("%1$s Phone Number: %2$s Email: %3$s", person[0], person[1], person[2]))
.append(System.lineSeparator()).append("|| ");
.append(System.lineSeparator()).append(WORD_SEPARATOR);
}
String listAsString = messageAccumulator.toString();
for (String m1 : new String[]{listAsString}) {
System.out.println("|| " + m1);
System.out.println(WORD_SEPARATOR + m1);
}
feedback = String.format("%1$d persons found!", count);
break;
case "clear":
list = new String[100][3];
list = new String[MAX_RECORDS][3];
count = 0;
feedback = "Contacts have been cleared!";
break;
case "help":
feedback = (String.format("%1$s: %2$s", "add", "Adds a person to contacts.") + (System.lineSeparator() + "|| ")
feedback = (String.format("%1$s: %2$s", "add", "Adds a person to contacts.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tParameters: %1$s", "NAME "
+ "p/" + "PHONE_NUMBER "
+ "e/" + "EMAIL") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "add" + " John Doe p/98765432 e/[email protected]") + (System.lineSeparator() + "|| ")) + (System.lineSeparator() + "|| ")
+ (String.format("%1$s: %2$s", "list", "Displays all persons as a list with index numbers.") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "list") + (System.lineSeparator() + "|| ")) + (System.lineSeparator() + "|| ")
+ (String.format("%1$s: %2$s", "clear", "Clears all contacts.") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "clear") + (System.lineSeparator() + "|| ")) + (System.lineSeparator() + "|| ")
+ (String.format("%1$s: %2$s", "exit", "Exits the program.")+ (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "exit")) + (System.lineSeparator() + "|| ") + (System.lineSeparator() + "|| ")
+ (String.format("%1$s: %2$s", "help", "Shows program usage instructions.")+ (System.lineSeparator() + "|| ")
+ "e/" + "EMAIL") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "add" + " John Doe p/98765432 e/[email protected]") + (System.lineSeparator() + WORD_SEPARATOR)) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "list", "Displays all persons as a list with index numbers.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "list") + (System.lineSeparator() + WORD_SEPARATOR)) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "clear", "Clears all contacts.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "clear") + (System.lineSeparator() + WORD_SEPARATOR)) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "exit", "Exits the program.")+ (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "exit")) + (System.lineSeparator() + WORD_SEPARATOR) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "help", "Shows program usage instructions.")+ (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "help"));
break;
case "exit":
for (String m1 : new String[]{"Exiting Contacts... Good bye!",
"===================================================",
"==================================================="}) {
System.out.println("|| " + m1);
System.out.println(WORD_SEPARATOR + m1);
}
System.exit(0);
// Fallthrough
default:
feedback = String.format("Invalid command format: %1$s " + (System.lineSeparator() + "|| ")
+ "%2$s", commandType, (String.format("%1$s: %2$s", "add", "Adds a person to contacts.") + (System.lineSeparator() + "|| ")
feedback = String.format("Invalid command format: %1$s " + (System.lineSeparator() + WORD_SEPARATOR)
+ "%2$s", commandType, (String.format("%1$s: %2$s", "add", "Adds a person to contacts.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tParameters: %1$s", "NAME "
+ "p/" + "PHONE_NUMBER "
+ "e/" + "EMAIL") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "add" + " John Doe p/98765432 e/[email protected]") + (System.lineSeparator() + "|| ")) + (System.lineSeparator() + "|| ")
+ "e/" + "EMAIL") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "add" + " John Doe p/98765432 e/[email protected]") + (System.lineSeparator() + WORD_SEPARATOR)) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "find", "Finds all persons whose names contain any of the specified "
+ "keywords (case-sensitive) and displays them as a list with index numbers.") + (System.lineSeparator() + "|| ")
+ String.format("\tParameters: %1$s", "KEYWORD [MORE_KEYWORDS]") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "find" + " alice bob charlie") + (System.lineSeparator() + "|| ")) + (System.lineSeparator() + "|| ")
+ (String.format("%1$s: %2$s", "list", "Displays all persons as a list with index numbers.") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "list") + (System.lineSeparator() + "|| ")) + (System.lineSeparator() + "|| ")
+ (String.format("%1$s: %2$s", "clear", "Clears all contacts.") + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "clear") + (System.lineSeparator() + "|| ")) + (System.lineSeparator() + "|| ")
+ "keywords (case-sensitive) and displays them as a list with index numbers.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tParameters: %1$s", "KEYWORD [MORE_KEYWORDS]") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "find" + " alice bob charlie") + (System.lineSeparator() + WORD_SEPARATOR)) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "list", "Displays all persons as a list with index numbers.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "list") + (System.lineSeparator() + WORD_SEPARATOR)) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "clear", "Clears all contacts.") + (System.lineSeparator() + WORD_SEPARATOR)
+ String.format("\tExample: %1$s", "clear") + (System.lineSeparator() + WORD_SEPARATOR)) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "exit", "Exits the program.")
+ String.format("\tExample: %1$s", "exit")) + (System.lineSeparator() + "|| ")
+ String.format("\tExample: %1$s", "exit")) + (System.lineSeparator() + WORD_SEPARATOR)
+ (String.format("%1$s: %2$s", "help", "Shows program usage instructions.")
+ String.format("\tExample: %1$s", "help")));
break;
}
for (String m : new String[]{feedback, "==================================================="}) {
System.out.println("|| " + m);
System.out.println(WORD_SEPARATOR + m);
}
}
}

private static void showWelcomeMessage() {
System.out.println("|| ===================================================");
System.out.println("|| ===================================================");
System.out.println("|| Contacts - Version 0.1");
System.out.println("|| Welcome to Contacts!");
System.out.println("|| ===================================================");
}

}
2 changes: 1 addition & 1 deletion text-ui-test/EXPECTED.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
|| ===================================================
|| ===================================================
|| Contacts - Version 0.0
|| Contacts - Version 0.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Good that you updated the test!

|| Welcome to Contacts!
|| ===================================================
|| Enter command: || [Command entered:help]
Expand Down