From b733748d35781ca6a67485ced8f053251b3edf1b Mon Sep 17 00:00:00 2001 From: Lim Dao Han Date: Tue, 27 Jun 2017 00:45:10 +0800 Subject: [PATCH 1/5] Encapsulated feedbackToUser in CommandResult --- src/seedu/addressbook/commands/CommandResult.java | 6 +++++- src/seedu/addressbook/ui/TextUi.java | 2 +- test/java/seedu/addressbook/commands/AddCommandTest.java | 4 ++-- test/java/seedu/addressbook/commands/DeleteCommandTest.java | 2 +- test/java/seedu/addressbook/commands/FindCommandTest.java | 2 +- test/java/seedu/addressbook/commands/ViewCommandTest.java | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/seedu/addressbook/commands/CommandResult.java b/src/seedu/addressbook/commands/CommandResult.java index 8864681c6..43c930b92 100644 --- a/src/seedu/addressbook/commands/CommandResult.java +++ b/src/seedu/addressbook/commands/CommandResult.java @@ -11,7 +11,7 @@ public class CommandResult { /** The feedback message to be shown to the user. Contains a description of the execution result */ - public final String feedbackToUser; + private final String feedbackToUser; /** The list of persons that was produced by the command */ private final List relevantPersons; @@ -33,4 +33,8 @@ public Optional> getRelevantPersons() { return Optional.ofNullable(relevantPersons); } + public String getFeedbackToUser() { + return feedbackToUser; + } + } diff --git a/src/seedu/addressbook/ui/TextUi.java b/src/seedu/addressbook/ui/TextUi.java index d30371c70..ad38a528d 100644 --- a/src/seedu/addressbook/ui/TextUi.java +++ b/src/seedu/addressbook/ui/TextUi.java @@ -129,7 +129,7 @@ public void showResultToUser(CommandResult result) { if (resultPersons.isPresent()) { showPersonListView(resultPersons.get()); } - showToUser(result.feedbackToUser, DIVIDER); + showToUser(result.getFeedbackToUser(), DIVIDER); } /** diff --git a/test/java/seedu/addressbook/commands/AddCommandTest.java b/test/java/seedu/addressbook/commands/AddCommandTest.java index fd870a62e..1a630f91a 100644 --- a/test/java/seedu/addressbook/commands/AddCommandTest.java +++ b/test/java/seedu/addressbook/commands/AddCommandTest.java @@ -126,7 +126,7 @@ public void addCommand_emptyAddressBook_addressBookContainsPerson() { assertTrue(people.contains(p)); assertEquals(1, people.immutableListView().size()); assertFalse(result.getRelevantPersons().isPresent()); - assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, p), result.feedbackToUser); + assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, p), result.getFeedbackToUser()); } @Test @@ -139,7 +139,7 @@ public void addCommand_addressBookAlreadyContainsPerson_addressBookUnmodified() CommandResult result = command.execute(); assertFalse(result.getRelevantPersons().isPresent()); - assertEquals(AddCommand.MESSAGE_DUPLICATE_PERSON, result.feedbackToUser); + assertEquals(AddCommand.MESSAGE_DUPLICATE_PERSON, result.getFeedbackToUser()); UniquePersonList people = book.getAllPersons(); assertTrue(people.contains(p)); assertEquals(1, people.immutableListView().size()); diff --git a/test/java/seedu/addressbook/commands/DeleteCommandTest.java b/test/java/seedu/addressbook/commands/DeleteCommandTest.java index 0e5ab80d9..4f71f198d 100644 --- a/test/java/seedu/addressbook/commands/DeleteCommandTest.java +++ b/test/java/seedu/addressbook/commands/DeleteCommandTest.java @@ -109,7 +109,7 @@ private void assertCommandBehaviour(DeleteCommand deleteCommand, String expected CommandResult result = deleteCommand.execute(); - assertEquals(expectedMessage, result.feedbackToUser); + assertEquals(expectedMessage, result.getFeedbackToUser()); assertEquals(expectedAddressBook.getAllPersons(), actualAddressBook.getAllPersons()); } diff --git a/test/java/seedu/addressbook/commands/FindCommandTest.java b/test/java/seedu/addressbook/commands/FindCommandTest.java index f21b1e8e7..1baa0aa12 100644 --- a/test/java/seedu/addressbook/commands/FindCommandTest.java +++ b/test/java/seedu/addressbook/commands/FindCommandTest.java @@ -50,7 +50,7 @@ private void assertFindCommandBehavior(String[] keywords, List e FindCommand command = createFindCommand(keywords); CommandResult result = command.execute(); - assertEquals(Command.getMessageForPersonListShownSummary(expectedPersonList), result.feedbackToUser); + assertEquals(Command.getMessageForPersonListShownSummary(expectedPersonList), result.getFeedbackToUser()); } private FindCommand createFindCommand(String[] keywords) { diff --git a/test/java/seedu/addressbook/commands/ViewCommandTest.java b/test/java/seedu/addressbook/commands/ViewCommandTest.java index 3408463c1..6c1d88161 100644 --- a/test/java/seedu/addressbook/commands/ViewCommandTest.java +++ b/test/java/seedu/addressbook/commands/ViewCommandTest.java @@ -144,7 +144,7 @@ private static void assertViewBehavior(Command viewCommand, AddressBook addressB CommandResult result = viewCommand.execute(); // feedback message is as expected and there are no relevant persons returned. - assertEquals(expectedMessage, result.feedbackToUser); + assertEquals(expectedMessage, result.getFeedbackToUser()); assertEquals(Optional.empty(), result.getRelevantPersons()); // addressbook was not modified. From ab65f31b29e824d182019d0cd59667cdef698196 Mon Sep 17 00:00:00 2001 From: Lim Dao Han Date: Mon, 3 Jul 2017 14:51:24 +0800 Subject: [PATCH 2/5] Implement tracking function to track all add/delete tag commands --- src/seedu/addressbook/data/tag/Tagging.java | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/seedu/addressbook/data/tag/Tagging.java diff --git a/src/seedu/addressbook/data/tag/Tagging.java b/src/seedu/addressbook/data/tag/Tagging.java new file mode 100644 index 000000000..e554d57a4 --- /dev/null +++ b/src/seedu/addressbook/data/tag/Tagging.java @@ -0,0 +1,35 @@ +package seedu.addressbook.data.tag; + +import java.util.ArrayList; + +import seedu.addressbook.data.person.Person; + +/** Association class to support the following functionality: + * When the AddressBook program exits, it should print out a list of all the tags added/deleted during that session. + */ + +public class Tagging { + private ArrayList allTheTags = new ArrayList<>(); + private final String ADD_COMMAND = "add"; + private final String DELETE_COMMAND = "remove"; + + // Record tags added/deleted during that session. + public void trackTagging(String command, Person person, Tag tag) { + if (command == ADD_COMMAND) { + allTheTags.add("+ " + person.getName().toString() + " " + tag.toString()); + } + else if (command == DELETE_COMMAND) { + allTheTags.add("- " + person.getName().toString() + " " + tag.toString()); + } + } + + // To print out a list of all the tags added/deleted during the session, when the AddressBook program exits. + public String getAllTags(){ + StringBuilder allActions = new StringBuilder(); + for(String tag: allTheTags){ + allActions.append(tag + "\n"); + } + return allActions.toString(); + } + +} From 46d3843f3c9f5ecdb763eb94a8fbe593eb635932 Mon Sep 17 00:00:00 2001 From: Lim Dao Han Date: Mon, 3 Jul 2017 14:57:16 +0800 Subject: [PATCH 3/5] no message --- src/seedu/addressbook/data/tag/Tagging.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/seedu/addressbook/data/tag/Tagging.java b/src/seedu/addressbook/data/tag/Tagging.java index e554d57a4..6c3d6c75e 100644 --- a/src/seedu/addressbook/data/tag/Tagging.java +++ b/src/seedu/addressbook/data/tag/Tagging.java @@ -4,9 +4,8 @@ import seedu.addressbook.data.person.Person; -/** Association class to support the following functionality: - * When the AddressBook program exits, it should print out a list of all the tags added/deleted during that session. - */ +// Association class to that prints out list of all the tags added/deleted during the session + public class Tagging { private ArrayList allTheTags = new ArrayList<>(); From 2f432b4d75b4caece39a25cea600e7c3b8e6bb9a Mon Sep 17 00:00:00 2001 From: Lim Dao Han Date: Mon, 3 Jul 2017 16:26:47 +0800 Subject: [PATCH 4/5] no message --- src/seedu/addressbook/data/tag/Tagging.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/seedu/addressbook/data/tag/Tagging.java b/src/seedu/addressbook/data/tag/Tagging.java index 6c3d6c75e..101d72eb3 100644 --- a/src/seedu/addressbook/data/tag/Tagging.java +++ b/src/seedu/addressbook/data/tag/Tagging.java @@ -14,18 +14,18 @@ public class Tagging { // Record tags added/deleted during that session. public void trackTagging(String command, Person person, Tag tag) { - if (command == ADD_COMMAND) { + if (command.equals(ADD_COMMAND)) { allTheTags.add("+ " + person.getName().toString() + " " + tag.toString()); } - else if (command == DELETE_COMMAND) { + else if (command.equals(DELETE_COMMAND)) { allTheTags.add("- " + person.getName().toString() + " " + tag.toString()); } } // To print out a list of all the tags added/deleted during the session, when the AddressBook program exits. - public String getAllTags(){ + public String getAllTags() { StringBuilder allActions = new StringBuilder(); - for(String tag: allTheTags){ + for(String tag: allTheTags) { allActions.append(tag + "\n"); } return allActions.toString(); From 1d4c1323a37114dd9f1dbe7ea2a65b0d2d180119 Mon Sep 17 00:00:00 2001 From: Lim Dao Han Date: Mon, 3 Jul 2017 16:37:56 +0800 Subject: [PATCH 5/5] no message --- src/seedu/addressbook/data/tag/Tagging.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/seedu/addressbook/data/tag/Tagging.java b/src/seedu/addressbook/data/tag/Tagging.java index 101d72eb3..b4f34afcf 100644 --- a/src/seedu/addressbook/data/tag/Tagging.java +++ b/src/seedu/addressbook/data/tag/Tagging.java @@ -23,9 +23,9 @@ else if (command.equals(DELETE_COMMAND)) { } // To print out a list of all the tags added/deleted during the session, when the AddressBook program exits. - public String getAllTags() { + public String getAllTags(){ StringBuilder allActions = new StringBuilder(); - for(String tag: allTheTags) { + for(String tag: allTheTags){ allActions.append(tag + "\n"); } return allActions.toString();