diff --git a/docs/tutorials/TracingCode.md b/docs/tutorials/TracingCode.md
index 0c3f9a308f5..0bd06f34fac 100644
--- a/docs/tutorials/TracingCode.md
+++ b/docs/tutorials/TracingCode.md
@@ -231,7 +231,7 @@ Try to keep track of what happens inside the component and where the execution t
public CommandResult execute(Model model) throws CommandException {
...
Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
+ Person editedPerson = createEditedPerson(personToEdit, personEditDescriptor);
if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
throw new CommandException(MESSAGE_DUPLICATE_PERSON);
}
diff --git a/src/main/java/seedu/address/Main.java b/src/main/java/seedu/address/Main.java
index 052a5068631..4208153a631 100644
--- a/src/main/java/seedu/address/Main.java
+++ b/src/main/java/seedu/address/Main.java
@@ -8,7 +8,7 @@
* This is a workaround for the following error when MainApp is made the
* entry point of the application:
*
- * Error: JavaFX runtime components are missing, and are required to run this application
+ * Error: JavaFX runtime components are missing, and are required to run this application
*
* The reason is that MainApp extends Application. In that case, the
* LauncherHelper will check for the javafx.graphics module to be present
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java
index 6c3e5d4a670..5a9a6c36b63 100644
--- a/src/main/java/seedu/address/MainApp.java
+++ b/src/main/java/seedu/address/MainApp.java
@@ -16,6 +16,7 @@
import seedu.address.commons.util.StringUtil;
import seedu.address.logic.Logic;
import seedu.address.logic.LogicManager;
+import seedu.address.logic.executors.Executor;
import seedu.address.model.AddressBook;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
@@ -69,6 +70,8 @@ public void init() throws Exception {
logic = new LogicManager(model, storage);
ui = new UiManager(logic);
+
+ Executor.setup(model);
}
/**
diff --git a/src/main/java/seedu/address/commons/core/LogsCenter.java b/src/main/java/seedu/address/commons/core/LogsCenter.java
index 431e7185e76..1177cef1b1d 100644
--- a/src/main/java/seedu/address/commons/core/LogsCenter.java
+++ b/src/main/java/seedu/address/commons/core/LogsCenter.java
@@ -12,8 +12,8 @@
* Configures and manages loggers and handlers, including their logging level
* Named {@link Logger}s can be obtained from this class
* These loggers have been configured to output messages to the console and a {@code .log} file by default,
- * at the {@code INFO} level. A new {@code .log} file with a new numbering will be created after the log
- * file reaches 5MB big, up to a maximum of 5 files.
+ * at the {@code INFO} level. A new {@code .log} file with a new numbering will be created after the log
+ * file reaches 5MB big, up to a maximum of 5 files.
*/
public class LogsCenter {
private static final int MAX_FILE_COUNT = 5;
@@ -95,6 +95,7 @@ private static void addFileHandler(Logger logger) {
/**
* Creates a {@code FileHandler} for the log file.
+ *
* @throws IOException if there are problems opening the file.
*/
private static FileHandler createFileHandler() throws IOException {
diff --git a/src/main/java/seedu/address/commons/core/Messages.java b/src/main/java/seedu/address/commons/core/Messages.java
index 1deb3a1e469..4d54b47f853 100644
--- a/src/main/java/seedu/address/commons/core/Messages.java
+++ b/src/main/java/seedu/address/commons/core/Messages.java
@@ -8,6 +8,8 @@ public class Messages {
public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
+ public static final String MESSAGE_INVALID_GROUP_DISPLAYED_INDEX = "The group index provided is invalid";
public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
+ public static final String MESSAGE_GROUPS_LISTED_OVERVIEW = "%1$d groups listed!";
}
diff --git a/src/main/java/seedu/address/commons/core/Version.java b/src/main/java/seedu/address/commons/core/Version.java
index 9416b9e8486..46cc181b603 100644
--- a/src/main/java/seedu/address/commons/core/Version.java
+++ b/src/main/java/seedu/address/commons/core/Version.java
@@ -50,6 +50,7 @@ public boolean isEarlyAccess() {
/**
* Parses a version number string in the format V1.2.3.
+ *
* @param versionString version number string
* @return a Version object
*/
diff --git a/src/main/java/seedu/address/commons/util/CollectionUtil.java b/src/main/java/seedu/address/commons/util/CollectionUtil.java
index eafe4dfd681..942edda97d7 100644
--- a/src/main/java/seedu/address/commons/util/CollectionUtil.java
+++ b/src/main/java/seedu/address/commons/util/CollectionUtil.java
@@ -12,7 +12,9 @@
*/
public class CollectionUtil {
- /** @see #requireAllNonNull(Collection) */
+ /**
+ * @see #requireAllNonNull(Collection)
+ */
public static void requireAllNonNull(Object... items) {
requireNonNull(items);
Stream.of(items).forEach(Objects::requireNonNull);
diff --git a/src/main/java/seedu/address/commons/util/FileUtil.java b/src/main/java/seedu/address/commons/util/FileUtil.java
index b1e2767cdd9..f811215474c 100644
--- a/src/main/java/seedu/address/commons/util/FileUtil.java
+++ b/src/main/java/seedu/address/commons/util/FileUtil.java
@@ -20,6 +20,7 @@ public static boolean isFileExists(Path file) {
/**
* Returns true if {@code path} can be converted into a {@code Path} via {@link Paths#get(String)},
* otherwise returns false.
+ *
* @param path A string representing the file path. Cannot be null.
*/
public static boolean isValidPath(String path) {
@@ -33,6 +34,7 @@ public static boolean isValidPath(String path) {
/**
* Creates a file if it does not exist along with its missing parent directories.
+ *
* @throws IOException if the file or directory cannot be created.
*/
public static void createIfMissing(Path file) throws IOException {
diff --git a/src/main/java/seedu/address/commons/util/JsonUtil.java b/src/main/java/seedu/address/commons/util/JsonUtil.java
index e6a132215b8..bf225ed0bdf 100644
--- a/src/main/java/seedu/address/commons/util/JsonUtil.java
+++ b/src/main/java/seedu/address/commons/util/JsonUtil.java
@@ -51,6 +51,7 @@ static T deserializeObjectFromJsonFile(Path jsonFile, Class classOfObject
/**
* Returns the Json object from the given file or {@code Optional.empty()} object if the file is not found.
* If any values are missing from the file, default values will be used, as long as the file is a valid json file.
+ *
* @param filePath cannot be null.
* @param classOfObjectToDeserialize Json file has to correspond to the structure in the class given here.
* @throws DataConversionException if the file format is not as expected.
@@ -79,6 +80,7 @@ public static Optional readJsonFile(
/**
* Saves the Json object to the specified file.
* Overwrites existing file if it exists, creates a new file if it doesn't.
+ *
* @param jsonFile cannot be null
* @param filePath cannot be null
* @throws IOException if there was an error during writing to the file
@@ -93,6 +95,7 @@ public static void saveJsonFile(T jsonFile, Path filePath) throws IOExceptio
/**
* Converts a given string representation of a JSON data to instance of a class
+ *
* @param The generic type to create an instance of
* @return The instance of T with the specified values in the JSON string
*/
@@ -102,6 +105,7 @@ public static T fromJsonString(String json, Class instanceClass) throws I
/**
* Converts a given instance of a class into its JSON data string representation
+ *
* @param instance The T object to be converted into the JSON string
* @param The generic type to create an instance of
* @return JSON data representation of the given class instance, in string
@@ -128,7 +132,6 @@ protected Level _deserialize(String value, DeserializationContext ctxt) {
* Gets the logging level that matches loggingLevelString
*
* Returns null if there are no matches
- *
*/
private Level getLoggingLevel(String loggingLevelString) {
return Level.parse(loggingLevelString);
diff --git a/src/main/java/seedu/address/commons/util/StringUtil.java b/src/main/java/seedu/address/commons/util/StringUtil.java
index e0717c40fc2..b8690b530c7 100644
--- a/src/main/java/seedu/address/commons/util/StringUtil.java
+++ b/src/main/java/seedu/address/commons/util/StringUtil.java
@@ -14,12 +14,13 @@ public class StringUtil {
/**
* Returns true if the {@code sentence} contains the {@code word}.
- * Ignores case, but a full word match is required.
- * examples:
+ * Ignores case, but a full word match is required.
+ * examples:
* containsWordIgnoreCase("ABc def", "abc") == true
* containsWordIgnoreCase("ABc def", "DEF") == true
* containsWordIgnoreCase("ABc def", "AB") == false //not a full word match
*
+ *
* @param sentence cannot be null
* @param word cannot be null, cannot be empty, must be a single word
*/
@@ -53,6 +54,7 @@ public static String getDetails(Throwable t) {
* e.g. 1, 2, 3, ..., {@code Integer.MAX_VALUE}
* Will return false for any other non-null string input
* e.g. empty string, "-1", "0", "+1", and " 2 " (untrimmed), "3 0" (contains whitespace), "1 a" (contains letters)
+ *
* @throws NullPointerException if {@code s} is null.
*/
public static boolean isNonZeroUnsignedInteger(String s) {
diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
index 92cd8fa605a..eab85b5280e 100644
--- a/src/main/java/seedu/address/logic/Logic.java
+++ b/src/main/java/seedu/address/logic/Logic.java
@@ -6,6 +6,7 @@
import seedu.address.commons.core.GuiSettings;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.executors.exceptions.ExecuteException;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.ReadOnlyAddressBook;
import seedu.address.model.person.Person;
@@ -16,12 +17,13 @@
public interface Logic {
/**
* Executes the command and returns the result.
+ *
* @param commandText The command as entered by the user.
* @return the result of the command execution.
* @throws CommandException If an error occurs during command execution.
* @throws ParseException If an error occurs during parsing.
*/
- CommandResult execute(String commandText) throws CommandException, ParseException;
+ CommandResult execute(String commandText) throws CommandException, ParseException, ExecuteException;
/**
* Returns the AddressBook.
@@ -30,7 +32,9 @@ public interface Logic {
*/
ReadOnlyAddressBook getAddressBook();
- /** Returns an unmodifiable view of the filtered list of persons */
+ /**
+ * Returns an unmodifiable view of the filtered list of persons
+ */
ObservableList getFilteredPersonList();
/**
diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
index 9d9c6d15bdc..d59d7d2e56a 100644
--- a/src/main/java/seedu/address/logic/LogicManager.java
+++ b/src/main/java/seedu/address/logic/LogicManager.java
@@ -10,6 +10,7 @@
import seedu.address.logic.commands.Command;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.executors.exceptions.ExecuteException;
import seedu.address.logic.parser.AddressBookParser;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.Model;
@@ -38,7 +39,7 @@ public LogicManager(Model model, Storage storage) {
}
@Override
- public CommandResult execute(String commandText) throws CommandException, ParseException {
+ public CommandResult execute(String commandText) throws CommandException, ParseException, ExecuteException {
logger.info("----------------[USER COMMAND][" + commandText + "]");
CommandResult commandResult;
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
index 9c86b1fa6e4..255644e59e6 100644
--- a/src/main/java/seedu/address/logic/commands/ClearCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ClearCommand.java
@@ -9,11 +9,9 @@
* Clears the address book.
*/
public class ClearCommand extends Command {
-
public static final String COMMAND_WORD = "clear";
public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
-
@Override
public CommandResult execute(Model model) {
requireNonNull(model);
diff --git a/src/main/java/seedu/address/logic/commands/Command.java b/src/main/java/seedu/address/logic/commands/Command.java
index 64f18992160..4b76aa4ee4b 100644
--- a/src/main/java/seedu/address/logic/commands/Command.java
+++ b/src/main/java/seedu/address/logic/commands/Command.java
@@ -1,20 +1,18 @@
package seedu.address.logic.commands;
import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.executors.exceptions.ExecuteException;
import seedu.address.model.Model;
/**
* Represents a command with hidden internal logic and the ability to be executed.
*/
public abstract class Command {
-
/**
* Executes the command and returns the result message.
*
- * @param model {@code Model} which the command should operate on.
* @return feedback message of the operation result for display
* @throws CommandException If an error occurs during command execution.
*/
- public abstract CommandResult execute(Model model) throws CommandException;
-
+ public abstract CommandResult execute(Model model) throws CommandException, ExecuteException;
}
diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/seedu/address/logic/commands/CommandResult.java
index 92f900b7916..4f06a6069db 100644
--- a/src/main/java/seedu/address/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/address/logic/commands/CommandResult.java
@@ -11,10 +11,14 @@ public class CommandResult {
private final String feedbackToUser;
- /** Help information should be shown to the user. */
+ /**
+ * Help information should be shown to the user.
+ */
private final boolean showHelp;
- /** The application should exit. */
+ /**
+ * The application should exit.
+ */
private final boolean exit;
/**
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
deleted file mode 100644
index 02fd256acba..00000000000
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package seedu.address.logic.commands;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.List;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Person;
-
-/**
- * Deletes a person identified using it's displayed index from the address book.
- */
-public class DeleteCommand extends Command {
-
- public static final String COMMAND_WORD = "delete";
-
- public static final String MESSAGE_USAGE = COMMAND_WORD
- + ": Deletes the person identified by the index number used in the displayed person list.\n"
- + "Parameters: INDEX (must be a positive integer)\n"
- + "Example: " + COMMAND_WORD + " 1";
-
- public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
-
- private final Index targetIndex;
-
- public DeleteCommand(Index targetIndex) {
- this.targetIndex = targetIndex;
- }
-
- @Override
- public CommandResult execute(Model model) throws CommandException {
- requireNonNull(model);
- List lastShownList = model.getFilteredPersonList();
-
- if (targetIndex.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- Person personToDelete = lastShownList.get(targetIndex.getZeroBased());
- model.deletePerson(personToDelete);
- return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, personToDelete));
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof DeleteCommand // instanceof handles nulls
- && targetIndex.equals(((DeleteCommand) other).targetIndex)); // state check
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/NoteCommand.java b/src/main/java/seedu/address/logic/commands/NoteCommand.java
deleted file mode 100644
index 40592cb5738..00000000000
--- a/src/main/java/seedu/address/logic/commands/NoteCommand.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package seedu.address.logic.commands;
-
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
-
-import java.util.List;
-
-import seedu.address.commons.core.Messages;
-import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
-import seedu.address.model.person.Note;
-import seedu.address.model.person.Person;
-
-/**
- *
- */
-public class NoteCommand extends Command {
- public static final String COMMAND_WORD = "note";
-
- public static final String MESSAGE_ADD_NOTE_SUCCESS = "Added note to Person: %1$s";
- public static final String MESSAGE_DELETE_NOTE_SUCCESS = "Removed note from Person: %1$s";
-
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the notes of the person identified "
- + "by the index number used in the last person listing. "
- + "Existing notes will be overwritten by the input.\n"
- + "Parameters: INDEX (must be a positive integer) "
- + PREFIX_NOTE + "[NOTE]\n"
- + "Example: " + COMMAND_WORD + " 1 "
- + PREFIX_NOTE + "Likes to swim.";
-
- private final Index index;
- private final Note note;
-
- /**
- * @param index Index of the person in currently displayed person list to edit note for.
- * @param note New note to be updated to.
- */
- public NoteCommand(Index index, Note note) {
- requireAllNonNull(index, note);
-
- this.index = index;
- this.note = note;
- }
-
- @Override
- public CommandResult execute(Model model) throws CommandException {
- List lastShownList = model.getFilteredPersonList();
-
- if (index.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = new Person(
- personToEdit.getName(), personToEdit.getPhone(), personToEdit.getEmail(), note, personToEdit.getTags());
-
- model.setPerson(personToEdit, editedPerson);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
-
- return new CommandResult(generateSuccessMessage(editedPerson));
- }
-
- /**
- * Generates a command execution success message based on whether
- * the note is added to or removed from
- * {@code personToEdit}.
- */
- private String generateSuccessMessage(Person personToEdit) {
- String message = !note.value.isEmpty() ? MESSAGE_ADD_NOTE_SUCCESS : MESSAGE_DELETE_NOTE_SUCCESS;
- return String.format(message, personToEdit);
- }
-
- @Override
- public boolean equals(Object other) {
- // short circuit if same object
- if (other == this) {
- return true;
- }
- // instanceof handles nulls
- if (!(other instanceof NoteCommand)) {
- return false;
- }
- // state check
- NoteCommand e = (NoteCommand) other;
- return index.equals(e.index)
- && note.equals(e.note);
- }
-}
diff --git a/src/main/java/seedu/address/logic/commands/TargetedCommand.java b/src/main/java/seedu/address/logic/commands/TargetedCommand.java
new file mode 100644
index 00000000000..bf601637d57
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/TargetedCommand.java
@@ -0,0 +1,14 @@
+package seedu.address.logic.commands;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.model.Model;
+
+public abstract class TargetedCommand extends Command {
+ public abstract CommandResult execute() throws CommandException, ExecuteException;
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException, ExecuteException {
+ return this.execute();
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/group/GroupCommand.java b/src/main/java/seedu/address/logic/commands/group/GroupCommand.java
new file mode 100644
index 00000000000..d59eecf894c
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/group/GroupCommand.java
@@ -0,0 +1,8 @@
+package seedu.address.logic.commands.group;
+
+import seedu.address.logic.commands.Command;
+import seedu.address.model.group.Group;
+
+public abstract class GroupCommand extends Command {
+ private Group target;
+}
diff --git a/src/main/java/seedu/address/logic/commands/person/PersonCommand.java b/src/main/java/seedu/address/logic/commands/person/PersonCommand.java
new file mode 100644
index 00000000000..4100c79983b
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/person/PersonCommand.java
@@ -0,0 +1,30 @@
+package seedu.address.logic.commands.person;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.TargetedCommand;
+
+public abstract class PersonCommand extends TargetedCommand {
+ public static final String COMMAND_WORD = "person";
+ protected final Index index;
+
+ public PersonCommand(Index index) {
+ this.index = index;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof PersonCommand)) {
+ return false;
+ }
+
+ // state check
+ PersonCommand e = (PersonCommand) other;
+ return index.equals(e.index);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/person/PersonCreateCommand.java
similarity index 57%
rename from src/main/java/seedu/address/logic/commands/AddCommand.java
rename to src/main/java/seedu/address/logic/commands/person/PersonCreateCommand.java
index a6cff3044b6..01b2814a747 100644
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/person/PersonCreateCommand.java
@@ -1,4 +1,4 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.commands.person;
import static java.util.Objects.requireNonNull;
import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
@@ -6,15 +6,17 @@
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.logic.executors.person.PersonCreateExecutor;
+import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.person.Person;
/**
* Adds a person to the address book.
*/
-public class AddCommand extends Command {
-
+public class PersonCreateCommand extends PersonCommand {
public static final String COMMAND_WORD = "add";
public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
@@ -30,35 +32,26 @@ public class AddCommand extends Command {
+ PREFIX_TAG + "friends "
+ PREFIX_TAG + "owesMoney";
- public static final String MESSAGE_SUCCESS = "New person added: %1$s";
- public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
-
- private final Person toAdd;
+ private final PersonCreateExecutor executor;
/**
* Creates an AddCommand to add the specified {@code Person}
*/
- public AddCommand(Person person) {
+ public PersonCreateCommand(Index index, Person person) throws ParseException {
+ super(index);
requireNonNull(person);
- toAdd = person;
+ this.executor = new PersonCreateExecutor(index, person);
}
@Override
- public CommandResult execute(Model model) throws CommandException {
- requireNonNull(model);
-
- if (model.hasPerson(toAdd)) {
- throw new CommandException(MESSAGE_DUPLICATE_PERSON);
- }
-
- model.addPerson(toAdd);
- return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
+ public CommandResult execute() throws ExecuteException {
+ return executor.execute();
}
@Override
public boolean equals(Object other) {
return other == this // short circuit if same object
- || (other instanceof AddCommand // instanceof handles nulls
- && toAdd.equals(((AddCommand) other).toAdd));
+ || (other instanceof PersonCreateCommand // instanceof handles nulls
+ && executor.equals(((PersonCreateCommand) other).executor));
}
}
diff --git a/src/main/java/seedu/address/logic/commands/person/PersonDeleteCommand.java b/src/main/java/seedu/address/logic/commands/person/PersonDeleteCommand.java
new file mode 100644
index 00000000000..50221863a04
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/person/PersonDeleteCommand.java
@@ -0,0 +1,46 @@
+package seedu.address.logic.commands.person;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.logic.executors.person.PersonDeleteExecutor;
+
+/**
+ * Deletes a person identified using it's displayed index from the address book.
+ */
+public class PersonDeleteCommand extends PersonCommand {
+
+ public static final String COMMAND_WORD = "delete";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + ": Deletes the person identified by the index number used in the displayed person list.\n"
+ + "Parameters: INDEX (must be a positive integer)\n"
+ + "Example: " + COMMAND_WORD + " 1";
+
+ private final PersonDeleteExecutor executor;
+
+ /**
+ * Constructor for a PersonDeleteCommand.
+ *
+ * @param index Index of the person to be deleted.
+ */
+ public PersonDeleteCommand(Index index) {
+ super(index);
+ requireNonNull(index);
+ this.executor = new PersonDeleteExecutor(index);
+ }
+
+ @Override
+ public CommandResult execute() throws ExecuteException {
+ return executor.execute();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof PersonDeleteCommand // instanceof handles nulls
+ && executor.equals(((PersonDeleteCommand) other).executor)); // state check
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/person/PersonEditCommand.java b/src/main/java/seedu/address/logic/commands/person/PersonEditCommand.java
new file mode 100644
index 00000000000..4e93879409a
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/person/PersonEditCommand.java
@@ -0,0 +1,69 @@
+package seedu.address.logic.commands.person;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.logic.executors.person.PersonEditExecutor;
+import seedu.address.logic.executors.person.PersonExecutor;
+
+/**
+ * Edits the details of an existing person in the address book.
+ */
+public class PersonEditCommand extends PersonCommand {
+
+ public static final String COMMAND_WORD = "edit";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
+ + "by the index number used in the displayed person list. "
+ + "Existing values will be overwritten by the input values.\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + "[" + PREFIX_NAME + "NAME] "
+ + "[" + PREFIX_PHONE + "PHONE] "
+ + "[" + PREFIX_EMAIL + "EMAIL] "
+ + "[" + PREFIX_TAG + "TAG]...\n"
+ + "Example: " + COMMAND_WORD + " 1 "
+ + PREFIX_PHONE + "91234567 "
+ + PREFIX_EMAIL + "johndoe@example.com";
+
+ public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
+
+ private final PersonExecutor executor;
+
+ /**
+ * @param index Index of the person in the filtered person list to edit.
+ * @param personEditDescriptor Details to edit the person with.
+ */
+ public PersonEditCommand(Index index, PersonEditExecutor.PersonEditDescriptor personEditDescriptor) {
+ super(index);
+ requireAllNonNull(index, personEditDescriptor);
+ this.executor = new PersonEditExecutor(index, personEditDescriptor);
+ }
+
+ @Override
+ public CommandResult execute() throws ExecuteException {
+ return executor.execute();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof PersonEditCommand)) {
+ return false;
+ }
+
+ // state check
+ PersonEditCommand e = (PersonEditCommand) other;
+ return super.equals(other) && executor.equals(e.executor);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/person/PersonNoteCommand.java b/src/main/java/seedu/address/logic/commands/person/PersonNoteCommand.java
new file mode 100644
index 00000000000..02522facb76
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/person/PersonNoteCommand.java
@@ -0,0 +1,57 @@
+package seedu.address.logic.commands.person;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.logic.executors.person.PersonNoteExecutor;
+import seedu.address.model.person.Note;
+
+/**
+ *
+ */
+public class PersonNoteCommand extends PersonCommand {
+ public static final String COMMAND_WORD = "note";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the notes of the person identified "
+ + "by the index number used in the last person listing. "
+ + "Existing notes will be overwritten by the input.\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_NOTE + "[NOTE]\n"
+ + "Example: " + COMMAND_WORD + " 1 "
+ + PREFIX_NOTE + "Likes to swim.";
+
+ private final PersonNoteExecutor executor;
+
+ /**
+ * @param index Index of the person to edit note for.
+ * @param note New note to be updated to.
+ */
+ public PersonNoteCommand(Index index, Note note) {
+ super(index);
+ requireAllNonNull(index, note);
+ this.executor = new PersonNoteExecutor(index, note);
+ }
+
+ @Override
+ public CommandResult execute() throws ExecuteException {
+ return executor.execute();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+ // instanceof handles nulls
+ if (!(other instanceof PersonNoteCommand)) {
+ return false;
+ }
+ // state check
+ PersonNoteCommand e = (PersonNoteCommand) other;
+ return executor.equals(e.executor);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/executors/Executor.java b/src/main/java/seedu/address/logic/executors/Executor.java
new file mode 100644
index 00000000000..10f374c50fb
--- /dev/null
+++ b/src/main/java/seedu/address/logic/executors/Executor.java
@@ -0,0 +1,18 @@
+package seedu.address.logic.executors;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.model.Model;
+
+public abstract class Executor {
+ protected static Model model;
+
+ public static void setup(Model model) {
+ requireNonNull(model);
+ Executor.model = model;
+ }
+
+ public abstract CommandResult execute() throws ExecuteException;
+}
diff --git a/src/main/java/seedu/address/logic/executors/exceptions/ExecuteException.java b/src/main/java/seedu/address/logic/executors/exceptions/ExecuteException.java
new file mode 100644
index 00000000000..584aebe055c
--- /dev/null
+++ b/src/main/java/seedu/address/logic/executors/exceptions/ExecuteException.java
@@ -0,0 +1,15 @@
+package seedu.address.logic.executors.exceptions;
+
+/**
+ * Represents a parse error encountered by a parser.
+ */
+public class ExecuteException extends Exception {
+
+ public ExecuteException(String message) {
+ super(message);
+ }
+
+ public ExecuteException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/executors/group/GroupExecutor.java b/src/main/java/seedu/address/logic/executors/group/GroupExecutor.java
new file mode 100644
index 00000000000..af6468adf9a
--- /dev/null
+++ b/src/main/java/seedu/address/logic/executors/group/GroupExecutor.java
@@ -0,0 +1,6 @@
+package seedu.address.logic.executors.group;
+
+import seedu.address.logic.executors.Executor;
+
+public abstract class GroupExecutor extends Executor {
+}
diff --git a/src/main/java/seedu/address/logic/executors/person/PersonCreateExecutor.java b/src/main/java/seedu/address/logic/executors/person/PersonCreateExecutor.java
new file mode 100644
index 00000000000..01537621696
--- /dev/null
+++ b/src/main/java/seedu/address/logic/executors/person/PersonCreateExecutor.java
@@ -0,0 +1,58 @@
+package seedu.address.logic.executors.person;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.model.person.Person;
+
+/**
+ * Executor for a PersonCreateCommand.
+ */
+public class PersonCreateExecutor extends PersonExecutor {
+ public static final String MESSAGE_SUCCESS = "New person added: %1$s";
+ public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
+
+ protected Person person;
+
+ /**
+ * Constructor for a PersonCreateExecutor instance.
+ *
+ * @param index Always null value for this command. Ignored for operations.
+ * @param person Person to be created.
+ */
+ public PersonCreateExecutor(Index index, Person person) {
+ super(index);
+ requireNonNull(person);
+ this.person = person;
+ }
+
+ @Override
+ public CommandResult execute() throws ExecuteException {
+ if (model.hasPerson(person)) {
+ throw new ExecuteException(MESSAGE_DUPLICATE_PERSON);
+ }
+
+ model.createPerson(person);
+ return new CommandResult(String.format(MESSAGE_SUCCESS, person));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof PersonCreateExecutor)) {
+ return false;
+ }
+
+ PersonCreateExecutor e = (PersonCreateExecutor) other;
+
+ // state check
+ return super.equals(other) && person.equals(e.person);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/executors/person/PersonDeleteExecutor.java b/src/main/java/seedu/address/logic/executors/person/PersonDeleteExecutor.java
new file mode 100644
index 00000000000..30b7cb58ca0
--- /dev/null
+++ b/src/main/java/seedu/address/logic/executors/person/PersonDeleteExecutor.java
@@ -0,0 +1,21 @@
+package seedu.address.logic.executors.person;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.model.person.Person;
+
+public class PersonDeleteExecutor extends PersonExecutor {
+ public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
+
+ public PersonDeleteExecutor(Index index) {
+ super(index);
+ }
+
+ @Override
+ public CommandResult execute() throws ExecuteException {
+ Person deletedPerson = super.getPerson();
+ model.deletePerson(deletedPerson);
+ return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, deletedPerson));
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/executors/person/PersonEditExecutor.java
similarity index 56%
rename from src/main/java/seedu/address/logic/commands/EditCommand.java
rename to src/main/java/seedu/address/logic/executors/person/PersonEditExecutor.java
index 6d55badb754..6a0fd3d0b83 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/executors/person/PersonEditExecutor.java
@@ -1,23 +1,17 @@
-package seedu.address.logic.commands;
+package seedu.address.logic.executors.person;
-import static java.util.Objects.requireNonNull;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
import java.util.Collections;
import java.util.HashSet;
-import java.util.List;
import java.util.Optional;
import java.util.Set;
-import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
import seedu.address.commons.util.CollectionUtil;
-import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.Model;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
import seedu.address.model.person.Email;
import seedu.address.model.person.Name;
import seedu.address.model.person.Note;
@@ -26,60 +20,36 @@
import seedu.address.model.tag.Tag;
/**
- * Edits the details of an existing person in the address book.
+ * Executor for a PersonEditCommand.
*/
-public class EditCommand extends Command {
-
- public static final String COMMAND_WORD = "edit";
-
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
- + "by the index number used in the displayed person list. "
- + "Existing values will be overwritten by the input values.\n"
- + "Parameters: INDEX (must be a positive integer) "
- + "[" + PREFIX_NAME + "NAME] "
- + "[" + PREFIX_PHONE + "PHONE] "
- + "[" + PREFIX_EMAIL + "EMAIL] "
- + "[" + PREFIX_TAG + "TAG]...\n"
- + "Example: " + COMMAND_WORD + " 1 "
- + PREFIX_PHONE + "91234567 "
- + PREFIX_EMAIL + "johndoe@example.com";
-
+public class PersonEditExecutor extends PersonExecutor {
public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
- public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book.";
- private final Index index;
- private final EditPersonDescriptor editPersonDescriptor;
+ private final PersonEditDescriptor personEditDescriptor;
/**
- * @param index of the person in the filtered person list to edit
- * @param editPersonDescriptor details to edit the person with
+ * Constructor for a PersonEditExecutor instance.
+ *
+ * @param index Index of the person to be edited.
+ * @param personEditDescriptor Descriptor for the edited person.
*/
- public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
- requireNonNull(index);
- requireNonNull(editPersonDescriptor);
-
- this.index = index;
- this.editPersonDescriptor = new EditPersonDescriptor(editPersonDescriptor);
+ public PersonEditExecutor(Index index, PersonEditDescriptor personEditDescriptor) {
+ super(index);
+ requireAllNonNull(index, personEditDescriptor);
+ this.personEditDescriptor = personEditDescriptor;
}
@Override
- public CommandResult execute(Model model) throws CommandException {
- requireNonNull(model);
- List lastShownList = model.getFilteredPersonList();
-
- if (index.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
- }
-
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
+ public CommandResult execute() throws ExecuteException {
+ Person person = super.getPerson();
+ Person editedPerson = createEditedPerson(person, personEditDescriptor);
- if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
- throw new CommandException(MESSAGE_DUPLICATE_PERSON);
+ if (!person.isSame(editedPerson) && model.hasPerson(editedPerson)) {
+ throw new ExecuteException(MESSAGE_DUPLICATE_PERSON);
}
- model.setPerson(personToEdit, editedPerson);
+ model.setPerson(person, editedPerson);
model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedPerson));
}
@@ -88,14 +58,14 @@ public CommandResult execute(Model model) throws CommandException {
* Creates and returns a {@code Person} with the details of {@code personToEdit}
* edited with {@code editPersonDescriptor}.
*/
- private static Person createEditedPerson(Person personToEdit, EditPersonDescriptor editPersonDescriptor) {
+ private static Person createEditedPerson(Person personToEdit, PersonEditDescriptor personEditDescriptor) {
assert personToEdit != null;
- Name updatedName = editPersonDescriptor.getName().orElse(personToEdit.getName());
- Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
- Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
- Set updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
- Note updatedNote = editPersonDescriptor.getNote().orElse(personToEdit.getNote());
+ Name updatedName = personEditDescriptor.getName().orElse(personToEdit.getName());
+ Phone updatedPhone = personEditDescriptor.getPhone().orElse(personToEdit.getPhone());
+ Email updatedEmail = personEditDescriptor.getEmail().orElse(personToEdit.getEmail());
+ Set updatedTags = personEditDescriptor.getTags().orElse(personToEdit.getTags());
+ Note updatedNote = personEditDescriptor.getNote().orElse(personToEdit.getNote());
return new Person(updatedName, updatedPhone, updatedEmail, updatedNote, updatedTags);
}
@@ -108,34 +78,34 @@ public boolean equals(Object other) {
}
// instanceof handles nulls
- if (!(other instanceof EditCommand)) {
+ if (!(other instanceof PersonEditExecutor)) {
return false;
}
+ PersonEditExecutor e = (PersonEditExecutor) other;
+
// state check
- EditCommand e = (EditCommand) other;
- return index.equals(e.index)
- && editPersonDescriptor.equals(e.editPersonDescriptor);
+ return super.equals(other) && personEditDescriptor.equals(e.personEditDescriptor);
}
/**
* Stores the details to edit the person with. Each non-empty field value will replace the
* corresponding field value of the person.
*/
- public static class EditPersonDescriptor {
+ public static class PersonEditDescriptor {
private Name name;
private Phone phone;
private Email email;
private Set tags;
private Note note;
- public EditPersonDescriptor() {}
+ public PersonEditDescriptor() {}
/**
* Copy constructor.
* A defensive copy of {@code tags} is used internally.
*/
- public EditPersonDescriptor(EditPersonDescriptor toCopy) {
+ public PersonEditDescriptor(PersonEditDescriptor toCopy) {
setName(toCopy.name);
setPhone(toCopy.phone);
setEmail(toCopy.email);
@@ -207,12 +177,12 @@ public boolean equals(Object other) {
}
// instanceof handles nulls
- if (!(other instanceof EditPersonDescriptor)) {
+ if (!(other instanceof PersonEditDescriptor)) {
return false;
}
// state check
- EditPersonDescriptor e = (EditPersonDescriptor) other;
+ PersonEditDescriptor e = (PersonEditDescriptor) other;
return getName().equals(e.getName())
&& getPhone().equals(e.getPhone())
diff --git a/src/main/java/seedu/address/logic/executors/person/PersonExecutor.java b/src/main/java/seedu/address/logic/executors/person/PersonExecutor.java
new file mode 100644
index 00000000000..1a883abdcc0
--- /dev/null
+++ b/src/main/java/seedu/address/logic/executors/person/PersonExecutor.java
@@ -0,0 +1,49 @@
+package seedu.address.logic.executors.person;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.executors.Executor;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.model.person.Person;
+
+public abstract class PersonExecutor extends Executor {
+ protected final Index index;
+
+ public PersonExecutor(Index index) {
+ this.index = index;
+ }
+
+ protected Person getPerson() throws ExecuteException {
+ List lastShownList = model.getFilteredPersonList();
+
+ if (index.getZeroBased() >= lastShownList.size()) {
+ throw new ExecuteException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ }
+
+ return lastShownList.get(index.getZeroBased());
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof PersonExecutor)) {
+ return false;
+ }
+
+ PersonExecutor e = (PersonExecutor) other;
+
+ if (index == null) {
+ return e.index == null;
+ }
+
+ // state check
+ return index.equals(e.index);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/executors/person/PersonNoteExecutor.java b/src/main/java/seedu/address/logic/executors/person/PersonNoteExecutor.java
new file mode 100644
index 00000000000..c776f5d7add
--- /dev/null
+++ b/src/main/java/seedu/address/logic/executors/person/PersonNoteExecutor.java
@@ -0,0 +1,72 @@
+package seedu.address.logic.executors.person;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.model.person.Note;
+import seedu.address.model.person.Person;
+
+/**
+ * Executor for a PersonNoteCommand.
+ */
+public class PersonNoteExecutor extends PersonExecutor {
+ public static final String MESSAGE_ADD_NOTE_SUCCESS = "Added note to Person: %1$s";
+ public static final String MESSAGE_DELETE_NOTE_SUCCESS = "Removed note from Person: %1$s";
+
+ private final Note note;
+
+ /**
+ * Constructor for a PersonNoteExecutor instance.
+ *
+ * @param index Index of the person to add a note to.
+ * @param note Note to be added to the person.
+ */
+ public PersonNoteExecutor(Index index, Note note) {
+ super(index);
+ requireAllNonNull(index, note);
+ this.note = note;
+ }
+
+ @Override
+ public CommandResult execute() throws ExecuteException {
+ Person storedPerson = super.getPerson();
+ Person editedPerson = new Person(
+ storedPerson.getName(), storedPerson.getPhone(), storedPerson.getEmail(), note, storedPerson.getTags());
+
+ model.setPerson(storedPerson, editedPerson);
+ model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+
+ return new CommandResult(generateSuccessMessage(editedPerson));
+ }
+
+ /**
+ * Generates a command execution success message based on whether
+ * the note is added to or removed from
+ * {@code personToEdit}.
+ */
+ private String generateSuccessMessage(Person personToEdit) {
+ String message = !note.value.isEmpty() ? MESSAGE_ADD_NOTE_SUCCESS : MESSAGE_DELETE_NOTE_SUCCESS;
+ return String.format(message, personToEdit);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof PersonNoteExecutor)) {
+ return false;
+ }
+
+ PersonNoteExecutor e = (PersonNoteExecutor) other;
+
+ // state check
+ return super.equals(other) && note.equals(e.note);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
index 412761f0230..c954b3e8584 100644
--- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -6,23 +6,26 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import seedu.address.logic.commands.AddCommand;
import seedu.address.logic.commands.ClearCommand;
import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
import seedu.address.logic.commands.ExitCommand;
import seedu.address.logic.commands.FindCommand;
import seedu.address.logic.commands.HelpCommand;
import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.NoteCommand;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.commands.person.PersonDeleteCommand;
+import seedu.address.logic.commands.person.PersonEditCommand;
+import seedu.address.logic.commands.person.PersonNoteCommand;
import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.logic.parser.person.PersonCreateCommandParser;
+import seedu.address.logic.parser.person.PersonDeleteCommandParser;
+import seedu.address.logic.parser.person.PersonEditCommandParser;
+import seedu.address.logic.parser.person.PersonNoteCommandParser;
/**
* Parses user input.
*/
public class AddressBookParser {
-
/**
* Used for initial separation of command word and args.
*/
@@ -43,16 +46,20 @@ public Command parseCommand(String userInput) throws ParseException {
final String commandWord = matcher.group("commandWord");
final String arguments = matcher.group("arguments");
+
switch (commandWord) {
- case AddCommand.COMMAND_WORD:
- return new AddCommandParser().parse(arguments);
+ case PersonCreateCommand.COMMAND_WORD:
+ return new PersonCreateCommandParser().parse(arguments);
- case EditCommand.COMMAND_WORD:
- return new EditCommandParser().parse(arguments);
+ case PersonEditCommand.COMMAND_WORD:
+ return new PersonEditCommandParser().parse(arguments);
- case DeleteCommand.COMMAND_WORD:
- return new DeleteCommandParser().parse(arguments);
+ case PersonDeleteCommand.COMMAND_WORD:
+ return new PersonDeleteCommandParser().parse(arguments);
+
+ case PersonNoteCommand.COMMAND_WORD:
+ return new PersonNoteCommandParser().parse(arguments);
case ClearCommand.COMMAND_WORD:
return new ClearCommand();
@@ -69,9 +76,6 @@ public Command parseCommand(String userInput) throws ParseException {
case HelpCommand.COMMAND_WORD:
return new HelpCommand();
- case NoteCommand.COMMAND_WORD:
- return new NoteCommandParser().parse(arguments);
-
default:
throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
}
diff --git a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java b/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java
index 954c8e18f8e..0a150cc5a7c 100644
--- a/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java
+++ b/src/main/java/seedu/address/logic/parser/ArgumentMultimap.java
@@ -15,14 +15,16 @@
*/
public class ArgumentMultimap {
- /** Prefixes mapped to their respective arguments**/
+ /**
+ * Prefixes mapped to their respective arguments
+ **/
private final Map> argMultimap = new HashMap<>();
/**
* Associates the specified argument value with {@code prefix} key in this map.
* If the map previously contained a mapping for the key, the new value is appended to the list of existing values.
*
- * @param prefix Prefix key with which the specified argument value is to be associated
+ * @param prefix Prefix key with which the specified argument value is to be associated
* @param argValue Argument value to be associated with the specified prefix key
*/
public void put(Prefix prefix, String argValue) {
diff --git a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java b/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
index 58fed1227d3..7f6cbece258 100644
--- a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
+++ b/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
@@ -8,11 +8,11 @@
/**
* Tokenizes arguments string of the form: {@code preamble value value ...}
- * e.g. {@code some preamble text t/ 11.00 t/12.00 k/ m/ July} where prefixes are {@code t/ k/ m/}.
+ * e.g. {@code some preamble text t/ 11.00 t/12.00 k/ m/ July} where prefixes are {@code t/ k/ m/}.
* 1. An argument's value can be an empty string e.g. the value of {@code k/} in the above example.
* 2. Leading and trailing whitespaces of an argument value will be discarded.
* 3. An argument may be repeated and all its values will be accumulated e.g. the value of {@code t/}
- * in the above example.
+ * in the above example.
*/
public class ArgumentTokenizer {
@@ -21,8 +21,8 @@ public class ArgumentTokenizer {
* respective argument values. Only the given prefixes will be recognized in the arguments string.
*
* @param argsString Arguments string of the form: {@code preamble value value ...}
- * @param prefixes Prefixes to tokenize the arguments string with
- * @return ArgumentMultimap object that maps prefixes to their arguments
+ * @param prefixes Prefixes to tokenize the arguments string with
+ * @return ArgumentMultimap object that maps prefixes to their arguments
*/
public static ArgumentMultimap tokenize(String argsString, Prefix... prefixes) {
List positions = findAllPrefixPositions(argsString, prefixes);
@@ -33,8 +33,8 @@ public static ArgumentMultimap tokenize(String argsString, Prefix... prefixes) {
* Finds all zero-based prefix positions in the given arguments string.
*
* @param argsString Arguments string of the form: {@code preamble value value ...}
- * @param prefixes Prefixes to find in the arguments string
- * @return List of zero-based prefix positions in the given arguments string
+ * @param prefixes Prefixes to find in the arguments string
+ * @return List of zero-based prefix positions in the given arguments string
*/
private static List findAllPrefixPositions(String argsString, Prefix... prefixes) {
return Arrays.stream(prefixes)
@@ -81,9 +81,9 @@ private static int findPrefixPosition(String argsString, String prefix, int from
* extracted prefixes to their respective arguments. Prefixes are extracted based on their zero-based positions in
* {@code argsString}.
*
- * @param argsString Arguments string of the form: {@code preamble value value ...}
+ * @param argsString Arguments string of the form: {@code preamble value value ...}
* @param prefixPositions Zero-based positions of all prefixes in {@code argsString}
- * @return ArgumentMultimap object that maps prefixes to their arguments
+ * @return ArgumentMultimap object that maps prefixes to their arguments
*/
private static ArgumentMultimap extractArguments(String argsString, List prefixPositions) {
@@ -115,8 +115,8 @@ private static ArgumentMultimap extractArguments(String argsString, List {
-
- /**
- * Parses the given {@code String} of arguments in the context of the DeleteCommand
- * and returns a DeleteCommand object for execution.
- * @throws ParseException if the user input does not conform the expected format
- */
- public DeleteCommand parse(String args) throws ParseException {
- try {
- Index index = ParserUtil.parseIndex(args);
- return new DeleteCommand(index);
- } catch (ParseException pe) {
- throw new ParseException(
- String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE), pe);
- }
- }
-
-}
diff --git a/src/main/java/seedu/address/logic/parser/FindCommandParser.java b/src/main/java/seedu/address/logic/parser/FindCommandParser.java
index 4fb71f23103..212cdd7cf7d 100644
--- a/src/main/java/seedu/address/logic/parser/FindCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/FindCommandParser.java
@@ -11,11 +11,12 @@
/**
* Parses input arguments and creates a new FindCommand object
*/
-public class FindCommandParser implements Parser {
+public class FindCommandParser extends Parser {
/**
* Parses the given {@code String} of arguments in the context of the FindCommand
* and returns a FindCommand object for execution.
+ *
* @throws ParseException if the user input does not conform the expected format
*/
public FindCommand parse(String args) throws ParseException {
diff --git a/src/main/java/seedu/address/logic/parser/Parser.java b/src/main/java/seedu/address/logic/parser/Parser.java
index d6551ad8e3f..6baf173c261 100644
--- a/src/main/java/seedu/address/logic/parser/Parser.java
+++ b/src/main/java/seedu/address/logic/parser/Parser.java
@@ -6,11 +6,11 @@
/**
* Represents a Parser that is able to parse user input into a {@code Command} of type {@code T}.
*/
-public interface Parser {
-
+public abstract class Parser {
/**
* Parses {@code userInput} into a command and returns it.
+ *
* @throws ParseException if {@code userInput} does not conform the expected format
*/
- T parse(String userInput) throws ParseException;
+ public abstract T parse(String userInput) throws ParseException;
}
diff --git a/src/main/java/seedu/address/logic/parser/group/GroupCommandParser.java b/src/main/java/seedu/address/logic/parser/group/GroupCommandParser.java
new file mode 100644
index 00000000000..5a5c8eb62b4
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/group/GroupCommandParser.java
@@ -0,0 +1,20 @@
+package seedu.address.logic.parser.group;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.group.GroupCommand;
+import seedu.address.logic.parser.Parser;
+import seedu.address.model.group.Group;
+
+public abstract class GroupCommandParser extends Parser {
+ /**
+ * TODO: Stub method.
+ */
+ public Group parseGroup(Index index) {
+ // List lastShownList = model.getFilteredGroupList();
+ // if (index.getZeroBased() >= lastShownList.size()) {
+ // throw new ParseException(Messages.MESSAGE_INVALID_GROUP_DISPLAYED_INDEX);
+ // }
+ // return lastShownList.get(index.getZeroBased());
+ return null;
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/person/PersonCommandParser.java b/src/main/java/seedu/address/logic/parser/person/PersonCommandParser.java
new file mode 100644
index 00000000000..376c43b54c2
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/person/PersonCommandParser.java
@@ -0,0 +1,35 @@
+package seedu.address.logic.parser.person;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.person.PersonCommand;
+import seedu.address.logic.commands.person.PersonEditCommand;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+public abstract class PersonCommandParser extends Parser {
+ protected Index parseIndex(ArgumentMultimap argMultimap) throws ParseException {
+ Index index;
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PersonEditCommand.MESSAGE_USAGE),
+ pe);
+ }
+ return index;
+ }
+
+ protected Index parseIndex(String args) throws ParseException {
+ Index index;
+ try {
+ index = ParserUtil.parseIndex(args);
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PersonEditCommand.MESSAGE_USAGE),
+ pe);
+ }
+ return index;
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/person/PersonCreateCommandParser.java
similarity index 77%
rename from src/main/java/seedu/address/logic/parser/AddCommandParser.java
rename to src/main/java/seedu/address/logic/parser/person/PersonCreateCommandParser.java
index 302e2870c4a..63995b89907 100644
--- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/person/PersonCreateCommandParser.java
@@ -1,4 +1,4 @@
-package seedu.address.logic.parser;
+package seedu.address.logic.parser.person;
import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
@@ -9,7 +9,13 @@
import java.util.Set;
import java.util.stream.Stream;
-import seedu.address.logic.commands.AddCommand;
+import seedu.address.logic.commands.person.PersonCommand;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.ArgumentTokenizer;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.Prefix;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.person.Email;
import seedu.address.model.person.Name;
@@ -18,24 +24,20 @@
import seedu.address.model.person.Phone;
import seedu.address.model.tag.Tag;
-/**
- * Parses input arguments and creates a new AddCommand object
- */
-public class AddCommandParser implements Parser {
-
+public class PersonCreateCommandParser extends Parser {
/**
* Parses the given {@code String} of arguments in the context of the AddCommand
* and returns an AddCommand object for execution.
*
* @throws ParseException if the user input does not conform the expected format
*/
- public AddCommand parse(String args) throws ParseException {
+ public PersonCreateCommand parse(String args) throws ParseException {
ArgumentMultimap argMultimap =
ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_TAG);
if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL)
|| !argMultimap.getPreamble().isEmpty()) {
- throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, PersonCreateCommand.MESSAGE_USAGE));
}
assert argMultimap.getValue(PREFIX_NAME).isPresent();
@@ -50,7 +52,7 @@ public AddCommand parse(String args) throws ParseException {
Person person = new Person(name, phone, email, note, tagList);
- return new AddCommand(person);
+ return new PersonCreateCommand(null, person);
}
/**
diff --git a/src/main/java/seedu/address/logic/parser/person/PersonDeleteCommandParser.java b/src/main/java/seedu/address/logic/parser/person/PersonDeleteCommandParser.java
new file mode 100644
index 00000000000..1bfad7ee2ae
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/person/PersonDeleteCommandParser.java
@@ -0,0 +1,24 @@
+package seedu.address.logic.parser.person;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.person.PersonDeleteCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+public class PersonDeleteCommandParser extends PersonCommandParser {
+ /**
+ * Parses the given {@code String} of arguments in the context of the DeleteCommand
+ * and returns a DeleteCommand object for execution.
+ *
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public PersonDeleteCommand parse(String args) throws ParseException {
+ try {
+ Index index = super.parseIndex(args);
+ return new PersonDeleteCommand(index);
+ } catch (ParseException pe) {
+ throw new ParseException(
+ String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, PersonDeleteCommand.MESSAGE_USAGE), pe);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/person/PersonEditCommandParser.java
similarity index 62%
rename from src/main/java/seedu/address/logic/parser/EditCommandParser.java
rename to src/main/java/seedu/address/logic/parser/person/PersonEditCommandParser.java
index bdfe5ad1978..adcfefab76f 100644
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/person/PersonEditCommandParser.java
@@ -1,7 +1,6 @@
-package seedu.address.logic.parser;
+package seedu.address.logic.parser.person;
import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -12,23 +11,24 @@
import java.util.Optional;
import java.util.Set;
+import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
+import seedu.address.logic.commands.person.PersonEditCommand;
+import seedu.address.logic.executors.person.PersonEditExecutor;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.ArgumentTokenizer;
+import seedu.address.logic.parser.ParserUtil;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.tag.Tag;
-/**
- * Parses input arguments and creates a new EditCommand object
- */
-public class EditCommandParser implements Parser {
-
+public class PersonEditCommandParser extends PersonCommandParser {
/**
* Parses the given {@code String} of arguments in the context of the EditCommand
* and returns an EditCommand object for execution.
+ *
* @throws ParseException if the user input does not conform the expected format
*/
- public EditCommand parse(String args) throws ParseException {
+ public PersonEditCommand parse(String args) throws ParseException {
requireNonNull(args);
ArgumentMultimap argMultimap =
ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_TAG);
@@ -36,28 +36,29 @@ public EditCommand parse(String args) throws ParseException {
Index index;
try {
- index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ index = super.parseIndex(argMultimap);
} catch (ParseException pe) {
- throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
+ throw new ParseException(
+ String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT, PersonEditCommand.MESSAGE_USAGE), pe);
}
- EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
+ PersonEditExecutor.PersonEditDescriptor personEditDescriptor = new PersonEditExecutor.PersonEditDescriptor();
if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
- editPersonDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()));
+ personEditDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()));
}
if (argMultimap.getValue(PREFIX_PHONE).isPresent()) {
- editPersonDescriptor.setPhone(ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get()));
+ personEditDescriptor.setPhone(ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get()));
}
if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
- editPersonDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
+ personEditDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
}
- parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
+ parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(personEditDescriptor::setTags);
- if (!editPersonDescriptor.isAnyFieldEdited()) {
- throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
+ if (!personEditDescriptor.isAnyFieldEdited()) {
+ throw new ParseException(PersonEditCommand.MESSAGE_NOT_EDITED);
}
- return new EditCommand(index, editPersonDescriptor);
+ return new PersonEditCommand(index, personEditDescriptor);
}
/**
@@ -74,5 +75,4 @@ private Optional> parseTagsForEdit(Collection tags) throws Pars
Collection tagSet = tags.size() == 1 && tags.contains("") ? Collections.emptySet() : tags;
return Optional.of(ParserUtil.parseTags(tagSet));
}
-
}
diff --git a/src/main/java/seedu/address/logic/parser/NoteCommandParser.java b/src/main/java/seedu/address/logic/parser/person/PersonNoteCommandParser.java
similarity index 54%
rename from src/main/java/seedu/address/logic/parser/NoteCommandParser.java
rename to src/main/java/seedu/address/logic/parser/person/PersonNoteCommandParser.java
index ecb56312c30..0eeadc8637f 100644
--- a/src/main/java/seedu/address/logic/parser/NoteCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/person/PersonNoteCommandParser.java
@@ -1,38 +1,39 @@
-package seedu.address.logic.parser;
+package seedu.address.logic.parser.person;
import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NOTE;
+import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.logic.commands.NoteCommand;
+import seedu.address.logic.commands.person.PersonNoteCommand;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.ArgumentTokenizer;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.person.Note;
-public class NoteCommandParser implements Parser {
-
+public class PersonNoteCommandParser extends PersonCommandParser {
/**
* Parses the given {@code String} of arguments in the context of the NoteCommand
* and returns a NoteCommand object for execution.
*
* @throws ParseException if the user input does not conform the expected format
*/
- public NoteCommand parse(String args) throws ParseException {
+ public PersonNoteCommand parse(String args) throws ParseException {
requireNonNull(args);
- ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args,
- PREFIX_NOTE);
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NOTE);
Index index;
+
try {
- index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ index = super.parseIndex(argMultimap.getPreamble());
} catch (IllegalValueException ive) {
- throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
- NoteCommand.MESSAGE_USAGE), ive);
+ throw new ParseException(String.format(Messages.MESSAGE_INVALID_COMMAND_FORMAT,
+ PersonNoteCommand.MESSAGE_USAGE), ive);
}
String note = argMultimap.getValue(PREFIX_NOTE).orElse("");
- return new NoteCommand(index, new Note(note));
+ return new PersonNoteCommand(index, new Note(note));
}
}
diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java
index 1a943a0781a..fd75a113ee4 100644
--- a/src/main/java/seedu/address/model/AddressBook.java
+++ b/src/main/java/seedu/address/model/AddressBook.java
@@ -3,10 +3,12 @@
import static java.util.Objects.requireNonNull;
import java.util.List;
+import java.util.Objects;
import javafx.collections.ObservableList;
+import seedu.address.model.group.Group;
import seedu.address.model.person.Person;
-import seedu.address.model.person.UniquePersonList;
+import seedu.address.model.util.UniqueList;
/**
* Wraps all data at the address-book level
@@ -14,8 +16,10 @@
*/
public class AddressBook implements ReadOnlyAddressBook {
- private final UniquePersonList persons;
+ private final UniqueList persons;
+ private final UniqueList groups;
+ // @formatter:off
/*
* The 'unusual' code block below is a non-static initialization block, sometimes used to avoid duplication
* between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
@@ -24,7 +28,8 @@ public class AddressBook implements ReadOnlyAddressBook {
* among constructors.
*/
{
- persons = new UniquePersonList();
+ persons = new UniqueList<>();
+ groups = new UniqueList<>();
}
public AddressBook() {}
@@ -44,7 +49,11 @@ public AddressBook(ReadOnlyAddressBook toBeCopied) {
* {@code persons} must not contain duplicate persons.
*/
public void setPersons(List persons) {
- this.persons.setPersons(persons);
+ this.persons.setItems(persons);
+ }
+
+ public void setGroups(List groups) {
+ this.groups.setItems(groups);
}
/**
@@ -54,6 +63,7 @@ public void resetData(ReadOnlyAddressBook newData) {
requireNonNull(newData);
setPersons(newData.getPersonList());
+ setGroups(newData.getGroupList());
}
//// person-level operations
@@ -66,12 +76,28 @@ public boolean hasPerson(Person person) {
return persons.contains(person);
}
+ /**
+ * Returns true if a group with the same identity as {@code group} exists in the address book.
+ */
+ public boolean hasGroup(Group group) {
+ requireNonNull(group);
+ return groups.contains(group);
+ }
+
/**
* Adds a person to the address book.
* The person must not already exist in the address book.
*/
- public void addPerson(Person p) {
- persons.add(p);
+ public void addPerson(Person person) {
+ persons.add(person);
+ }
+
+ /**
+ * Adds a group to the address book.
+ * The group must not already exist in the address book.
+ */
+ public void addGroup(Group group) {
+ groups.add(group);
}
/**
@@ -82,7 +108,18 @@ public void addPerson(Person p) {
public void setPerson(Person target, Person editedPerson) {
requireNonNull(editedPerson);
- persons.setPerson(target, editedPerson);
+ persons.setItem(target, editedPerson);
+ }
+
+ /**
+ * Replaces the given group {@code target} in the list with {@code editedGroup}.
+ * {@code target} must exist in the address book.
+ * The group identity of {@code editedGroup} must not be the same as another existing group in the address book.
+ */
+ public void setGroup(Group target, Group editedGroup) {
+ requireNonNull(editedGroup);
+
+ groups.setItem(target, editedGroup);
}
/**
@@ -93,11 +130,20 @@ public void removePerson(Person key) {
persons.remove(key);
}
+ /**
+ * Removes {@code key} from this {@code AddressBook}.
+ * {@code key} must exist in the address book.
+ */
+ public void removeGroup(Group key) {
+ groups.remove(key);
+ }
+
//// util methods
@Override
public String toString() {
- return persons.asUnmodifiableObservableList().size() + " persons";
+ return persons.asUnmodifiableObservableList().size() + " persons, "
+ + groups.asUnmodifiableObservableList().size() + " groups";
// TODO: refine later
}
@@ -106,15 +152,21 @@ public ObservableList getPersonList() {
return persons.asUnmodifiableObservableList();
}
+ @Override
+ public ObservableList getGroupList() {
+ return groups.asUnmodifiableObservableList();
+ }
+
@Override
public boolean equals(Object other) {
return other == this // short circuit if same object
|| (other instanceof AddressBook // instanceof handles nulls
- && persons.equals(((AddressBook) other).persons));
+ && persons.equals(((AddressBook) other).persons)
+ && groups.equals(((AddressBook) other).groups));
}
@Override
public int hashCode() {
- return persons.hashCode();
+ return Objects.hash(persons, groups);
}
}
diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
index d54df471c1f..ca99dab33e4 100644
--- a/src/main/java/seedu/address/model/Model.java
+++ b/src/main/java/seedu/address/model/Model.java
@@ -5,15 +5,20 @@
import javafx.collections.ObservableList;
import seedu.address.commons.core.GuiSettings;
+import seedu.address.model.group.Group;
import seedu.address.model.person.Person;
/**
* The API of the Model component.
*/
public interface Model {
- /** {@code Predicate} that always evaluate to true */
+ /**
+ * {@code Predicate} that always evaluate to true
+ */
Predicate PREDICATE_SHOW_ALL_PERSONS = unused -> true;
+ Predicate PREDICATE_SHOW_ALL_GROUPS = unused -> true;
+
/**
* Replaces user prefs data with the data in {@code userPrefs}.
*/
@@ -49,7 +54,9 @@ public interface Model {
*/
void setAddressBook(ReadOnlyAddressBook addressBook);
- /** Returns the AddressBook */
+ /**
+ * Returns the AddressBook
+ */
ReadOnlyAddressBook getAddressBook();
/**
@@ -57,17 +64,23 @@ public interface Model {
*/
boolean hasPerson(Person person);
+ boolean hasGroup(Group group);
+
/**
* Deletes the given person.
* The person must exist in the address book.
*/
void deletePerson(Person target);
+ void deleteGroup(Group target);
+
/**
* Adds the given person.
* {@code person} must not already exist in the address book.
*/
- void addPerson(Person person);
+ void createPerson(Person person);
+
+ void createGroup(Group group);
/**
* Replaces the given person {@code target} with {@code editedPerson}.
@@ -76,12 +89,21 @@ public interface Model {
*/
void setPerson(Person target, Person editedPerson);
- /** Returns an unmodifiable view of the filtered person list */
+ void setGroup(Group group, Group editedGroup);
+
+ /**
+ * Returns an unmodifiable view of the filtered person list
+ */
ObservableList getFilteredPersonList();
+ ObservableList getFilteredGroupList();
+
/**
* Updates the filter of the filtered person list to filter by the given {@code predicate}.
+ *
* @throws NullPointerException if {@code predicate} is null.
*/
void updateFilteredPersonList(Predicate predicate);
+
+ void updateFilteredGroupList(Predicate predicate);
}
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
index 0650c954f5c..565caaf035a 100644
--- a/src/main/java/seedu/address/model/ModelManager.java
+++ b/src/main/java/seedu/address/model/ModelManager.java
@@ -11,6 +11,7 @@
import javafx.collections.transformation.FilteredList;
import seedu.address.commons.core.GuiSettings;
import seedu.address.commons.core.LogsCenter;
+import seedu.address.model.group.Group;
import seedu.address.model.person.Person;
/**
@@ -22,6 +23,7 @@ public class ModelManager implements Model {
private final AddressBook addressBook;
private final UserPrefs userPrefs;
private final FilteredList filteredPersons;
+ private final FilteredList filteredGroups;
/**
* Initializes a ModelManager with the given addressBook and userPrefs.
@@ -35,6 +37,7 @@ public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs
this.addressBook = new AddressBook(addressBook);
this.userPrefs = new UserPrefs(userPrefs);
filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
+ filteredGroups = new FilteredList<>(this.addressBook.getGroupList());
}
public ModelManager() {
@@ -94,17 +97,34 @@ public boolean hasPerson(Person person) {
return addressBook.hasPerson(person);
}
+ @Override
+ public boolean hasGroup(Group group) {
+ requireNonNull(group);
+ return addressBook.hasGroup(group);
+ }
+
@Override
public void deletePerson(Person target) {
addressBook.removePerson(target);
}
@Override
- public void addPerson(Person person) {
+ public void deleteGroup(Group target) {
+ addressBook.removeGroup(target);
+ }
+
+ @Override
+ public void createPerson(Person person) {
addressBook.addPerson(person);
updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
}
+ @Override
+ public void createGroup(Group group) {
+ addressBook.addGroup(group);
+ updateFilteredGroupList(PREDICATE_SHOW_ALL_GROUPS);
+ }
+
@Override
public void setPerson(Person target, Person editedPerson) {
requireAllNonNull(target, editedPerson);
@@ -112,6 +132,12 @@ public void setPerson(Person target, Person editedPerson) {
addressBook.setPerson(target, editedPerson);
}
+ @Override public void setGroup(Group target, Group editedGroup) {
+ requireAllNonNull(target, editedGroup);
+
+ addressBook.setGroup(target, editedGroup);
+ }
+
//=========== Filtered Person List Accessors =============================================================
/**
@@ -123,12 +149,23 @@ public ObservableList getFilteredPersonList() {
return filteredPersons;
}
+ @Override
+ public ObservableList getFilteredGroupList() {
+ return filteredGroups;
+ }
+
@Override
public void updateFilteredPersonList(Predicate predicate) {
requireNonNull(predicate);
filteredPersons.setPredicate(predicate);
}
+ @Override
+ public void updateFilteredGroupList(Predicate predicate) {
+ requireNonNull(predicate);
+ filteredGroups.setPredicate(predicate);
+ }
+
@Override
public boolean equals(Object obj) {
// short circuit if same object
diff --git a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java b/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
index 6ddc2cd9a29..d1bad685bf3 100644
--- a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
+++ b/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
@@ -1,6 +1,7 @@
package seedu.address.model;
import javafx.collections.ObservableList;
+import seedu.address.model.group.Group;
import seedu.address.model.person.Person;
/**
@@ -14,4 +15,10 @@ public interface ReadOnlyAddressBook {
*/
ObservableList getPersonList();
+ /**
+ * Returns an unmodifiable view of the groups list.
+ * This list will not contain any duplicate groups.
+ */
+ ObservableList getGroupList();
+
}
diff --git a/src/main/java/seedu/address/model/UserPrefs.java b/src/main/java/seedu/address/model/UserPrefs.java
index 7d9ab5b1f3c..0bff4393cf0 100644
--- a/src/main/java/seedu/address/model/UserPrefs.java
+++ b/src/main/java/seedu/address/model/UserPrefs.java
@@ -14,7 +14,7 @@
public class UserPrefs implements ReadOnlyUserPrefs {
private GuiSettings guiSettings = new GuiSettings();
- private Path addressBookFilePath = Paths.get("data" , "notor.json");
+ private Path addressBookFilePath = Paths.get("data", "notor.json");
/**
* Creates a {@code UserPrefs} with default values.
diff --git a/src/main/java/seedu/address/model/exceptions/DuplicateItemException.java b/src/main/java/seedu/address/model/exceptions/DuplicateItemException.java
new file mode 100644
index 00000000000..47170e71cf4
--- /dev/null
+++ b/src/main/java/seedu/address/model/exceptions/DuplicateItemException.java
@@ -0,0 +1,11 @@
+package seedu.address.model.exceptions;
+
+/**
+ * Signals that the operation will result in duplicate Persons/Groups (Persons/Groups are considered duplicates if they
+ * have the same identity).
+ */
+public class DuplicateItemException extends RuntimeException {
+ public DuplicateItemException() {
+ super("Operation would result in duplicated persons/groups.");
+ }
+}
diff --git a/src/main/java/seedu/address/model/exceptions/ItemNotFoundException.java b/src/main/java/seedu/address/model/exceptions/ItemNotFoundException.java
new file mode 100644
index 00000000000..939fa4a52a1
--- /dev/null
+++ b/src/main/java/seedu/address/model/exceptions/ItemNotFoundException.java
@@ -0,0 +1,6 @@
+package seedu.address.model.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified person/group.
+ */
+public class ItemNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/group/Group.java b/src/main/java/seedu/address/model/group/Group.java
new file mode 100644
index 00000000000..c38e9ce7187
--- /dev/null
+++ b/src/main/java/seedu/address/model/group/Group.java
@@ -0,0 +1,20 @@
+package seedu.address.model.group;
+
+import seedu.address.model.util.Unique;
+
+/**
+ * Stub class right now, used to make commands.
+ */
+public class Group implements Unique {
+
+ /**
+ * Stub implementation, just allows all groups to be added.
+ *
+ * @param other Other group to check for similarity.
+ * @return Whether the other group is the same as the current group.
+ */
+ @Override
+ public boolean isSame(Group other) {
+ return false;
+ }
+}
diff --git a/src/main/java/seedu/address/model/group/SubGroup.java b/src/main/java/seedu/address/model/group/SubGroup.java
new file mode 100644
index 00000000000..329e4adff7d
--- /dev/null
+++ b/src/main/java/seedu/address/model/group/SubGroup.java
@@ -0,0 +1,4 @@
+package seedu.address.model.group;
+
+public class SubGroup extends Group {
+}
diff --git a/src/main/java/seedu/address/model/group/SuperGroup.java b/src/main/java/seedu/address/model/group/SuperGroup.java
new file mode 100644
index 00000000000..31b4b013528
--- /dev/null
+++ b/src/main/java/seedu/address/model/group/SuperGroup.java
@@ -0,0 +1,7 @@
+package seedu.address.model.group;
+
+import java.util.List;
+
+public class SuperGroup extends Group {
+ private List children;
+}
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
index 73c519503c3..e856af0206a 100644
--- a/src/main/java/seedu/address/model/person/Person.java
+++ b/src/main/java/seedu/address/model/person/Person.java
@@ -8,12 +8,13 @@
import java.util.Set;
import seedu.address.model.tag.Tag;
+import seedu.address.model.util.Unique;
/**
* Represents a Person in the address book.
* Guarantees: details are present and not null, field values are validated, immutable.
*/
-public class Person {
+public class Person implements Unique {
// Identity fields
private final Name name;
@@ -64,7 +65,7 @@ public Set getTags() {
* Returns true if both persons have the same name.
* This defines a weaker notion of equality between two persons.
*/
- public boolean isSamePerson(Person otherPerson) {
+ public boolean isSame(Person otherPerson) {
if (otherPerson == this) {
return true;
}
diff --git a/src/main/java/seedu/address/model/person/UniquePersonList.java b/src/main/java/seedu/address/model/person/UniquePersonList.java
deleted file mode 100644
index 0fee4fe57e6..00000000000
--- a/src/main/java/seedu/address/model/person/UniquePersonList.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-
-/**
- * A list of persons that enforces uniqueness between its elements and does not allow nulls.
- * A person is considered unique by comparing using {@code Person#isSamePerson(Person)}. As such, adding and updating of
- * persons uses Person#isSamePerson(Person) for equality so as to ensure that the person being added or updated is
- * unique in terms of identity in the UniquePersonList. However, the removal of a person uses Person#equals(Object) so
- * as to ensure that the person with exactly the same fields will be removed.
- *
- * Supports a minimal set of list operations.
- *
- * @see Person#isSamePerson(Person)
- */
-public class UniquePersonList implements Iterable {
-
- private final ObservableList internalList = FXCollections.observableArrayList();
- private final ObservableList internalUnmodifiableList =
- FXCollections.unmodifiableObservableList(internalList);
-
- /**
- * Returns true if the list contains an equivalent person as the given argument.
- */
- public boolean contains(Person toCheck) {
- requireNonNull(toCheck);
- return internalList.stream().anyMatch(toCheck::isSamePerson);
- }
-
- /**
- * Adds a person to the list.
- * The person must not already exist in the list.
- */
- public void add(Person toAdd) {
- requireNonNull(toAdd);
- if (contains(toAdd)) {
- throw new DuplicatePersonException();
- }
- internalList.add(toAdd);
- }
-
- /**
- * Replaces the person {@code target} in the list with {@code editedPerson}.
- * {@code target} must exist in the list.
- * The person identity of {@code editedPerson} must not be the same as another existing person in the list.
- */
- public void setPerson(Person target, Person editedPerson) {
- requireAllNonNull(target, editedPerson);
-
- int index = internalList.indexOf(target);
- if (index == -1) {
- throw new PersonNotFoundException();
- }
-
- if (!target.isSamePerson(editedPerson) && contains(editedPerson)) {
- throw new DuplicatePersonException();
- }
-
- internalList.set(index, editedPerson);
- }
-
- /**
- * Removes the equivalent person from the list.
- * The person must exist in the list.
- */
- public void remove(Person toRemove) {
- requireNonNull(toRemove);
- if (!internalList.remove(toRemove)) {
- throw new PersonNotFoundException();
- }
- }
-
- public void setPersons(UniquePersonList replacement) {
- requireNonNull(replacement);
- internalList.setAll(replacement.internalList);
- }
-
- /**
- * Replaces the contents of this list with {@code persons}.
- * {@code persons} must not contain duplicate persons.
- */
- public void setPersons(List persons) {
- requireAllNonNull(persons);
- if (!personsAreUnique(persons)) {
- throw new DuplicatePersonException();
- }
-
- internalList.setAll(persons);
- }
-
- /**
- * Returns the backing list as an unmodifiable {@code ObservableList}.
- */
- public ObservableList asUnmodifiableObservableList() {
- return internalUnmodifiableList;
- }
-
- @Override
- public Iterator iterator() {
- return internalList.iterator();
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof UniquePersonList // instanceof handles nulls
- && internalList.equals(((UniquePersonList) other).internalList));
- }
-
- @Override
- public int hashCode() {
- return internalList.hashCode();
- }
-
- /**
- * Returns true if {@code persons} contains only unique persons.
- */
- private boolean personsAreUnique(List persons) {
- for (int i = 0; i < persons.size() - 1; i++) {
- for (int j = i + 1; j < persons.size(); j++) {
- if (persons.get(i).isSamePerson(persons.get(j))) {
- return false;
- }
- }
- }
- return true;
- }
-}
diff --git a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java b/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
deleted file mode 100644
index d7290f59442..00000000000
--- a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package seedu.address.model.person.exceptions;
-
-/**
- * Signals that the operation will result in duplicate Persons (Persons are considered duplicates if they have the same
- * identity).
- */
-public class DuplicatePersonException extends RuntimeException {
- public DuplicatePersonException() {
- super("Operation would result in duplicate persons");
- }
-}
diff --git a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java b/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
deleted file mode 100644
index fa764426ca7..00000000000
--- a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package seedu.address.model.person.exceptions;
-
-/**
- * Signals that the operation is unable to find the specified person.
- */
-public class PersonNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
index 828f52b4ed3..f76942c835e 100644
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java
@@ -19,6 +19,7 @@
public class SampleDataUtil {
public static final Note EMPTY_NOTE = new Note("");
+ // @formatter:off
public static Person[] getSamplePersons() {
return new Person[]{
new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
diff --git a/src/main/java/seedu/address/model/util/Unique.java b/src/main/java/seedu/address/model/util/Unique.java
new file mode 100644
index 00000000000..706ba7b78fe
--- /dev/null
+++ b/src/main/java/seedu/address/model/util/Unique.java
@@ -0,0 +1,5 @@
+package seedu.address.model.util;
+
+public interface Unique {
+ boolean isSame(T other);
+}
diff --git a/src/main/java/seedu/address/model/util/UniqueList.java b/src/main/java/seedu/address/model/util/UniqueList.java
new file mode 100644
index 00000000000..86d3aba4113
--- /dev/null
+++ b/src/main/java/seedu/address/model/util/UniqueList.java
@@ -0,0 +1,125 @@
+package seedu.address.model.util;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import seedu.address.model.exceptions.DuplicateItemException;
+import seedu.address.model.exceptions.ItemNotFoundException;
+
+public class UniqueList> implements Iterable {
+ private final ObservableList internalList = FXCollections.observableArrayList();
+ private final ObservableList internalUnmodifiableList =
+ FXCollections.unmodifiableObservableList(internalList);
+
+ /**
+ * Returns true if the list contains an equivalent item as the given argument.
+ */
+ public boolean contains(T toCheck) {
+ requireNonNull(toCheck);
+ return internalList.stream().anyMatch(toCheck::isSame);
+ }
+
+ /**
+ * Adds an item to the list.
+ * The item must not already exist in the list.
+ */
+ public void add(T toAdd) {
+ requireNonNull(toAdd);
+ if (contains(toAdd)) {
+ throw new DuplicateItemException();
+ }
+ internalList.add(toAdd);
+ }
+
+ /**
+ * Replaces the item {@code target} in the list with {@code editedItem}.
+ * {@code target} must exist in the list.
+ * The item {@code editedItem} must not be the same as another existing item in the list.
+ */
+ public void setItem(T target, T editedItem) {
+ requireAllNonNull(target, editedItem);
+
+ int index = internalList.indexOf(target);
+ if (index == -1) {
+ throw new ItemNotFoundException();
+ }
+
+ if (!target.isSame(editedItem) && contains(editedItem)) {
+ throw new DuplicateItemException();
+ }
+
+ internalList.set(index, editedItem);
+ }
+
+ /**
+ * Removes the equivalent person from the list.
+ * The person must exist in the list.
+ */
+ public void remove(T toRemove) {
+ requireNonNull(toRemove);
+ if (!internalList.remove(toRemove)) {
+ throw new ItemNotFoundException();
+ }
+ }
+
+ public void setItems(UniqueList replacement) {
+ requireNonNull(replacement);
+ internalList.setAll(replacement.internalList);
+ }
+
+ /**
+ * Replaces the contents of this list with {@code persons}.
+ * {@code persons} must not contain duplicate persons.
+ */
+ public void setItems(List items) {
+ requireAllNonNull(items);
+ if (!onlyContainsUnique(items)) {
+ throw new DuplicateItemException();
+ }
+
+ internalList.setAll(items);
+ }
+
+ /**
+ * Returns the backing list as an unmodifiable {@code ObservableList}.
+ */
+ public ObservableList asUnmodifiableObservableList() {
+ return internalUnmodifiableList;
+ }
+
+ @Override
+ public Iterator iterator() {
+ return internalList.iterator();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof UniqueList // instanceof handles nulls
+ && internalList.equals(((UniqueList) other).internalList));
+ }
+
+ @Override
+ public int hashCode() {
+ return internalList.hashCode();
+ }
+
+ /**
+ * Returns true if {@code persons} contains only unique persons.
+ */
+ private boolean onlyContainsUnique(List items) {
+ for (int i = 0; i < items.size() - 1; i++) {
+ for (int j = i + 1; j < items.size(); j++) {
+ if (items.get(i).isSame(items.get(j))) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+}
diff --git a/src/main/java/seedu/address/storage/AddressBookStorage.java b/src/main/java/seedu/address/storage/AddressBookStorage.java
index 4599182b3f9..ee4cf2c0e74 100644
--- a/src/main/java/seedu/address/storage/AddressBookStorage.java
+++ b/src/main/java/seedu/address/storage/AddressBookStorage.java
@@ -19,7 +19,8 @@ public interface AddressBookStorage {
/**
* Returns AddressBook data as a {@link ReadOnlyAddressBook}.
- * Returns {@code Optional.empty()} if storage file is not found.
+ * Returns {@code Optional.empty()} if storage file is not found.
+ *
* @throws DataConversionException if the data in storage is not in the expected format.
* @throws IOException if there was any problem when reading from the storage.
*/
@@ -32,6 +33,7 @@ public interface AddressBookStorage {
/**
* Saves the given {@link ReadOnlyAddressBook} to the storage.
+ *
* @param addressBook cannot be null.
* @throws IOException if there was any problem writing to the file.
*/
diff --git a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java b/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java
index 83dc3452394..40f48a3fbe9 100644
--- a/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java
+++ b/src/main/java/seedu/address/storage/JsonUserPrefsStorage.java
@@ -32,6 +32,7 @@ public Optional readUserPrefs() throws DataConversionException {
/**
* Similar to {@link #readUserPrefs()}
+ *
* @param prefsFilePath location of the data. Cannot be null.
* @throws DataConversionException if the file format is not as expected.
*/
diff --git a/src/main/java/seedu/address/storage/UserPrefsStorage.java b/src/main/java/seedu/address/storage/UserPrefsStorage.java
index 29eef178dbc..1eb07ff2880 100644
--- a/src/main/java/seedu/address/storage/UserPrefsStorage.java
+++ b/src/main/java/seedu/address/storage/UserPrefsStorage.java
@@ -20,7 +20,8 @@ public interface UserPrefsStorage {
/**
* Returns UserPrefs data from storage.
- * Returns {@code Optional.empty()} if storage file is not found.
+ * Returns {@code Optional.empty()} if storage file is not found.
+ *
* @throws DataConversionException if the data in storage is not in the expected format.
* @throws IOException if there was any problem when reading from the storage.
*/
@@ -28,6 +29,7 @@ public interface UserPrefsStorage {
/**
* Saves the given {@link seedu.address.model.ReadOnlyUserPrefs} to the storage.
+ *
* @param userPrefs cannot be null.
* @throws IOException if there was any problem writing to the file.
*/
diff --git a/src/main/java/seedu/address/ui/CommandBox.java b/src/main/java/seedu/address/ui/CommandBox.java
index 9e75478664b..1f4ccfe9fde 100644
--- a/src/main/java/seedu/address/ui/CommandBox.java
+++ b/src/main/java/seedu/address/ui/CommandBox.java
@@ -6,6 +6,7 @@
import javafx.scene.layout.Region;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.executors.exceptions.ExecuteException;
import seedu.address.logic.parser.exceptions.ParseException;
/**
@@ -44,7 +45,7 @@ private void handleCommandEntered() {
try {
commandExecutor.execute(commandText);
commandTextField.setText("");
- } catch (CommandException | ParseException e) {
+ } catch (CommandException | ParseException | ExecuteException e) {
setStyleToIndicateCommandFailure();
}
}
@@ -79,7 +80,7 @@ public interface CommandExecutor {
*
* @see seedu.address.logic.Logic#execute(String)
*/
- CommandResult execute(String commandText) throws CommandException, ParseException;
+ CommandResult execute(String commandText) throws CommandException, ParseException, ExecuteException;
}
}
diff --git a/src/main/java/seedu/address/ui/HelpWindow.java b/src/main/java/seedu/address/ui/HelpWindow.java
index 9a665915949..e5ea7399918 100644
--- a/src/main/java/seedu/address/ui/HelpWindow.java
+++ b/src/main/java/seedu/address/ui/HelpWindow.java
@@ -46,20 +46,20 @@ public HelpWindow() {
/**
* Shows the help window.
- * @throws IllegalStateException
- *
- *
- * if this method is called on a thread other than the JavaFX Application Thread.
- *
- *
- * if this method is called during animation or layout processing.
- *
- *
- * if this method is called on the primary stage.
- *
- *
- * if {@code dialogStage} is already showing.
- *
+ *
+ * @throws IllegalStateException
+ *
+ * if this method is called on a thread other than the JavaFX Application Thread.
+ *
+ *
+ * if this method is called during animation or layout processing.
+ *
+ *
+ * if this method is called on the primary stage.
+ *
+ *
+ * if {@code dialogStage} is already showing.
+ *
*
*/
public void show() {
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
index 54c2be3d6bc..f44f45130c5 100644
--- a/src/main/java/seedu/address/ui/MainWindow.java
+++ b/src/main/java/seedu/address/ui/MainWindow.java
@@ -15,6 +15,7 @@
import seedu.address.logic.Logic;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.executors.exceptions.ExecuteException;
import seedu.address.logic.parser.exceptions.ParseException;
/**
@@ -78,6 +79,7 @@ private void setAccelerators() {
/**
* Sets the accelerator of a MenuItem.
+ *
* @param keyCombination the KeyCombination value of the accelerator
*/
private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
@@ -172,7 +174,7 @@ public PersonListPanel getPersonListPanel() {
*
* @see seedu.address.logic.Logic#execute(String)
*/
- private CommandResult executeCommand(String commandText) throws CommandException, ParseException {
+ private CommandResult executeCommand(String commandText) throws CommandException, ParseException, ExecuteException {
try {
CommandResult commandResult = logic.execute(commandText);
logger.info("Result: " + commandResult.getFeedbackToUser());
@@ -187,7 +189,7 @@ private CommandResult executeCommand(String commandText) throws CommandException
}
return commandResult;
- } catch (CommandException | ParseException e) {
+ } catch (CommandException | ParseException | ExecuteException e) {
logger.info("Invalid command: " + commandText);
resultDisplay.setFeedbackToUser(e.getMessage());
throw e;
diff --git a/src/main/java/seedu/address/ui/Ui.java b/src/main/java/seedu/address/ui/Ui.java
index 17aa0b494fe..e28dae7e990 100644
--- a/src/main/java/seedu/address/ui/Ui.java
+++ b/src/main/java/seedu/address/ui/Ui.java
@@ -7,7 +7,9 @@
*/
public interface Ui {
- /** Starts the UI (and the App). */
+ /**
+ * Starts the UI (and the App).
+ */
void start(Stage primaryStage);
}
diff --git a/src/main/java/seedu/address/ui/UiManager.java b/src/main/java/seedu/address/ui/UiManager.java
index b67b0ba1a22..beb1d21b108 100644
--- a/src/main/java/seedu/address/ui/UiManager.java
+++ b/src/main/java/seedu/address/ui/UiManager.java
@@ -64,7 +64,7 @@ void showAlertDialogAndWait(Alert.AlertType type, String title, String headerTex
* This method only returns after the user has closed the alert dialog.
*/
private static void showAlertDialogAndWait(Stage owner, AlertType type, String title, String headerText,
- String contentText) {
+ String contentText) {
final Alert alert = new Alert(type);
alert.getDialogPane().getStylesheets().add("view/DarkTheme.css");
alert.initOwner(owner);
diff --git a/src/main/java/seedu/address/ui/UiPart.java b/src/main/java/seedu/address/ui/UiPart.java
index fc820e01a9c..2231075051b 100644
--- a/src/main/java/seedu/address/ui/UiPart.java
+++ b/src/main/java/seedu/address/ui/UiPart.java
@@ -14,7 +14,9 @@
*/
public abstract class UiPart {
- /** Resource folder where FXML files are stored. */
+ /**
+ * Resource folder where FXML files are stored.
+ */
public static final String FXML_FILE_FOLDER = "/view/";
private final FXMLLoader fxmlLoader = new FXMLLoader();
@@ -29,6 +31,7 @@ public UiPart(URL fxmlFileUrl) {
/**
* Constructs a UiPart using the specified FXML file within {@link #FXML_FILE_FOLDER}.
+ *
* @see #UiPart(URL)
*/
public UiPart(String fxmlFileName) {
@@ -45,6 +48,7 @@ public UiPart(URL fxmlFileUrl, T root) {
/**
* Constructs a UiPart with the specified FXML file within {@link #FXML_FILE_FOLDER} and root object.
+ *
* @see #UiPart(URL, T)
*/
public UiPart(String fxmlFileName, T root) {
@@ -60,6 +64,7 @@ public T getRoot() {
/**
* Loads the object hierarchy from a FXML document.
+ *
* @param location Location of the FXML document.
* @param root Specifies the root of the object hierarchy.
*/
diff --git a/src/main/resources/view/CommandBox.fxml b/src/main/resources/view/CommandBox.fxml
index 09f6d6fe9e4..a7c75aebcc5 100644
--- a/src/main/resources/view/CommandBox.fxml
+++ b/src/main/resources/view/CommandBox.fxml
@@ -2,8 +2,7 @@
-
-
+
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 9ce9bcfb569..75e9fccab4c 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -56,11 +56,7 @@
-fx-size: 35;
-fx-border-width: 0 0 1 0;
-fx-background-color: transparent;
- -fx-border-color:
- transparent
- transparent
- derive(-fx-base, 80%)
- transparent;
+ -fx-border-color: transparent transparent derive(-fx-base, 80%) transparent;
-fx-border-insets: 0 10 1 0;
}
@@ -95,7 +91,7 @@
.list-cell {
-fx-label-padding: 0 0 0 0;
- -fx-graphic-text-gap : 0;
+ -fx-graphic-text-gap: 0;
-fx-padding: 0 0 0 0;
}
@@ -133,13 +129,13 @@
}
.stack-pane {
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: derive(#1d1d1d, 20%);
}
.pane-with-border {
- -fx-background-color: derive(#1d1d1d, 20%);
- -fx-border-color: derive(#1d1d1d, 10%);
- -fx-border-top-width: 1px;
+ -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-border-color: derive(#1d1d1d, 10%);
+ -fx-border-top-width: 1px;
}
.status-bar {
@@ -229,8 +225,8 @@
}
.button:pressed, .button:default:hover:pressed {
- -fx-background-color: white;
- -fx-text-fill: #1d1d1d;
+ -fx-background-color: white;
+ -fx-text-fill: #1d1d1d;
}
.button:focused {
diff --git a/src/main/resources/view/HelpWindow.fxml b/src/main/resources/view/HelpWindow.fxml
index c9a38f2b105..f673c9d9738 100644
--- a/src/main/resources/view/HelpWindow.fxml
+++ b/src/main/resources/view/HelpWindow.fxml
@@ -2,44 +2,44 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index 32bcf2c8e70..e1ee70a0d5c 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -2,60 +2,60 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index f745ee0d676..70e43bdf065 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -8,29 +8,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/view/PersonListPanel.fxml b/src/main/resources/view/PersonListPanel.fxml
index 8836d323cc5..3dffe9efdc5 100644
--- a/src/main/resources/view/PersonListPanel.fxml
+++ b/src/main/resources/view/PersonListPanel.fxml
@@ -2,7 +2,6 @@
-
-
+
diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml
index 58d5ad3dc56..ea978cc6fa4 100644
--- a/src/main/resources/view/ResultDisplay.fxml
+++ b/src/main/resources/view/ResultDisplay.fxml
@@ -2,8 +2,7 @@
-
-
+ xmlns:fx="http://javafx.com/fxml/1">
+
diff --git a/src/main/resources/view/StatusBarFooter.fxml b/src/main/resources/view/StatusBarFooter.fxml
index 149f62bd29c..04e80856101 100644
--- a/src/main/resources/view/StatusBarFooter.fxml
+++ b/src/main/resources/view/StatusBarFooter.fxml
@@ -3,10 +3,9 @@
-
-
-
-
-
+
+
+
+
diff --git a/src/test/data/ConfigUtilTest/EmptyConfig.json b/src/test/data/ConfigUtilTest/EmptyConfig.json
index 0db3279e44b..2c63c085104 100644
--- a/src/test/data/ConfigUtilTest/EmptyConfig.json
+++ b/src/test/data/ConfigUtilTest/EmptyConfig.json
@@ -1,3 +1,2 @@
{
-
}
diff --git a/src/test/data/ConfigUtilTest/ExtraValuesConfig.json b/src/test/data/ConfigUtilTest/ExtraValuesConfig.json
index f5a2b3d0293..0d4d56bcbd3 100644
--- a/src/test/data/ConfigUtilTest/ExtraValuesConfig.json
+++ b/src/test/data/ConfigUtilTest/ExtraValuesConfig.json
@@ -1,5 +1,5 @@
{
- "logLevel" : "INFO",
- "userPrefsFilePath" : "preferences.json",
- "extra" : "extra value"
+ "logLevel": "INFO",
+ "userPrefsFilePath": "preferences.json",
+ "extra": "extra value"
}
diff --git a/src/test/data/ConfigUtilTest/TypicalConfig.json b/src/test/data/ConfigUtilTest/TypicalConfig.json
index a0edc78a820..40a34493e69 100644
--- a/src/test/data/ConfigUtilTest/TypicalConfig.json
+++ b/src/test/data/ConfigUtilTest/TypicalConfig.json
@@ -1,4 +1,4 @@
{
- "logLevel" : "INFO",
- "userPrefsFilePath" : "preferences.json"
+ "logLevel": "INFO",
+ "userPrefsFilePath": "preferences.json"
}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
index 6a4d2b7181c..a7df028ec6b 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
@@ -1,13 +1,16 @@
{
- "persons": [ {
- "name": "Valid Person",
- "phone": "9482424",
- "email": "hans@example.com",
- "address": "4th street"
- }, {
- "name": "Person With Invalid Phone Field",
- "phone": "948asdf2424",
- "email": "hans@example.com",
- "address": "4th street"
- } ]
+ "persons": [
+ {
+ "name": "Valid Person",
+ "phone": "9482424",
+ "email": "hans@example.com",
+ "address": "4th street"
+ },
+ {
+ "name": "Person With Invalid Phone Field",
+ "phone": "948asdf2424",
+ "email": "hans@example.com",
+ "address": "4th street"
+ }
+ ]
}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
index ccd21f7d1a9..1e59eaf65cb 100644
--- a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
+++ b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
@@ -1,8 +1,10 @@
{
- "persons": [ {
- "name": "Person with invalid name field: Ha!ns Mu@ster",
- "phone": "9482424",
- "email": "hans@example.com",
- "address": "4th street"
- } ]
+ "persons": [
+ {
+ "name": "Person with invalid name field: Ha!ns Mu@ster",
+ "phone": "9482424",
+ "email": "hans@example.com",
+ "address": "4th street"
+ }
+ ]
}
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
index 35c5aba1a63..3b0d282f565 100644
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
@@ -1,14 +1,19 @@
{
- "persons": [ {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "alice@example.com",
- "note" : "",
- "tagged": [ "friends" ]
- }, {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "pauline@example.com",
- "note" : ""
- } ]
+ "persons": [
+ {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "email": "alice@example.com",
+ "note": "",
+ "tagged": [
+ "friends"
+ ]
+ },
+ {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "email": "pauline@example.com",
+ "note": ""
+ }
+ ]
}
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
index 671f3da654c..149487f62db 100644
--- a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
@@ -1,7 +1,9 @@
{
- "persons": [ {
- "name": "Hans Muster",
- "phone": "9482424",
- "email": "invalid@email!3e"
- } ]
+ "persons": [
+ {
+ "name": "Hans Muster",
+ "phone": "9482424",
+ "email": "invalid@email!3e"
+ }
+ ]
}
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
index 3aef69669f4..279a2aebf9d 100644
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
@@ -1,46 +1,61 @@
{
"_comment": "AddressBook save file which contains the same Person values as in TypicalPersons#getTypicalAddressBook()",
- "persons" : [ {
- "name" : "Alice Pauline",
- "phone" : "94351253",
- "email" : "alice@example.com",
- "note": "",
- "tagged" : [ "friends" ]
- }, {
- "name" : "Benson Meier",
- "phone" : "98765432",
- "email" : "johnd@example.com",
- "note": "",
- "tagged" : [ "owesMoney", "friends" ]
- }, {
- "name" : "Carl Kurz",
- "phone" : "95352563",
- "email" : "heinz@example.com",
- "note": "",
- "tagged" : [ ]
- }, {
- "name" : "Daniel Meier",
- "phone" : "87652533",
- "email" : "cornelia@example.com",
- "note": "",
- "tagged" : [ "friends" ]
- }, {
- "name" : "Elle Meyer",
- "phone" : "9482224",
- "email" : "werner@example.com",
- "note": "",
- "tagged" : [ ]
- }, {
- "name" : "Fiona Kunz",
- "phone" : "9482427",
- "email" : "lydia@example.com",
- "note": "",
- "tagged" : [ ]
- }, {
- "name" : "George Best",
- "phone" : "9482442",
- "email" : "anna@example.com",
- "note": "",
- "tagged" : [ ]
- } ]
+ "persons": [
+ {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "email": "alice@example.com",
+ "note": "",
+ "tagged": [
+ "friends"
+ ]
+ },
+ {
+ "name": "Benson Meier",
+ "phone": "98765432",
+ "email": "johnd@example.com",
+ "note": "",
+ "tagged": [
+ "owesMoney",
+ "friends"
+ ]
+ },
+ {
+ "name": "Carl Kurz",
+ "phone": "95352563",
+ "email": "heinz@example.com",
+ "note": "",
+ "tagged": []
+ },
+ {
+ "name": "Daniel Meier",
+ "phone": "87652533",
+ "email": "cornelia@example.com",
+ "note": "",
+ "tagged": [
+ "friends"
+ ]
+ },
+ {
+ "name": "Elle Meyer",
+ "phone": "9482224",
+ "email": "werner@example.com",
+ "note": "",
+ "tagged": []
+ },
+ {
+ "name": "Fiona Kunz",
+ "phone": "9482427",
+ "email": "lydia@example.com",
+ "note": "",
+ "tagged": []
+ },
+ {
+ "name": "George Best",
+ "phone": "9482442",
+ "email": "anna@example.com",
+ "note": "",
+ "tagged": []
+ }
+ ]
}
diff --git a/src/test/data/JsonUserPrefsStorageTest/EmptyUserPrefs.json b/src/test/data/JsonUserPrefsStorageTest/EmptyUserPrefs.json
index 0db3279e44b..2c63c085104 100644
--- a/src/test/data/JsonUserPrefsStorageTest/EmptyUserPrefs.json
+++ b/src/test/data/JsonUserPrefsStorageTest/EmptyUserPrefs.json
@@ -1,3 +1,2 @@
{
-
}
diff --git a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
index e557d8bf25a..5f1669f7ffc 100644
--- a/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
+++ b/src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json
@@ -1,13 +1,13 @@
{
- "guiSettings" : {
- "windowWidth" : 1000.0,
- "windowHeight" : 500.0,
- "extra" : "some value ",
- "windowCoordinates" : {
- "x" : 300,
- "y" : 100,
- "z" : 99
+ "guiSettings": {
+ "windowWidth": 1000.0,
+ "windowHeight": 500.0,
+ "extra": "some value ",
+ "windowCoordinates": {
+ "x": 300,
+ "y": 100,
+ "z": 99
}
},
- "addressBookFilePath" : "notor.json"
+ "addressBookFilePath": "notor.json"
}
diff --git a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
index c5f2d19a8d5..76674c0820c 100644
--- a/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
+++ b/src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json
@@ -1,11 +1,11 @@
{
- "guiSettings" : {
- "windowWidth" : 1000.0,
- "windowHeight" : 500.0,
- "windowCoordinates" : {
- "x" : 300,
- "y" : 100
+ "guiSettings": {
+ "windowWidth": 1000.0,
+ "windowHeight": 500.0,
+ "windowCoordinates": {
+ "x": 300,
+ "y": 100
}
},
- "addressBookFilePath" : "notor.json"
+ "addressBookFilePath": "notor.json"
}
diff --git a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java b/src/test/java/seedu/address/commons/util/ConfigUtilTest.java
index d2ab2839a52..535abdb270f 100644
--- a/src/test/java/seedu/address/commons/util/ConfigUtilTest.java
+++ b/src/test/java/seedu/address/commons/util/ConfigUtilTest.java
@@ -108,8 +108,8 @@ private void save(Config config, String configFileInTestDataFolder) throws IOExc
private Path addToTestDataPathIfNotNull(String configFileInTestDataFolder) {
return configFileInTestDataFolder != null
- ? TEST_DATA_FOLDER.resolve(configFileInTestDataFolder)
- : null;
+ ? TEST_DATA_FOLDER.resolve(configFileInTestDataFolder)
+ : null;
}
diff --git a/src/test/java/seedu/address/commons/util/StringUtilTest.java b/src/test/java/seedu/address/commons/util/StringUtilTest.java
index 6e6d542507c..4cdd1fcd82e 100644
--- a/src/test/java/seedu/address/commons/util/StringUtilTest.java
+++ b/src/test/java/seedu/address/commons/util/StringUtilTest.java
@@ -60,12 +60,14 @@ public void containsWordIgnoreCase_nullWord_throwsNullPointerException() {
assertThrows(NullPointerException.class, () -> StringUtil.containsWordIgnoreCase("typical sentence", null));
}
+ // @formatter:off
@Test
public void containsWordIgnoreCase_emptyWord_throwsIllegalArgumentException() {
assertThrows(IllegalArgumentException.class, "Word parameter cannot be empty", ()
-> StringUtil.containsWordIgnoreCase("typical sentence", " "));
}
+ // @formatter:off
@Test
public void containsWordIgnoreCase_multipleWords_throwsIllegalArgumentException() {
assertThrows(IllegalArgumentException.class, "Word parameter should be a single word", ()
@@ -133,7 +135,7 @@ public void containsWordIgnoreCase_validInputs_correctResult() {
@Test
public void getDetails_exceptionGiven() {
assertTrue(StringUtil.getDetails(new FileNotFoundException("file not found"))
- .contains("java.io.FileNotFoundException: file not found"));
+ .contains("java.io.FileNotFoundException: file not found"));
}
@Test
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
index e5ff66929e5..d28479a77ec 100644
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ b/src/test/java/seedu/address/logic/LogicManagerTest.java
@@ -16,10 +16,12 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import seedu.address.logic.commands.AddCommand;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.ListCommand;
import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.executors.Executor;
+import seedu.address.logic.executors.exceptions.ExecuteException;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
@@ -47,6 +49,7 @@ public void setUp() {
JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.resolve("userPrefs.json"));
StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
logic = new LogicManager(model, storage);
+ Executor.setup(model);
}
@Test
@@ -58,7 +61,7 @@ public void execute_invalidCommandFormat_throwsParseException() {
@Test
public void execute_commandExecutionError_throwsCommandException() {
String deleteCommand = "delete 9";
- assertCommandException(deleteCommand, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertExecuteException(deleteCommand, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
@Test
@@ -78,12 +81,12 @@ public void execute_storageThrowsIoException_throwsCommandException() {
logic = new LogicManager(model, storage);
// Execute add command
- String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY;
+ String addCommand = PersonCreateCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY;
Person expectedPerson = new PersonBuilder(AMY).withTags().build();
ModelManager expectedModel = new ModelManager();
- expectedModel.addPerson(expectedPerson);
+ expectedModel.createPerson(expectedPerson);
String expectedMessage = LogicManager.FILE_OPS_ERROR_MESSAGE + DUMMY_IO_EXCEPTION;
- assertCommandFailure(addCommand, CommandException.class, expectedMessage, expectedModel);
+ assertExecuteFailure(addCommand, CommandException.class, expectedMessage, expectedModel);
}
@Test
@@ -96,10 +99,11 @@ public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException
* - no exceptions are thrown
* - the feedback message is equal to {@code expectedMessage}
* - the internal model manager state is the same as that in {@code expectedModel}
- * @see #assertCommandFailure(String, Class, String, Model)
+ *
+ * @see #assertExecuteFailure(String, Class, String, Model)
*/
private void assertCommandSuccess(String inputCommand, String expectedMessage,
- Model expectedModel) throws CommandException, ParseException {
+ Model expectedModel) throws CommandException, ParseException, ExecuteException {
CommandResult result = logic.execute(inputCommand);
assertEquals(expectedMessage, result.getFeedbackToUser());
assertEquals(expectedModel, model);
@@ -107,28 +111,31 @@ private void assertCommandSuccess(String inputCommand, String expectedMessage,
/**
* Executes the command, confirms that a ParseException is thrown and that the result message is correct.
- * @see #assertCommandFailure(String, Class, String, Model)
+ *
+ * @see #assertExecuteFailure(String, Class, String, Model)
*/
private void assertParseException(String inputCommand, String expectedMessage) {
- assertCommandFailure(inputCommand, ParseException.class, expectedMessage);
+ assertExecuteFailure(inputCommand, ParseException.class, expectedMessage);
}
/**
- * Executes the command, confirms that a CommandException is thrown and that the result message is correct.
- * @see #assertCommandFailure(String, Class, String, Model)
+ * Executes the command, confirms that a ExecuteException is thrown and that the result message is correct.
+ *
+ * @see #assertExecuteFailure(String, Class, String, Model)
*/
- private void assertCommandException(String inputCommand, String expectedMessage) {
- assertCommandFailure(inputCommand, CommandException.class, expectedMessage);
+ private void assertExecuteException(String inputCommand, String expectedMessage) {
+ assertExecuteFailure(inputCommand, ExecuteException.class, expectedMessage);
}
/**
* Executes the command, confirms that the exception is thrown and that the result message is correct.
- * @see #assertCommandFailure(String, Class, String, Model)
+ *
+ * @see #assertExecuteFailure(String, Class, String, Model)
*/
- private void assertCommandFailure(String inputCommand, Class expectedException,
+ private void assertExecuteFailure(String inputCommand, Class expectedException,
String expectedMessage) {
Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- assertCommandFailure(inputCommand, expectedException, expectedMessage, expectedModel);
+ assertExecuteFailure(inputCommand, expectedException, expectedMessage, expectedModel);
}
/**
@@ -136,9 +143,10 @@ private void assertCommandFailure(String inputCommand, Class
* - the resulting error message is equal to {@code expectedMessage}
* - the internal model manager state is the same as that in {@code expectedModel}
+ *
* @see #assertCommandSuccess(String, String, Model)
*/
- private void assertCommandFailure(String inputCommand, Class expectedException,
+ private void assertExecuteFailure(String inputCommand, Class expectedException,
String expectedMessage, Model expectedModel) {
assertThrows(expectedException, expectedMessage, () -> logic.execute(inputCommand));
assertEquals(expectedModel, model);
diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
index 80d9110c03a..be1b3881b43 100644
--- a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
@@ -1,6 +1,5 @@
package seedu.address.logic.commands;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
import org.junit.jupiter.api.Test;
@@ -17,7 +16,7 @@ public void execute_emptyAddressBook_success() {
Model model = new ModelManager();
Model expectedModel = new ModelManager();
- assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
}
@Test
@@ -26,7 +25,7 @@ public void execute_nonEmptyAddressBook_success() {
Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
expectedModel.setAddressBook(new AddressBook());
- assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index a021a617606..f25f2d74ff6 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -13,11 +13,13 @@
import seedu.address.commons.core.index.Index;
import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.logic.executors.person.PersonEditExecutor;
import seedu.address.model.AddressBook;
import seedu.address.model.Model;
import seedu.address.model.person.NameContainsKeywordsPredicate;
import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
+import seedu.address.testutil.PersonEditDescriptorBuilder;
/**
* Contains helper methods for testing commands.
@@ -52,14 +54,14 @@ public class CommandTestUtil {
public static final String PREAMBLE_WHITESPACE = "\t \r \n";
public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble";
- public static final EditCommand.EditPersonDescriptor DESC_AMY;
- public static final EditCommand.EditPersonDescriptor DESC_BOB;
+ public static final PersonEditExecutor.PersonEditDescriptor DESC_AMY;
+ public static final PersonEditExecutor.PersonEditDescriptor DESC_BOB;
static {
- DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
+ DESC_AMY = new PersonEditDescriptorBuilder().withName(VALID_NAME_AMY)
.withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withTags(VALID_TAG_FRIEND)
.build();
- DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
+ DESC_BOB = new PersonEditDescriptorBuilder().withName(VALID_NAME_BOB)
.withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
.build();
}
@@ -69,40 +71,40 @@ public class CommandTestUtil {
* - the returned {@link CommandResult} matches {@code expectedCommandResult}
* - the {@code actualModel} matches {@code expectedModel}
*/
- public static void assertCommandSuccess(Command command, Model actualModel, CommandResult expectedCommandResult,
+ public static void assertExecuteSuccess(Command command, Model actualModel, CommandResult expectedCommandResult,
Model expectedModel) {
try {
CommandResult result = command.execute(actualModel);
assertEquals(expectedCommandResult, result);
assertEquals(expectedModel, actualModel);
- } catch (CommandException ce) {
+ } catch (CommandException | ExecuteException ce) {
throw new AssertionError("Execution of command should not fail.", ce);
}
}
/**
- * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)}
+ * Convenience wrapper to {@link #assertExecuteSuccess(Command, Model, CommandResult, Model)}
* that takes a string {@code expectedMessage}.
*/
- public static void assertCommandSuccess(Command command, Model actualModel, String expectedMessage,
+ public static void assertExecuteSuccess(Command command, Model actualModel, String expectedMessage,
Model expectedModel) {
CommandResult expectedCommandResult = new CommandResult(expectedMessage);
- assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel);
+ assertExecuteSuccess(command, actualModel, expectedCommandResult, expectedModel);
}
/**
* Executes the given {@code command}, confirms that
* - a {@code CommandException} is thrown
- * - the CommandException message matches {@code expectedMessage}
+ * - the ExecuteException message matches {@code expectedMessage}
* - the address book, filtered person list and selected person in {@code actualModel} remain unchanged
*/
- public static void assertCommandFailure(Command command, Model actualModel, String expectedMessage) {
+ public static void assertExecuteFailure(Command command, Model actualModel, String expectedMessage) {
// we are unable to defensively copy the model for comparison later, so we can
// only do so by copying its components.
AddressBook expectedAddressBook = new AddressBook(actualModel.getAddressBook());
List expectedFilteredList = new ArrayList<>(actualModel.getFilteredPersonList());
- assertThrows(CommandException.class, expectedMessage, () -> command.execute(actualModel));
+ assertThrows(ExecuteException.class, expectedMessage, () -> command.execute(actualModel));
assertEquals(expectedAddressBook, actualModel.getAddressBook());
assertEquals(expectedFilteredList, actualModel.getFilteredPersonList());
}
diff --git a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
index 39a16643eb9..052cd3538bc 100644
--- a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
@@ -1,6 +1,6 @@
package seedu.address.logic.commands;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.assertExecuteSuccess;
import static seedu.address.logic.commands.ExitCommand.MESSAGE_EXIT_ACKNOWLEDGEMENT;
import org.junit.jupiter.api.Test;
@@ -15,6 +15,6 @@ public class ExitCommandTest {
@Test
public void execute_exit_success() {
CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
- assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
+ assertExecuteSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/FindCommandTest.java b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
index f9d26caa641..67acdfb421c 100644
--- a/src/test/java/seedu/address/logic/commands/FindCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
@@ -3,7 +3,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static seedu.address.commons.core.Messages.MESSAGE_PERSONS_LISTED_OVERVIEW;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
import static seedu.address.testutil.TypicalPersons.CARL;
import static seedu.address.testutil.TypicalPersons.ELLE;
import static seedu.address.testutil.TypicalPersons.FIONA;
@@ -59,7 +58,7 @@ public void execute_zeroKeywords_noPersonFound() {
NameContainsKeywordsPredicate predicate = preparePredicate(" ");
FindCommand command = new FindCommand(predicate);
expectedModel.updateFilteredPersonList(predicate);
- assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(command, model, expectedMessage, expectedModel);
assertEquals(Collections.emptyList(), model.getFilteredPersonList());
}
@@ -69,7 +68,7 @@ public void execute_multipleKeywords_multiplePersonsFound() {
NameContainsKeywordsPredicate predicate = preparePredicate("Kurz Elle Kunz");
FindCommand command = new FindCommand(predicate);
expectedModel.updateFilteredPersonList(predicate);
- assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(command, model, expectedMessage, expectedModel);
assertEquals(Arrays.asList(CARL, ELLE, FIONA), model.getFilteredPersonList());
}
diff --git a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java b/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
index b7628bedcc2..c6392ac654f 100644
--- a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
@@ -1,6 +1,6 @@
package seedu.address.logic.commands;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.assertExecuteSuccess;
import static seedu.address.logic.commands.HelpCommand.SHOWING_HELP_MESSAGE;
import org.junit.jupiter.api.Test;
@@ -15,6 +15,6 @@ public class HelpCommandTest {
@Test
public void execute_help_success() {
CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, true, false);
- assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
+ assertExecuteSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/ListCommandTest.java b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
index 435ff1f7275..cbe3f731e69 100644
--- a/src/test/java/seedu/address/logic/commands/ListCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
@@ -1,6 +1,5 @@
package seedu.address.logic.commands;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
@@ -28,12 +27,12 @@ public void setUp() {
@Test
public void execute_listIsNotFiltered_showsSameList() {
- assertCommandSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
}
@Test
public void execute_listIsFiltered_showsEverything() {
showPersonAtIndex(model, INDEX_FIRST_PERSON);
- assertCommandSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(new ListCommand(), model, ListCommand.MESSAGE_SUCCESS, expectedModel);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/PersonCreateCommandIntegrationTest.java
similarity index 55%
rename from src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
rename to src/test/java/seedu/address/logic/commands/PersonCreateCommandIntegrationTest.java
index cb8714bb055..1efb917b5e1 100644
--- a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
+++ b/src/test/java/seedu/address/logic/commands/PersonCreateCommandIntegrationTest.java
@@ -1,12 +1,15 @@
package seedu.address.logic.commands;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.assertExecuteFailure;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.executors.Executor;
+import seedu.address.logic.executors.person.PersonCreateExecutor;
+import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;
@@ -16,30 +19,32 @@
/**
* Contains integration tests (interaction with the Model) for {@code AddCommand}.
*/
-public class AddCommandIntegrationTest {
+public class PersonCreateCommandIntegrationTest {
private Model model;
@BeforeEach
public void setUp() {
model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ Executor.setup(model);
}
@Test
- public void execute_newPerson_success() {
+ public void execute_newPerson_success() throws ParseException {
Person validPerson = new PersonBuilder().build();
Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- expectedModel.addPerson(validPerson);
+ expectedModel.createPerson(validPerson);
- assertCommandSuccess(new AddCommand(validPerson), model,
- String.format(AddCommand.MESSAGE_SUCCESS, validPerson), expectedModel);
+ CommandTestUtil.assertExecuteSuccess(new PersonCreateCommand(null, validPerson), model,
+ String.format(PersonCreateExecutor.MESSAGE_SUCCESS, validPerson), expectedModel);
}
@Test
- public void execute_duplicatePerson_throwsCommandException() {
+ public void execute_duplicatePerson_throwsCommandException() throws ParseException {
Person personInList = model.getAddressBook().getPersonList().get(0);
- assertCommandFailure(new AddCommand(personInList), model, AddCommand.MESSAGE_DUPLICATE_PERSON);
+ assertExecuteFailure(new PersonCreateCommand(null, personInList), model,
+ PersonCreateExecutor.MESSAGE_DUPLICATE_PERSON);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/PersonCreateCommandTest.java
similarity index 68%
rename from src/test/java/seedu/address/logic/commands/AddCommandTest.java
rename to src/test/java/seedu/address/logic/commands/PersonCreateCommandTest.java
index 5865713d5dd..7ff2f469fe9 100644
--- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/PersonCreateCommandTest.java
@@ -15,53 +15,64 @@
import javafx.collections.ObservableList;
import seedu.address.commons.core.GuiSettings;
-import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.executors.Executor;
+import seedu.address.logic.executors.exceptions.ExecuteException;
+import seedu.address.logic.executors.person.PersonCreateExecutor;
+import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.AddressBook;
import seedu.address.model.Model;
import seedu.address.model.ReadOnlyAddressBook;
import seedu.address.model.ReadOnlyUserPrefs;
+import seedu.address.model.group.Group;
import seedu.address.model.person.Person;
import seedu.address.testutil.PersonBuilder;
-public class AddCommandTest {
+public class PersonCreateCommandTest {
@Test
public void constructor_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new AddCommand(null));
+ assertThrows(NullPointerException.class, () -> new PersonCreateCommand(null, null));
}
@Test
public void execute_personAcceptedByModel_addSuccessful() throws Exception {
ModelStubAcceptingPersonAdded modelStub = new ModelStubAcceptingPersonAdded();
+ Executor.setup(modelStub);
+
Person validPerson = new PersonBuilder().build();
- CommandResult commandResult = new AddCommand(validPerson).execute(modelStub);
+ CommandResult commandResult = new PersonCreateCommand(null, validPerson).execute(modelStub);
- assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, validPerson), commandResult.getFeedbackToUser());
+ assertEquals(String.format(PersonCreateExecutor.MESSAGE_SUCCESS, validPerson),
+ commandResult.getFeedbackToUser());
assertEquals(Arrays.asList(validPerson), modelStub.personsAdded);
}
+ // @formatter:off
@Test
- public void execute_duplicatePerson_throwsCommandException() {
+ public void execute_duplicatePerson_throwsCommandException() throws ParseException {
Person validPerson = new PersonBuilder().build();
- AddCommand addCommand = new AddCommand(validPerson);
+ PersonCreateCommand personCreateCommand = new PersonCreateCommand(null, validPerson);
ModelStub modelStub = new ModelStubWithPerson(validPerson);
+ Executor.setup(modelStub);
- assertThrows(CommandException.class, AddCommand.MESSAGE_DUPLICATE_PERSON, () -> addCommand.execute(modelStub));
+ assertThrows(ExecuteException.class, PersonCreateExecutor.MESSAGE_DUPLICATE_PERSON, ()
+ -> personCreateCommand.execute(modelStub));
}
@Test
- public void equals() {
+ public void equals() throws ParseException {
Person alice = new PersonBuilder().withName("Alice").build();
Person bob = new PersonBuilder().withName("Bob").build();
- AddCommand addAliceCommand = new AddCommand(alice);
- AddCommand addBobCommand = new AddCommand(bob);
+ PersonCreateCommand addAliceCommand = new PersonCreateCommand(null, alice);
+ PersonCreateCommand addBobCommand = new PersonCreateCommand(null, bob);
// same object -> returns true
assertTrue(addAliceCommand.equals(addAliceCommand));
// same values -> returns true
- AddCommand addAliceCommandCopy = new AddCommand(alice);
+ PersonCreateCommand addAliceCommandCopy = new PersonCreateCommand(null, alice);
assertTrue(addAliceCommand.equals(addAliceCommandCopy));
// different types -> returns false
@@ -109,7 +120,12 @@ public void setAddressBookFilePath(Path addressBookFilePath) {
}
@Override
- public void addPerson(Person person) {
+ public void createPerson(Person person) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void createGroup(Group group) {
throw new AssertionError("This method should not be called.");
}
@@ -128,25 +144,50 @@ public boolean hasPerson(Person person) {
throw new AssertionError("This method should not be called.");
}
+ @Override
+ public boolean hasGroup(Group group) {
+ throw new AssertionError("This method should not be called.");
+ }
+
@Override
public void deletePerson(Person target) {
throw new AssertionError("This method should not be called.");
}
+ @Override
+ public void deleteGroup(Group target) {
+ throw new AssertionError("This method should not be called.");
+ }
+
@Override
public void setPerson(Person target, Person editedPerson) {
throw new AssertionError("This method should not be called.");
}
+ @Override
+ public void setGroup(Group group, Group editedGroup) {
+ throw new AssertionError("This method should not be called.");
+ }
+
@Override
public ObservableList getFilteredPersonList() {
throw new AssertionError("This method should not be called.");
}
+ @Override
+ public ObservableList getFilteredGroupList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
@Override
public void updateFilteredPersonList(Predicate predicate) {
throw new AssertionError("This method should not be called.");
}
+
+ @Override
+ public void updateFilteredGroupList(Predicate predicate) {
+ throw new AssertionError("This method should not be called.");
+ }
}
/**
@@ -163,7 +204,7 @@ private class ModelStubWithPerson extends ModelStub {
@Override
public boolean hasPerson(Person person) {
requireNonNull(person);
- return this.person.isSamePerson(person);
+ return this.person.isSame(person);
}
}
@@ -176,11 +217,11 @@ private class ModelStubAcceptingPersonAdded extends ModelStub {
@Override
public boolean hasPerson(Person person) {
requireNonNull(person);
- return personsAdded.stream().anyMatch(person::isSamePerson);
+ return personsAdded.stream().anyMatch(person::isSame);
}
@Override
- public void addPerson(Person person) {
+ public void createPerson(Person person) {
requireNonNull(person);
personsAdded.add(person);
}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/address/logic/commands/PersonDeleteCommandTest.java
similarity index 68%
rename from src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
rename to src/test/java/seedu/address/logic/commands/PersonDeleteCommandTest.java
index cfbcfbcb634..995f4828b00 100644
--- a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/PersonDeleteCommandTest.java
@@ -3,17 +3,21 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.assertExecuteFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertExecuteSuccess;
import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.person.PersonDeleteCommand;
+import seedu.address.logic.executors.Executor;
+import seedu.address.logic.executors.person.PersonDeleteExecutor;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;
@@ -23,29 +27,34 @@
* Contains integration tests (interaction with the Model) and unit tests for
* {@code DeleteCommand}.
*/
-public class DeleteCommandTest {
+public class PersonDeleteCommandTest {
private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ @BeforeEach
+ public void setUp() {
+ Executor.setup(model);
+ }
+
@Test
public void execute_validIndexUnfilteredList_success() {
Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
+ PersonDeleteCommand deleteCommand = new PersonDeleteCommand(INDEX_FIRST_PERSON);
- String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
+ String expectedMessage = String.format(PersonDeleteExecutor.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
expectedModel.deletePerson(personToDelete);
- assertCommandSuccess(deleteCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(deleteCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_invalidIndexUnfilteredList_throwsCommandException() {
Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
- DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
+ PersonDeleteCommand deleteCommand = new PersonDeleteCommand(outOfBoundIndex);
- assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertExecuteFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
@Test
@@ -53,15 +62,15 @@ public void execute_validIndexFilteredList_success() {
showPersonAtIndex(model, INDEX_FIRST_PERSON);
Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
+ PersonDeleteCommand deleteCommand = new PersonDeleteCommand(INDEX_FIRST_PERSON);
- String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
+ String expectedMessage = String.format(PersonDeleteExecutor.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
expectedModel.deletePerson(personToDelete);
showNoPerson(expectedModel);
- assertCommandSuccess(deleteCommand, model, expectedMessage, expectedModel);
+ assertExecuteSuccess(deleteCommand, model, expectedMessage, expectedModel);
}
@Test
@@ -72,21 +81,21 @@ public void execute_invalidIndexFilteredList_throwsCommandException() {
// ensures that outOfBoundIndex is still in bounds of address book list
assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
- DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
+ PersonDeleteCommand deleteCommand = new PersonDeleteCommand(outOfBoundIndex);
- assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertExecuteFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
@Test
public void equals() {
- DeleteCommand deleteFirstCommand = new DeleteCommand(INDEX_FIRST_PERSON);
- DeleteCommand deleteSecondCommand = new DeleteCommand(INDEX_SECOND_PERSON);
+ PersonDeleteCommand deleteFirstCommand = new PersonDeleteCommand(INDEX_FIRST_PERSON);
+ PersonDeleteCommand deleteSecondCommand = new PersonDeleteCommand(INDEX_SECOND_PERSON);
// same object -> returns true
assertEquals(deleteFirstCommand, deleteFirstCommand);
// same values -> returns true
- DeleteCommand deleteFirstCommandCopy = new DeleteCommand(INDEX_FIRST_PERSON);
+ PersonDeleteCommand deleteFirstCommandCopy = new PersonDeleteCommand(INDEX_FIRST_PERSON);
assertEquals(deleteFirstCommand, deleteFirstCommandCopy);
// different types -> returns false
diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/PersonEditCommandTest.java
similarity index 60%
rename from src/test/java/seedu/address/logic/commands/EditCommandTest.java
rename to src/test/java/seedu/address/logic/commands/PersonEditCommandTest.java
index f50d9ccf1c1..a8284fa9c9d 100644
--- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/PersonEditCommandTest.java
@@ -8,45 +8,53 @@
import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.assertExecuteFailure;
import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
+import seedu.address.logic.commands.person.PersonEditCommand;
+import seedu.address.logic.executors.Executor;
+import seedu.address.logic.executors.person.PersonEditExecutor;
+import seedu.address.logic.executors.person.PersonEditExecutor.PersonEditDescriptor;
import seedu.address.model.AddressBook;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;
import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
import seedu.address.testutil.PersonBuilder;
+import seedu.address.testutil.PersonEditDescriptorBuilder;
/**
* Contains integration tests (interaction with the Model) and unit tests for EditCommand.
*/
-public class EditCommandTest {
+public class PersonEditCommandTest {
private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ @BeforeEach
+ public void setUp() {
+ Executor.setup(model);
+ }
+
@Test
public void execute_allFieldsSpecifiedUnfilteredList_success() {
Person editedPerson = new PersonBuilder().build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build();
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, descriptor);
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder(editedPerson).build();
+ PersonEditCommand personEditCommand = new PersonEditCommand(INDEX_FIRST_PERSON, descriptor);
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(PersonEditExecutor.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(personEditCommand, model, expectedMessage, expectedModel);
}
@Test
@@ -58,28 +66,29 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
Person editedPerson = personInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
.withTags(VALID_TAG_HUSBAND).build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withName(VALID_NAME_BOB)
.withPhone(VALID_PHONE_BOB).withTags(VALID_TAG_HUSBAND).build();
- EditCommand editCommand = new EditCommand(indexLastPerson, descriptor);
+ PersonEditCommand personEditCommand = new PersonEditCommand(indexLastPerson, descriptor);
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(PersonEditExecutor.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
expectedModel.setPerson(lastPerson, editedPerson);
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(personEditCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_noFieldSpecifiedUnfilteredList_success() {
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, new EditPersonDescriptor());
Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+ PersonEditCommand
+ personEditCommand = new PersonEditCommand(INDEX_FIRST_PERSON, new PersonEditDescriptor());
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(PersonEditExecutor.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(personEditCommand, model, expectedMessage, expectedModel);
}
@Test
@@ -88,24 +97,24 @@ public void execute_filteredList_success() {
Person personInFilteredList = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
Person editedPerson = new PersonBuilder(personInFilteredList).withName(VALID_NAME_BOB).build();
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
- new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
+ PersonEditCommand personEditCommand = new PersonEditCommand(INDEX_FIRST_PERSON,
+ new PersonEditDescriptorBuilder().withName(VALID_NAME_BOB).build());
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(PersonEditExecutor.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
- assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(personEditCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_duplicatePersonUnfilteredList_failure() {
Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(firstPerson).build();
- EditCommand editCommand = new EditCommand(INDEX_SECOND_PERSON, descriptor);
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder(firstPerson).build();
+ PersonEditCommand personEditCommand = new PersonEditCommand(INDEX_SECOND_PERSON, descriptor);
- assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
+ assertExecuteFailure(personEditCommand, model, PersonEditExecutor.MESSAGE_DUPLICATE_PERSON);
}
@Test
@@ -114,19 +123,19 @@ public void execute_duplicatePersonFilteredList_failure() {
// edit person in filtered list into a duplicate in address book
Person personInList = model.getAddressBook().getPersonList().get(INDEX_SECOND_PERSON.getZeroBased());
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
- new EditPersonDescriptorBuilder(personInList).build());
+ PersonEditCommand personEditCommand = new PersonEditCommand(INDEX_FIRST_PERSON,
+ new PersonEditDescriptorBuilder(personInList).build());
- assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
+ assertExecuteFailure(personEditCommand, model, PersonEditExecutor.MESSAGE_DUPLICATE_PERSON);
}
@Test
public void execute_invalidPersonIndexUnfilteredList_failure() {
Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build();
- EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withName(VALID_NAME_BOB).build();
+ PersonEditCommand personEditCommand = new PersonEditCommand(outOfBoundIndex, descriptor);
- assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertExecuteFailure(personEditCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
/**
@@ -140,19 +149,20 @@ public void execute_invalidPersonIndexFilteredList_failure() {
// ensures that outOfBoundIndex is still in bounds of address book list
assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
- EditCommand editCommand = new EditCommand(outOfBoundIndex,
- new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
+ PersonEditCommand personEditCommand = new PersonEditCommand(outOfBoundIndex,
+ new PersonEditDescriptorBuilder().withName(VALID_NAME_BOB).build());
- assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertExecuteFailure(personEditCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
@Test
public void equals() {
- final EditCommand standardCommand = new EditCommand(INDEX_FIRST_PERSON, DESC_AMY);
+ final PersonEditCommand standardCommand = new PersonEditCommand(INDEX_FIRST_PERSON, DESC_AMY);
// same values -> returns true
- EditPersonDescriptor copyDescriptor = new EditPersonDescriptor(DESC_AMY);
- EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_PERSON, copyDescriptor);
+ PersonEditDescriptor copyDescriptor = new PersonEditDescriptor(DESC_AMY);
+ PersonEditCommand
+ commandWithSameValues = new PersonEditCommand(INDEX_FIRST_PERSON, copyDescriptor);
assertEquals(standardCommand, commandWithSameValues);
// same object -> returns true
@@ -165,10 +175,10 @@ public void equals() {
assertNotEquals(standardCommand, new ClearCommand());
// different index -> returns false
- assertNotEquals(standardCommand, new EditCommand(INDEX_SECOND_PERSON, DESC_AMY));
+ assertNotEquals(standardCommand, new PersonEditCommand(INDEX_SECOND_PERSON, DESC_AMY));
// different descriptor -> returns false
- assertNotEquals(standardCommand, new EditCommand(INDEX_FIRST_PERSON, DESC_BOB));
+ assertNotEquals(standardCommand, new PersonEditCommand(INDEX_FIRST_PERSON, DESC_BOB));
}
}
diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/PersonEditDescriptorTest.java
similarity index 72%
rename from src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
rename to src/test/java/seedu/address/logic/commands/PersonEditDescriptorTest.java
index ad307ed473d..0720bcd2708 100644
--- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
+++ b/src/test/java/seedu/address/logic/commands/PersonEditDescriptorTest.java
@@ -11,15 +11,15 @@
import org.junit.jupiter.api.Test;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
+import seedu.address.logic.executors.person.PersonEditExecutor.PersonEditDescriptor;
+import seedu.address.testutil.PersonEditDescriptorBuilder;
-public class EditPersonDescriptorTest {
+public class PersonEditDescriptorTest {
@Test
public void equals() {
// same values -> returns true
- EditPersonDescriptor descriptorWithSameValues = new EditPersonDescriptor(DESC_AMY);
+ PersonEditDescriptor descriptorWithSameValues = new PersonEditDescriptor(DESC_AMY);
assertEquals(DESC_AMY, descriptorWithSameValues);
// same object -> returns true
@@ -35,19 +35,20 @@ public void equals() {
assertNotEquals(DESC_AMY, DESC_BOB);
// different name -> returns false
- EditPersonDescriptor editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build();
+ PersonEditDescriptor
+ editedAmy = new PersonEditDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build();
assertNotEquals(DESC_AMY, editedAmy);
// different phone -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build();
+ editedAmy = new PersonEditDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build();
assertNotEquals(DESC_AMY, editedAmy);
// different email -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withEmail(VALID_EMAIL_BOB).build();
+ editedAmy = new PersonEditDescriptorBuilder(DESC_AMY).withEmail(VALID_EMAIL_BOB).build();
assertNotEquals(DESC_AMY, editedAmy);
// different tags -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build();
+ editedAmy = new PersonEditDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build();
assertNotEquals(DESC_AMY, editedAmy);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/NoteCommandTest.java b/src/test/java/seedu/address/logic/commands/PersonNoteCommandTest.java
similarity index 64%
rename from src/test/java/seedu/address/logic/commands/NoteCommandTest.java
rename to src/test/java/seedu/address/logic/commands/PersonNoteCommandTest.java
index d1a37dc4544..72f96ae1219 100644
--- a/src/test/java/seedu/address/logic/commands/NoteCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/PersonNoteCommandTest.java
@@ -6,17 +6,20 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static seedu.address.logic.commands.CommandTestUtil.VALID_NOTE_AMY;
import static seedu.address.logic.commands.CommandTestUtil.VALID_NOTE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.assertExecuteFailure;
import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.person.PersonNoteCommand;
+import seedu.address.logic.executors.Executor;
+import seedu.address.logic.executors.person.PersonNoteExecutor;
import seedu.address.model.AddressBook;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
@@ -25,24 +28,30 @@
import seedu.address.model.person.Person;
import seedu.address.testutil.PersonBuilder;
-public class NoteCommandTest {
+public class PersonNoteCommandTest {
private static final String NOTE_STUB = "Example note.";
private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ @BeforeEach
+ public void setUp() {
+ Executor.setup(model);
+ }
+
@Test
public void execute_addRemarkUnfilteredList_success() {
Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
Person editedPerson = new PersonBuilder(firstPerson).withNote(NOTE_STUB).build();
- NoteCommand remarkCommand = new NoteCommand(INDEX_FIRST_PERSON, new Note(editedPerson.getNote().value));
+ PersonNoteCommand noteCommand =
+ new PersonNoteCommand(INDEX_FIRST_PERSON, new Note(editedPerson.getNote().value));
- String expectedMessage = String.format(NoteCommand.MESSAGE_ADD_NOTE_SUCCESS, editedPerson);
+ String expectedMessage = String.format(PersonNoteExecutor.MESSAGE_ADD_NOTE_SUCCESS, editedPerson);
Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
expectedModel.setPerson(firstPerson, editedPerson);
- assertCommandSuccess(remarkCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(noteCommand, model, expectedMessage, expectedModel);
}
@Test
@@ -50,15 +59,15 @@ public void execute_deleteRemarkUnfilteredList_success() {
Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
Person editedPerson = new PersonBuilder(firstPerson).withNote("").build();
- NoteCommand remarkCommand = new NoteCommand(INDEX_FIRST_PERSON,
+ PersonNoteCommand noteCommand = new PersonNoteCommand(INDEX_FIRST_PERSON,
new Note(editedPerson.getNote().toString()));
- String expectedMessage = String.format(NoteCommand.MESSAGE_DELETE_NOTE_SUCCESS, editedPerson);
+ String expectedMessage = String.format(PersonNoteExecutor.MESSAGE_DELETE_NOTE_SUCCESS, editedPerson);
Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
expectedModel.setPerson(firstPerson, editedPerson);
- assertCommandSuccess(remarkCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(noteCommand, model, expectedMessage, expectedModel);
}
@Test
@@ -69,22 +78,23 @@ public void execute_filteredList_success() {
Person editedPerson = new PersonBuilder(model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased()))
.withNote(NOTE_STUB).build();
- NoteCommand remarkCommand = new NoteCommand(INDEX_FIRST_PERSON, new Note(editedPerson.getNote().value));
+ PersonNoteCommand noteCommand =
+ new PersonNoteCommand(INDEX_FIRST_PERSON, new Note(editedPerson.getNote().value));
- String expectedMessage = String.format(NoteCommand.MESSAGE_ADD_NOTE_SUCCESS, editedPerson);
+ String expectedMessage = String.format(PersonNoteExecutor.MESSAGE_ADD_NOTE_SUCCESS, editedPerson);
Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
expectedModel.setPerson(firstPerson, editedPerson);
- assertCommandSuccess(remarkCommand, model, expectedMessage, expectedModel);
+ CommandTestUtil.assertExecuteSuccess(noteCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_invalidPersonIndexUnfilteredList_failure() {
Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
- NoteCommand remarkCommand = new NoteCommand(outOfBoundIndex, new Note(VALID_NOTE_BOB));
+ PersonNoteCommand noteCommand = new PersonNoteCommand(outOfBoundIndex, new Note(VALID_NOTE_BOB));
- assertCommandFailure(remarkCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertExecuteFailure(noteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
/**
@@ -98,19 +108,17 @@ public void execute_invalidPersonIndexFilteredList_failure() {
// ensures that outOfBoundIndex is still in bounds of address book list
assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
- NoteCommand remarkCommand = new NoteCommand(outOfBoundIndex, new Note(VALID_NOTE_BOB));
+ PersonNoteCommand noteCommand = new PersonNoteCommand(outOfBoundIndex, new Note(VALID_NOTE_BOB));
- assertCommandFailure(remarkCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertExecuteFailure(noteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
@Test
public void equals() {
- final NoteCommand standardCommand = new NoteCommand(INDEX_FIRST_PERSON,
- new Note(VALID_NOTE_AMY));
+ final PersonNoteCommand standardCommand = new PersonNoteCommand(INDEX_FIRST_PERSON, new Note(VALID_NOTE_AMY));
// same values -> returns true
- NoteCommand commandWithSameValues = new NoteCommand(INDEX_FIRST_PERSON,
- new Note(VALID_NOTE_AMY));
+ PersonNoteCommand commandWithSameValues = new PersonNoteCommand(INDEX_FIRST_PERSON, new Note(VALID_NOTE_AMY));
assertEquals(standardCommand, commandWithSameValues);
// same object -> returns true
@@ -123,11 +131,9 @@ public void equals() {
assertNotEquals(standardCommand, new ClearCommand());
// different index -> returns false
- assertNotEquals(standardCommand, new NoteCommand(INDEX_SECOND_PERSON,
- new Note(VALID_NOTE_AMY)));
+ assertNotEquals(standardCommand, new PersonNoteCommand(INDEX_SECOND_PERSON, new Note(VALID_NOTE_AMY)));
// different remark -> returns false
- assertNotEquals(standardCommand, new NoteCommand(INDEX_FIRST_PERSON,
- new Note(VALID_NOTE_BOB)));
+ assertNotEquals(standardCommand, new PersonNoteCommand(INDEX_FIRST_PERSON, new Note(VALID_NOTE_BOB)));
}
}
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
index 8e980219fd2..2c719130fac 100644
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -13,33 +13,32 @@
import org.junit.jupiter.api.Test;
-import seedu.address.logic.commands.AddCommand;
import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
import seedu.address.logic.commands.ExitCommand;
import seedu.address.logic.commands.FindCommand;
import seedu.address.logic.commands.HelpCommand;
import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.NoteCommand;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.commands.person.PersonDeleteCommand;
+import seedu.address.logic.commands.person.PersonEditCommand;
+import seedu.address.logic.commands.person.PersonNoteCommand;
+import seedu.address.logic.executors.person.PersonEditExecutor.PersonEditDescriptor;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.person.NameContainsKeywordsPredicate;
import seedu.address.model.person.Note;
import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
import seedu.address.testutil.PersonBuilder;
+import seedu.address.testutil.PersonEditDescriptorBuilder;
import seedu.address.testutil.PersonUtil;
public class AddressBookParserTest {
-
private final AddressBookParser parser = new AddressBookParser();
@Test
public void parseCommand_add() throws Exception {
Person person = new PersonBuilder().build();
- AddCommand command = (AddCommand) parser.parseCommand(PersonUtil.getAddCommand(person));
- assertEquals(new AddCommand(person), command);
+ PersonCreateCommand command = (PersonCreateCommand) parser.parseCommand(PersonUtil.getAddCommand(person));
+ assertEquals(new PersonCreateCommand(null, person), command);
}
@Test
@@ -50,18 +49,19 @@ public void parseCommand_clear() throws Exception {
@Test
public void parseCommand_delete() throws Exception {
- DeleteCommand command = (DeleteCommand) parser.parseCommand(
- DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
- assertEquals(new DeleteCommand(INDEX_FIRST_PERSON), command);
+ PersonDeleteCommand command = (PersonDeleteCommand) parser.parseCommand(
+ PersonDeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
+ assertEquals(new PersonDeleteCommand(INDEX_FIRST_PERSON), command);
}
@Test
public void parseCommand_edit() throws Exception {
Person person = new PersonBuilder().build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build();
- EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder(person).build();
+ PersonEditCommand
+ command = (PersonEditCommand) parser.parseCommand(PersonEditCommand.COMMAND_WORD + " "
+ INDEX_FIRST_PERSON.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor));
- assertEquals(new EditCommand(INDEX_FIRST_PERSON, descriptor), command);
+ assertEquals(new PersonEditCommand(INDEX_FIRST_PERSON, descriptor), command);
}
@Test
@@ -92,12 +92,14 @@ public void parseCommand_list() throws Exception {
@Test
public void parseCommand_note() throws Exception {
- final Note note = new Note("Test note.");
- NoteCommand command = (NoteCommand) parser.parseCommand(NoteCommand.COMMAND_WORD + " "
+ Note note = new Note("Test note.");
+ PersonNoteCommand
+ command = (PersonNoteCommand) parser.parseCommand(PersonNoteCommand.COMMAND_WORD + " "
+ INDEX_FIRST_PERSON.getOneBased() + " " + PREFIX_NOTE + note.value);
- assertEquals(new NoteCommand(INDEX_FIRST_PERSON, note), command);
+ assertEquals(new PersonNoteCommand(INDEX_FIRST_PERSON, note), command);
}
+ // @formatter:off
@Test
public void parseCommand_unrecognisedInput_throwsParseException() {
assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), ()
diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
index f9f5a4a9712..74a53d03492 100644
--- a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
+++ b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
@@ -39,6 +39,7 @@ public void parseIndex_invalidInput_throwsParseException() {
assertThrows(ParseException.class, () -> ParserUtil.parseIndex("10 a"));
}
+ // @formatter:off
@Test
public void parseIndex_outOfRangeInput_throwsParseException() {
assertThrows(ParseException.class, MESSAGE_INVALID_INDEX, ()
diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/PersonCreateCommandParserTest.java
similarity index 81%
rename from src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
rename to src/test/java/seedu/address/logic/parser/PersonCreateCommandParserTest.java
index 519a5948a8d..ff51ddcabcf 100644
--- a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/PersonCreateCommandParserTest.java
@@ -27,7 +27,9 @@
import org.junit.jupiter.api.Test;
-import seedu.address.logic.commands.AddCommand;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.logic.parser.person.PersonCreateCommandParser;
import seedu.address.model.person.Email;
import seedu.address.model.person.Name;
import seedu.address.model.person.Person;
@@ -35,47 +37,47 @@
import seedu.address.model.tag.Tag;
import seedu.address.testutil.PersonBuilder;
-public class AddCommandParserTest {
- private final AddCommandParser parser = new AddCommandParser();
+public class PersonCreateCommandParserTest {
+ private final PersonCreateCommandParser parser = new PersonCreateCommandParser();
@Test
- public void parse_allFieldsPresent_success() {
+ public void parse_allFieldsPresent_success() throws ParseException {
Person expectedPerson = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND).build();
// whitespace only preamble
assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ + TAG_DESC_FRIEND, new PersonCreateCommand(null, expectedPerson));
// multiple names - last name accepted
assertParseSuccess(parser, NAME_DESC_AMY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ + TAG_DESC_FRIEND, new PersonCreateCommand(null, expectedPerson));
// multiple phones - last phone accepted
assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_AMY + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ + TAG_DESC_FRIEND, new PersonCreateCommand(null, expectedPerson));
// multiple emails - last email accepted
assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_AMY + EMAIL_DESC_BOB
- + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ + TAG_DESC_FRIEND, new PersonCreateCommand(null, expectedPerson));
// multiple tags - all accepted
Person expectedPersonMultipleTags = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
.build();
assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + TAG_DESC_HUSBAND
- + TAG_DESC_FRIEND, new AddCommand(expectedPersonMultipleTags));
+ + TAG_DESC_FRIEND, new PersonCreateCommand(null, expectedPersonMultipleTags));
}
@Test
- public void parse_optionalFieldsMissing_success() {
+ public void parse_optionalFieldsMissing_success() throws ParseException {
// zero tags
Person expectedPerson = new PersonBuilder(AMY).withTags().build();
assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY,
- new AddCommand(expectedPerson));
+ new PersonCreateCommand(null, expectedPerson));
}
@Test
public void parse_compulsoryFieldMissing_failure() {
- String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, PersonCreateCommand.MESSAGE_USAGE);
// missing name prefix
assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB, expectedMessage);
@@ -114,7 +116,7 @@ public void parse_invalidValue_failure() {
// non-empty preamble
assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
- String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
+ + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, PersonCreateCommand.MESSAGE_USAGE));
}
}
diff --git a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java b/src/test/java/seedu/address/logic/parser/PersonDeleteCommandParserTest.java
similarity index 65%
rename from src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
rename to src/test/java/seedu/address/logic/parser/PersonDeleteCommandParserTest.java
index 224252d7e81..3733a6075b8 100644
--- a/src/test/java/seedu/address/logic/parser/DeleteCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/PersonDeleteCommandParserTest.java
@@ -7,7 +7,8 @@
import org.junit.jupiter.api.Test;
-import seedu.address.logic.commands.DeleteCommand;
+import seedu.address.logic.commands.person.PersonDeleteCommand;
+import seedu.address.logic.parser.person.PersonDeleteCommandParser;
/**
* As we are only doing white-box testing, our test cases do not cover path variations
@@ -16,17 +17,17 @@
* The path variation for those two cases occur inside the ParserUtil, and
* therefore should be covered by the ParserUtilTest.
*/
-public class DeleteCommandParserTest {
-
- private final DeleteCommandParser parser = new DeleteCommandParser();
+public class PersonDeleteCommandParserTest {
+ private final PersonDeleteCommandParser parser = new PersonDeleteCommandParser();
@Test
public void parse_validArgs_returnsDeleteCommand() {
- assertParseSuccess(parser, "1", new DeleteCommand(INDEX_FIRST_PERSON));
+ assertParseSuccess(parser, "1", new PersonDeleteCommand(INDEX_FIRST_PERSON));
}
@Test
public void parse_invalidArgs_throwsParseException() {
- assertParseFailure(parser, "a", String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
+ assertParseFailure(parser, "delete a",
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, PersonDeleteCommand.MESSAGE_USAGE));
}
}
diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/PersonEditCommandParserTest.java
similarity index 79%
rename from src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
rename to src/test/java/seedu/address/logic/parser/PersonEditCommandParserTest.java
index 690b79ab71f..4eb9125f958 100644
--- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/PersonEditCommandParserTest.java
@@ -29,22 +29,23 @@
import org.junit.jupiter.api.Test;
import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
+import seedu.address.logic.commands.person.PersonEditCommand;
+import seedu.address.logic.executors.person.PersonEditExecutor.PersonEditDescriptor;
+import seedu.address.logic.parser.person.PersonEditCommandParser;
import seedu.address.model.person.Email;
import seedu.address.model.person.Name;
import seedu.address.model.person.Phone;
import seedu.address.model.tag.Tag;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
+import seedu.address.testutil.PersonEditDescriptorBuilder;
-public class EditCommandParserTest {
+public class PersonEditCommandParserTest {
private static final String TAG_EMPTY = " " + PREFIX_TAG;
private static final String MESSAGE_INVALID_FORMAT =
- String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE);
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, PersonEditCommand.MESSAGE_USAGE);
- private final EditCommandParser parser = new EditCommandParser();
+ private final PersonEditCommandParser parser = new PersonEditCommandParser();
@Test
public void parse_missingParts_failure() {
@@ -52,7 +53,7 @@ public void parse_missingParts_failure() {
assertParseFailure(parser, VALID_NAME_AMY, MESSAGE_INVALID_FORMAT);
// no field specified
- assertParseFailure(parser, "1", EditCommand.MESSAGE_NOT_EDITED);
+ assertParseFailure(parser, "1", PersonEditCommand.MESSAGE_NOT_EDITED);
// no index and no field specified
assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
@@ -104,10 +105,10 @@ public void parse_allFieldsSpecified_success() {
String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND
+ EMAIL_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withName(VALID_NAME_AMY)
.withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY)
.withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ PersonEditCommand expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@@ -117,38 +118,39 @@ public void parse_someFieldsSpecified_success() {
Index targetIndex = INDEX_FIRST_PERSON;
String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + EMAIL_DESC_AMY;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withPhone(VALID_PHONE_BOB)
.withEmail(VALID_EMAIL_AMY).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ PersonEditCommand expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@Test
public void parse_oneFieldSpecified_success() {
- // name
Index targetIndex = INDEX_THIRD_PERSON;
+
+ // name
String userInput = targetIndex.getOneBased() + NAME_DESC_AMY;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withName(VALID_NAME_AMY).build();
+ PersonEditCommand expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
// phone
userInput = targetIndex.getOneBased() + PHONE_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ descriptor = new PersonEditDescriptorBuilder().withPhone(VALID_PHONE_AMY).build();
+ expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
// email
userInput = targetIndex.getOneBased() + EMAIL_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withEmail(VALID_EMAIL_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ descriptor = new PersonEditDescriptorBuilder().withEmail(VALID_EMAIL_AMY).build();
+ expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
// tags
userInput = targetIndex.getOneBased() + TAG_DESC_FRIEND;
- descriptor = new EditPersonDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ descriptor = new PersonEditDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
+ expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@@ -159,27 +161,28 @@ public void parse_multipleRepeatedFields_acceptsLast() {
+ PHONE_DESC_AMY + EMAIL_DESC_AMY + TAG_DESC_FRIEND + PHONE_DESC_BOB + EMAIL_DESC_BOB
+ TAG_DESC_HUSBAND;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withPhone(VALID_PHONE_BOB)
.withEmail(VALID_EMAIL_BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
.build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ PersonEditCommand expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@Test
public void parse_invalidValueFollowedByValidValue_success() {
- // no other valid values specified
Index targetIndex = INDEX_FIRST_PERSON;
+
+ // no other valid values specified
String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + PHONE_DESC_BOB;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withPhone(VALID_PHONE_BOB).build();
+ PersonEditCommand expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
// other valid values specified
userInput = targetIndex.getOneBased() + EMAIL_DESC_BOB + INVALID_PHONE_DESC + PHONE_DESC_BOB;
- descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ descriptor = new PersonEditDescriptorBuilder().withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).build();
+ expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@@ -188,8 +191,8 @@ public void parse_resetTags_success() {
Index targetIndex = INDEX_THIRD_PERSON;
String userInput = targetIndex.getOneBased() + TAG_EMPTY;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withTags().build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ PersonEditDescriptor descriptor = new PersonEditDescriptorBuilder().withTags().build();
+ PersonEditCommand expectedCommand = new PersonEditCommand(targetIndex, descriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
diff --git a/src/test/java/seedu/address/logic/parser/NoteCommandParserTest.java b/src/test/java/seedu/address/logic/parser/PersonNoteCommandParserTest.java
similarity index 66%
rename from src/test/java/seedu/address/logic/parser/NoteCommandParserTest.java
rename to src/test/java/seedu/address/logic/parser/PersonNoteCommandParserTest.java
index b747f9976fa..3c8c8f15622 100644
--- a/src/test/java/seedu/address/logic/parser/NoteCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/PersonNoteCommandParserTest.java
@@ -7,24 +7,26 @@
import org.junit.jupiter.api.Test;
import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.NoteCommand;
+import seedu.address.logic.commands.person.PersonNoteCommand;
+import seedu.address.logic.parser.person.PersonNoteCommandParser;
import seedu.address.model.person.Note;
-public class NoteCommandParserTest {
- private final NoteCommandParser parser = new NoteCommandParser();
+public class PersonNoteCommandParserTest {
+ private final PersonNoteCommandParser parser = new PersonNoteCommandParser();
private final String nonEmptyNote = "Test note.";
@Test
public void parse_indexSpecified_success() {
- // have remark
Index targetIndex = INDEX_FIRST_PERSON;
+
+ // have remark
String userInput = targetIndex.getOneBased() + " " + PREFIX_NOTE + nonEmptyNote;
- NoteCommand expectedCommand = new NoteCommand(INDEX_FIRST_PERSON, new Note(nonEmptyNote));
+ PersonNoteCommand expectedCommand = new PersonNoteCommand(targetIndex, new Note(nonEmptyNote));
assertParseSuccess(parser, userInput, expectedCommand);
// no remark
userInput = targetIndex.getOneBased() + " " + PREFIX_NOTE;
- expectedCommand = new NoteCommand(INDEX_FIRST_PERSON, new Note(""));
+ expectedCommand = new PersonNoteCommand(targetIndex, new Note(""));
assertParseSuccess(parser, userInput, expectedCommand);
}
}
diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
index 07d3de514d7..09e600e22d4 100644
--- a/src/test/java/seedu/address/model/AddressBookTest.java
+++ b/src/test/java/seedu/address/model/AddressBookTest.java
@@ -8,6 +8,7 @@
import static seedu.address.testutil.TypicalPersons.ALICE;
import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -17,8 +18,9 @@
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
+import seedu.address.model.exceptions.DuplicateItemException;
+import seedu.address.model.group.Group;
import seedu.address.model.person.Person;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
import seedu.address.testutil.PersonBuilder;
public class AddressBookTest {
@@ -48,9 +50,10 @@ public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
Person editedAlice = new PersonBuilder(ALICE).withTags(VALID_TAG_HUSBAND)
.build();
List newPersons = Arrays.asList(ALICE, editedAlice);
- AddressBookStub newData = new AddressBookStub(newPersons);
+ List newGroups = new ArrayList<>();
+ AddressBookStub newData = new AddressBookStub(newPersons, newGroups);
- assertThrows(DuplicatePersonException.class, () -> addressBook.resetData(newData));
+ assertThrows(DuplicateItemException.class, () -> addressBook.resetData(newData));
}
@Test
@@ -87,8 +90,9 @@ public void getPersonList_modifyList_throwsUnsupportedOperationException() {
*/
private static class AddressBookStub implements ReadOnlyAddressBook {
private final ObservableList persons = FXCollections.observableArrayList();
+ private final ObservableList groups = FXCollections.observableArrayList();
- AddressBookStub(Collection persons) {
+ AddressBookStub(Collection persons, Collection groups) {
this.persons.setAll(persons);
}
@@ -96,6 +100,11 @@ private static class AddressBookStub implements ReadOnlyAddressBook {
public ObservableList getPersonList() {
return persons;
}
+
+ @Override
+ public ObservableList getGroupList() {
+ return groups;
+ }
}
}
diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/seedu/address/model/ModelManagerTest.java
index 5c62826d0aa..f864437db71 100644
--- a/src/test/java/seedu/address/model/ModelManagerTest.java
+++ b/src/test/java/seedu/address/model/ModelManagerTest.java
@@ -85,7 +85,7 @@ public void hasPerson_personNotInAddressBook_returnsFalse() {
@Test
public void hasPerson_personInAddressBook_returnsTrue() {
- modelManager.addPerson(ALICE);
+ modelManager.createPerson(ALICE);
assertTrue(modelManager.hasPerson(ALICE));
}
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
index 0504613109c..578c4f79c11 100644
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ b/src/test/java/seedu/address/model/person/PersonTest.java
@@ -25,30 +25,30 @@ public void asObservableList_modifyList_throwsUnsupportedOperationException() {
}
@Test
- public void isSamePerson() {
+ public void isSame() {
// same object -> returns true
- assertTrue(ALICE.isSamePerson(ALICE));
+ assertTrue(ALICE.isSame(ALICE));
// null -> returns false
- assertFalse(ALICE.isSamePerson(null));
+ assertFalse(ALICE.isSame(null));
// same name, all other attributes different -> returns true
Person editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
.withTags(VALID_TAG_HUSBAND).build();
- assertTrue(ALICE.isSamePerson(editedAlice));
+ assertTrue(ALICE.isSame(editedAlice));
// different name, all other attributes same -> returns false
editedAlice = new PersonBuilder(ALICE).withName(VALID_NAME_BOB).build();
- assertFalse(ALICE.isSamePerson(editedAlice));
+ assertFalse(ALICE.isSame(editedAlice));
// name differs in case, all other attributes same -> returns false
Person editedBob = new PersonBuilder(BOB).withName(VALID_NAME_BOB.toLowerCase()).build();
- assertFalse(BOB.isSamePerson(editedBob));
+ assertFalse(BOB.isSame(editedBob));
// name has trailing spaces, all other attributes same -> returns false
String nameWithTrailingSpaces = VALID_NAME_BOB + " ";
editedBob = new PersonBuilder(BOB).withName(nameWithTrailingSpaces).build();
- assertFalse(BOB.isSamePerson(editedBob));
+ assertFalse(BOB.isSame(editedBob));
}
@Test
diff --git a/src/test/java/seedu/address/model/person/UniquePersonListTest.java b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
index f77f547b007..edb3da7959a 100644
--- a/src/test/java/seedu/address/model/person/UniquePersonListTest.java
+++ b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
@@ -14,13 +14,14 @@
import org.junit.jupiter.api.Test;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
+import seedu.address.model.exceptions.DuplicateItemException;
+import seedu.address.model.exceptions.ItemNotFoundException;
+import seedu.address.model.util.UniqueList;
import seedu.address.testutil.PersonBuilder;
public class UniquePersonListTest {
- private final UniquePersonList uniquePersonList = new UniquePersonList();
+ private final UniqueList uniquePersonList = new UniqueList<>();
@Test
public void contains_nullPerson_throwsNullPointerException() {
@@ -53,29 +54,29 @@ public void add_nullPerson_throwsNullPointerException() {
@Test
public void add_duplicatePerson_throwsDuplicatePersonException() {
uniquePersonList.add(ALICE);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.add(ALICE));
+ assertThrows(DuplicateItemException.class, () -> uniquePersonList.add(ALICE));
}
@Test
public void setPerson_nullTargetPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPerson(null, ALICE));
+ assertThrows(NullPointerException.class, () -> uniquePersonList.setItem(null, ALICE));
}
@Test
public void setPerson_nullEditedPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPerson(ALICE, null));
+ assertThrows(NullPointerException.class, () -> uniquePersonList.setItem(ALICE, null));
}
@Test
public void setPerson_targetPersonNotInList_throwsPersonNotFoundException() {
- assertThrows(PersonNotFoundException.class, () -> uniquePersonList.setPerson(ALICE, ALICE));
+ assertThrows(ItemNotFoundException.class, () -> uniquePersonList.setItem(ALICE, ALICE));
}
@Test
public void setPerson_editedPersonIsSamePerson_success() {
uniquePersonList.add(ALICE);
- uniquePersonList.setPerson(ALICE, ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
+ uniquePersonList.setItem(ALICE, ALICE);
+ UniqueList expectedUniquePersonList = new UniqueList<>();
expectedUniquePersonList.add(ALICE);
assertEquals(expectedUniquePersonList, uniquePersonList);
}
@@ -84,8 +85,8 @@ public void setPerson_editedPersonIsSamePerson_success() {
public void setPerson_editedPersonHasSameIdentity_success() {
uniquePersonList.add(ALICE);
Person editedAlice = new PersonBuilder(ALICE).withTags(VALID_TAG_HUSBAND).build();
- uniquePersonList.setPerson(ALICE, editedAlice);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
+ uniquePersonList.setItem(ALICE, editedAlice);
+ UniqueList expectedUniquePersonList = new UniqueList<>();
expectedUniquePersonList.add(editedAlice);
assertEquals(expectedUniquePersonList, uniquePersonList);
}
@@ -93,8 +94,8 @@ public void setPerson_editedPersonHasSameIdentity_success() {
@Test
public void setPerson_editedPersonHasDifferentIdentity_success() {
uniquePersonList.add(ALICE);
- uniquePersonList.setPerson(ALICE, BOB);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
+ uniquePersonList.setItem(ALICE, BOB);
+ UniqueList expectedUniquePersonList = new UniqueList<>();
expectedUniquePersonList.add(BOB);
assertEquals(expectedUniquePersonList, uniquePersonList);
}
@@ -103,7 +104,7 @@ public void setPerson_editedPersonHasDifferentIdentity_success() {
public void setPerson_editedPersonHasNonUniqueIdentity_throwsDuplicatePersonException() {
uniquePersonList.add(ALICE);
uniquePersonList.add(BOB);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.setPerson(ALICE, BOB));
+ assertThrows(DuplicateItemException.class, () -> uniquePersonList.setItem(ALICE, BOB));
}
@Test
@@ -113,42 +114,42 @@ public void remove_nullPerson_throwsNullPointerException() {
@Test
public void remove_personDoesNotExist_throwsPersonNotFoundException() {
- assertThrows(PersonNotFoundException.class, () -> uniquePersonList.remove(ALICE));
+ assertThrows(ItemNotFoundException.class, () -> uniquePersonList.remove(ALICE));
}
@Test
public void remove_existingPerson_removesPerson() {
uniquePersonList.add(ALICE);
uniquePersonList.remove(ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
+ UniqueList expectedUniquePersonList = new UniqueList<>();
assertEquals(expectedUniquePersonList, uniquePersonList);
}
@Test
public void setPersons_nullUniquePersonList_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPersons((UniquePersonList) null));
+ assertThrows(NullPointerException.class, () -> uniquePersonList.setItems((UniqueList) null));
}
@Test
public void setPersons_uniquePersonList_replacesOwnListWithProvidedUniquePersonList() {
uniquePersonList.add(ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
+ UniqueList expectedUniquePersonList = new UniqueList<>();
expectedUniquePersonList.add(BOB);
- uniquePersonList.setPersons(expectedUniquePersonList);
+ uniquePersonList.setItems(expectedUniquePersonList);
assertEquals(expectedUniquePersonList, uniquePersonList);
}
@Test
public void setPersons_nullList_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPersons((List) null));
+ assertThrows(NullPointerException.class, () -> uniquePersonList.setItems((List) null));
}
@Test
public void setPersons_list_replacesOwnListWithProvidedList() {
uniquePersonList.add(ALICE);
List personList = Collections.singletonList(BOB);
- uniquePersonList.setPersons(personList);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
+ uniquePersonList.setItems(personList);
+ UniqueList expectedUniquePersonList = new UniqueList<>();
expectedUniquePersonList.add(BOB);
assertEquals(expectedUniquePersonList, uniquePersonList);
}
@@ -156,9 +157,10 @@ public void setPersons_list_replacesOwnListWithProvidedList() {
@Test
public void setPersons_listWithDuplicatePersons_throwsDuplicatePersonException() {
List listWithDuplicatePersons = Arrays.asList(ALICE, ALICE);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.setPersons(listWithDuplicatePersons));
+ assertThrows(DuplicateItemException.class, () -> uniquePersonList.setItems(listWithDuplicatePersons));
}
+ // @formatter:off
@Test
public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
assertThrows(UnsupportedOperationException.class, ()
diff --git a/src/test/java/seedu/address/testutil/AddressBookBuilder.java b/src/test/java/seedu/address/testutil/AddressBookBuilder.java
index 822472302d3..08fd74654af 100644
--- a/src/test/java/seedu/address/testutil/AddressBookBuilder.java
+++ b/src/test/java/seedu/address/testutil/AddressBookBuilder.java
@@ -6,7 +6,7 @@
/**
* A utility class to help with building Addressbook objects.
* Example usage:
- * {@code AddressBook ab = new AddressBookBuilder().withPerson("John", "Doe").build();}
+ * {@code AddressBook ab = new AddressBookBuilder().withPerson("John", "Doe").build();}
*/
public class AddressBookBuilder {
diff --git a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java b/src/test/java/seedu/address/testutil/PersonEditDescriptorBuilder.java
similarity index 67%
rename from src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
rename to src/test/java/seedu/address/testutil/PersonEditDescriptorBuilder.java
index 1f99635b3c4..d75ddb8e4a9 100644
--- a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
+++ b/src/test/java/seedu/address/testutil/PersonEditDescriptorBuilder.java
@@ -4,7 +4,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
+import seedu.address.logic.executors.person.PersonEditExecutor.PersonEditDescriptor;
import seedu.address.model.person.Email;
import seedu.address.model.person.Name;
import seedu.address.model.person.Person;
@@ -14,23 +14,23 @@
/**
* A utility class to help with building EditPersonDescriptor objects.
*/
-public class EditPersonDescriptorBuilder {
+public class PersonEditDescriptorBuilder {
- private final EditPersonDescriptor descriptor;
+ private final PersonEditDescriptor descriptor;
- public EditPersonDescriptorBuilder() {
- descriptor = new EditPersonDescriptor();
+ public PersonEditDescriptorBuilder() {
+ descriptor = new PersonEditDescriptor();
}
- public EditPersonDescriptorBuilder(EditPersonDescriptor descriptor) {
- this.descriptor = new EditPersonDescriptor(descriptor);
+ public PersonEditDescriptorBuilder(PersonEditDescriptor descriptor) {
+ this.descriptor = new PersonEditDescriptor(descriptor);
}
/**
* Returns an {@code EditPersonDescriptor} with fields containing {@code person}'s details
*/
- public EditPersonDescriptorBuilder(Person person) {
- descriptor = new EditPersonDescriptor();
+ public PersonEditDescriptorBuilder(Person person) {
+ descriptor = new PersonEditDescriptor();
descriptor.setName(person.getName());
descriptor.setPhone(person.getPhone());
descriptor.setEmail(person.getEmail());
@@ -41,7 +41,7 @@ public EditPersonDescriptorBuilder(Person person) {
/**
* Sets the {@code Name} of the {@code EditPersonDescriptor} that we are building.
*/
- public EditPersonDescriptorBuilder withName(String name) {
+ public PersonEditDescriptorBuilder withName(String name) {
descriptor.setName(new Name(name));
return this;
}
@@ -49,7 +49,7 @@ public EditPersonDescriptorBuilder withName(String name) {
/**
* Sets the {@code Phone} of the {@code EditPersonDescriptor} that we are building.
*/
- public EditPersonDescriptorBuilder withPhone(String phone) {
+ public PersonEditDescriptorBuilder withPhone(String phone) {
descriptor.setPhone(new Phone(phone));
return this;
}
@@ -57,7 +57,7 @@ public EditPersonDescriptorBuilder withPhone(String phone) {
/**
* Sets the {@code Email} of the {@code EditPersonDescriptor} that we are building.
*/
- public EditPersonDescriptorBuilder withEmail(String email) {
+ public PersonEditDescriptorBuilder withEmail(String email) {
descriptor.setEmail(new Email(email));
return this;
}
@@ -66,13 +66,13 @@ public EditPersonDescriptorBuilder withEmail(String email) {
* Parses the {@code tags} into a {@code Set} and set it to the {@code EditPersonDescriptor}
* that we are building.
*/
- public EditPersonDescriptorBuilder withTags(String... tags) {
+ public PersonEditDescriptorBuilder withTags(String... tags) {
Set tagSet = Stream.of(tags).map(Tag::new).collect(Collectors.toSet());
descriptor.setTags(tagSet);
return this;
}
- public EditPersonDescriptor build() {
+ public PersonEditDescriptor build() {
return descriptor;
}
}
diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/seedu/address/testutil/PersonUtil.java
index e062c3405d8..b5dfb02c0d1 100644
--- a/src/test/java/seedu/address/testutil/PersonUtil.java
+++ b/src/test/java/seedu/address/testutil/PersonUtil.java
@@ -7,8 +7,8 @@
import java.util.Set;
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
+import seedu.address.logic.commands.person.PersonCreateCommand;
+import seedu.address.logic.executors.person.PersonEditExecutor;
import seedu.address.model.person.Person;
import seedu.address.model.tag.Tag;
@@ -21,11 +21,12 @@ public class PersonUtil {
* Returns an add command string for adding the {@code person}.
*/
public static String getAddCommand(Person person) {
- return AddCommand.COMMAND_WORD + " " + getPersonDetails(person);
+ return PersonCreateCommand.COMMAND_WORD + " " + getPersonDetails(person);
}
/**
* Returns the part of command string for the given {@code person}'s details.
+ * @formatter:off
*/
public static String getPersonDetails(Person person) {
StringBuilder sb = new StringBuilder();
@@ -41,7 +42,7 @@ public static String getPersonDetails(Person person) {
/**
* Returns the part of command string for the given {@code EditPersonDescriptor}'s details.
*/
- public static String getEditPersonDescriptorDetails(EditPersonDescriptor descriptor) {
+ public static String getEditPersonDescriptorDetails(PersonEditExecutor.PersonEditDescriptor descriptor) {
StringBuilder sb = new StringBuilder();
descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
diff --git a/src/test/java/seedu/address/ui/TestFxmlObject.java b/src/test/java/seedu/address/ui/TestFxmlObject.java
index 5ecd82656f2..34685f7e6c4 100644
--- a/src/test/java/seedu/address/ui/TestFxmlObject.java
+++ b/src/test/java/seedu/address/ui/TestFxmlObject.java
@@ -29,7 +29,7 @@ public void setText(String text) {
public boolean equals(Object other) {
return other == this // short circuit if same object
|| (other instanceof TestFxmlObject // instanceof handles nulls
- && text.equals(((TestFxmlObject) other).getText()));
+ && text.equals(((TestFxmlObject) other).getText()));
}
}
diff --git a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
index 151e09ce926..08deefc5583 100644
--- a/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
+++ b/src/test/resources/view/UiPartTest/validFileWithFxRoot.fxml
@@ -1,6 +1,7 @@
+
+ xmlns:fx="http://javafx.com/fxml">
Hello World!