Merge pull request #162 from Lin-Shuang-Shuang/branch-CodeQuality

Improve code quality

src/main/java/seedu/address/logic/commands/AddCommentCommand.java

@@ -12,7 +12,7 @@
 import seedu.address.model.project.Project;
 
 /**
- * Adds a project to the DevPlanPro.
+ * Adds a comment to the DevPlanPro.
  */
 public class AddCommentCommand extends Command {
 
@@ -36,7 +36,7 @@ public class AddCommentCommand extends Command {
     private Comment comment;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an AddCommentCommand to add to the specified {@code Project}
      */
     public AddCommentCommand(Project project, Member member, String comment) {
         requireNonNull(project);

src/main/java/seedu/address/logic/commands/AddPersonCommand.java

@@ -11,7 +11,7 @@
 import seedu.address.model.project.Project;
 
 /**
- * Adds a task to a project.
+ * Adds a person to a project.
  */
 public class AddPersonCommand extends Command {
 
@@ -28,7 +28,7 @@ public class AddPersonCommand extends Command {
     private final Member member;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an AddPersonCommand to add the specified {@code Project}
      */
     public AddPersonCommand(Member member, Project project) {
         requireNonNull(project);

src/main/java/seedu/address/logic/commands/AddProjectCommand.java

@@ -23,7 +23,7 @@ public class AddProjectCommand extends Command {
     private final Project toAdd;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an AddProjectCommand to add the specified {@code Project}
      */
     public AddProjectCommand(Project project) {
         requireNonNull(project);

src/main/java/seedu/address/logic/commands/AddTaskCommand.java

@@ -30,7 +30,7 @@ public class AddTaskCommand extends Command {
     private final Project taskProject;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an AddTaskCommand to add the specified {@code Project}
      */
     public AddTaskCommand(Task task, Project taskProject) {
         requireNonNull(task);

src/main/java/seedu/address/logic/commands/AssignPersonCommand.java

@@ -39,7 +39,7 @@ public class AssignPersonCommand extends Command {
     private final Member member;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an AssignPersonCommand to add the specified {@code Task}
      */
     public AssignPersonCommand(String member, Task task, Project project) {
         requireNonNull(task);

src/main/java/seedu/address/logic/commands/AssignTeamCommand.java

@@ -14,7 +14,7 @@
 import seedu.address.model.project.Project;
 
 /**
- * Adds a task to a project.
+ * Assign a team of members to a project.
  */
 public class AssignTeamCommand extends Command {
 
@@ -32,7 +32,7 @@ public class AssignTeamCommand extends Command {
     private final List<Member> team;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an AssignTeamCommand to add the specified {@code Project}
      */
     public AssignTeamCommand(List<String> team, Project project) {
         requireNonNull(project);

src/main/java/seedu/address/logic/commands/DeletePersonCommand.java

@@ -31,7 +31,7 @@ public class DeletePersonCommand extends Command {
     private final Project memberProject;
 
     /**
-     * Creates a DeleteTaskCommand to delete the specified task in a project
+     * Creates a DeletePersonCommand to delete the specified task in a Project
      */
     public DeletePersonCommand(Member member, Project memberProject) {
         requireNonNull(member);

src/main/java/seedu/address/logic/commands/EditCommand.java

@@ -29,7 +29,7 @@
 import seedu.address.model.tag.Tag;
 
 /**
- * Edits the details of an existing person in the address book.
+ * Edits the details of an existing project in the DevPlanPro.
  */
 public class EditCommand extends Command {
 

src/main/java/seedu/address/logic/commands/EditProjectNameCommand.java

@@ -12,7 +12,7 @@
 
 
 /**
- * Edits the name of an existing project in the address book.
+ * Edits the name of an existing project in the DevPlanPro.
  */
 public class EditProjectNameCommand extends RenameCommand {
 

src/main/java/seedu/address/logic/commands/EditTaskNameCommand.java

@@ -1,12 +1,14 @@
 package seedu.address.logic.commands;
 
 import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.commands.AddTaskCommand.MESSAGE_DUPLICATE_TASK;
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.logic.Messages;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.person.Name;
+import seedu.address.model.person.NameEqualsPredicate;
 import seedu.address.model.project.Project;
 import seedu.address.model.project.Task;
 
@@ -30,7 +32,7 @@ public class EditTaskNameCommand extends RenameCommand {
     private final Task targetTask;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an EditTaskNameCommand to add the specified {@code Task}
      */
     public EditTaskNameCommand(Name newName, Project currentProject, Task currentTask) {
         requireNonNull(newName);
@@ -57,8 +59,18 @@ public CommandResult execute(Model model) throws CommandException {
                     Messages.format(targetTask),
                     Messages.format(targetPerson)));
         }
+        Task duplicateTask = new Task(changeTo.fullName);
+        if (targetPerson.hasTask(duplicateTask)) {
+            throw new CommandException(String.format(
+                    MESSAGE_DUPLICATE_TASK,
+                    Messages.format(duplicateTask),
+                    Messages.format(targetPerson)));
+        }
         Task toBeChanged = targetPerson.findTask(targetTask.getName());
         toBeChanged.setName(changeTo);
+        model.updateCurrentProject(
+                new NameEqualsPredicate(
+                        model.getCurrentProject().get(0).getName().fullName));
         return new CommandResult(String.format(
                 MESSAGE_SUCCESS,
                 Messages.format(targetTask),

src/main/java/seedu/address/logic/commands/SetDeadlineProjectCommand.java

@@ -33,7 +33,7 @@ public class SetDeadlineProjectCommand extends SetDeadlineCommand {
     private final String datePattern = "\\b(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\b \\d{1,2} \\d{4}\\b";
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an SetDeadlineProjectCommand to add the specified {@code Project}
      */
     public SetDeadlineProjectCommand(String deadline, Project project) {
         requireNonNull(project);

src/main/java/seedu/address/logic/commands/SetDeadlineTaskCommand.java

@@ -36,7 +36,7 @@ public class SetDeadlineTaskCommand extends SetDeadlineCommand {
     private final String datePattern = "\\b(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\b \\d{1,2} \\d{4}\\b";
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an SetDeadlineTaskCommand to add the specified {@code Task}
      */
     public SetDeadlineTaskCommand(String deadline, Task task, Project project) {
         requireNonNull(task);

src/main/java/seedu/address/logic/commands/SetProjectCategoryCommand.java

@@ -28,7 +28,7 @@ public class SetProjectCategoryCommand extends Command {
     private final String category;
 
     /**
-     * Creates an SetProjectCategoryCommand to add the specified {@code project}
+     * Creates an SetProjectCategoryCommand to add the specified {@code Project}
      */
 
     public SetProjectCategoryCommand(String categoryName, Project project) {

src/main/java/seedu/address/logic/commands/SetProjectStatusCommand.java

@@ -11,7 +11,7 @@
 import seedu.address.model.project.Project;
 
 /**
- * Adds a task to a project.
+ * Set a status to a project.
  */
 public class SetProjectStatusCommand extends SetStatusCommand {
 
@@ -25,7 +25,7 @@ public class SetProjectStatusCommand extends SetStatusCommand {
     private final Project project;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an SetProjectStatusCommand to add the specified {@code Project}
      */
     public SetProjectStatusCommand(String status, Project project) {
         super(status);

src/main/java/seedu/address/logic/commands/SetStatusCommand.java

@@ -5,7 +5,7 @@
 import seedu.address.commons.util.ToStringBuilder;
 
 /**
- * Adds a status to a task.
+ * Adds a status to a task or project.
  */
 public abstract class SetStatusCommand extends Command {
 
@@ -16,7 +16,7 @@ public abstract class SetStatusCommand extends Command {
     private final String status;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an SetStatusCommand
      */
     public SetStatusCommand(String status) {
         requireNonNull(status);

src/main/java/seedu/address/logic/commands/SetTaskStatusCommand.java

@@ -10,7 +10,7 @@
 import seedu.address.model.project.Task;
 
 /**
- * Adds a task to a project.
+ * Set a status to a task in a project.
  */
 public class SetTaskStatusCommand extends SetStatusCommand {
 
@@ -28,7 +28,7 @@ public class SetTaskStatusCommand extends SetStatusCommand {
     private final Project project;
 
     /**
-     * Creates an AddCommand to add the specified {@code Person}
+     * Creates an SetTaskStatusCommand to add the specified {@code Task}
      */
     public SetTaskStatusCommand(String status, Task task, Project project) {
         super(status);
@@ -41,36 +41,29 @@ public SetTaskStatusCommand(String status, Task task, Project project) {
     @Override
     public CommandResult execute(Model model) throws CommandException {
         requireNonNull(model);
-
         if (!model.hasProject(project)) {
             throw new CommandException(String.format(
                     MESSAGE_PROJECT_NOT_FOUND,
                     Messages.format(project)));
         }
-
         Project statusProject = model.findProject(project.getName());
-
         if (!statusProject.hasTask(task)) {
             throw new CommandException(String.format(
                     MESSAGE_TASK_NOT_FOUND,
                     Messages.format(task),
                     Messages.format(project)));
         }
-
         Task statusTask = statusProject.findTask(task.getName());
         String resultString = "";
-
         if (isCompleted()) {
             statusTask.setComplete();
             resultString = String.format(MESSAGE_SUCCESS, Messages.format(statusTask), "complete");
-
         } else if (isIncompleted()) {
             statusTask.setIncomplete();
             resultString = String.format(MESSAGE_SUCCESS, Messages.format(statusTask), "incomplete");
         } else {
             throw new CommandException(String.format(MESSAGE_WRONG_FORMAT_STATUS));
         }
-
         model.updateCurrentProject(
             new NameEqualsPredicate(
                 model.getCurrentProject().get(0).getName().fullName));

src/main/java/seedu/address/logic/parser/AddCommentCommandParser.java

@@ -11,23 +11,19 @@
 
 
 /**
- * Parses input arguments and creates a new AddProjectCommand object
+ * Parses input arguments and creates a new AddCommentCommand object
  */
 public class AddCommentCommandParser implements Parser<AddCommentCommand> {
 
     /**
-     * Parses the given {@code String} of arguments in the context of the AddProjectCommand
-     * and returns an AddProjectCommand object for execution.
+     * Parses the given {@code String} of arguments in the context of the AddCommentCommand
+     * and returns an AddCommentCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public AddCommentCommand parse(String args) throws ParseException {
         try {
-            if (!args.contains(" /from ")) { // Check if the input correctly uses "/to"
-                throw new ParseException(String.format(
-                        MESSAGE_INVALID_COMMAND_FORMAT,
-                        AddCommentCommand.MESSAGE_USAGE));
-            }
-            if (!args.contains(" /to ")) { // Check if the input correctly uses "/to"
+            if (!args.contains(" /from ") || !args.contains(" /to ")) {
+                // Check if the input correctly uses "/to" or "/from"
                 throw new ParseException(String.format(
                         MESSAGE_INVALID_COMMAND_FORMAT,
                         AddCommentCommand.MESSAGE_USAGE));

src/main/java/seedu/address/logic/parser/AddPersonCommandParser.java

@@ -9,13 +9,13 @@
 import seedu.address.model.project.Project;
 
 /**
- * Parses input arguments and creates a new AddTaskCommand object
+ * Parses input arguments and creates a new AddPersonCommand object
  */
 public class AddPersonCommandParser implements Parser<AddPersonCommand> {
 
     /**
-     * Parses the given {@code String} of arguments in the context of the AddTaskCommand
-     * and returns an AddTaskCommand object for execution.
+     * Parses the given {@code String} of arguments in the context of the AddPersonCommand
+     * and returns an AddPersonCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public AddPersonCommand parse(String args) throws ParseException {

src/main/java/seedu/address/logic/parser/AssignPersonCommandParser.java

@@ -9,13 +9,13 @@
 
 
 /**
- * Parses input arguments and creates a new AddCommand object
+ * Parses input arguments and creates a new AssignPersonCommand object
  */
 public class AssignPersonCommandParser implements Parser<AssignPersonCommand> {
 
     /**
-     * Parses the given {@code String} of arguments in the context of the AddCommand
-     * and returns an AddCommand object for execution.
+     * Parses the given {@code String} of arguments in the context of the AssignPersonCommand
+     * and returns an AssignPersonCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public AssignPersonCommand parse(String args) throws ParseException {

src/main/java/seedu/address/logic/parser/AssignTeamCommandParser.java

@@ -12,13 +12,13 @@
 
 
 /**
- * Parses input arguments and creates a new AddCommand object
+ * Parses input arguments and creates a new AssignTeamCommand object
  */
 public class AssignTeamCommandParser implements Parser<AssignTeamCommand> {
 
     /**
-     * Parses the given {@code String} of arguments in the context of the AddCommand
-     * and returns an AddCommand object for execution.
+     * Parses the given {@code String} of arguments in the context of the AssignTeamCommand
+     * and returns an AssignTeamCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public AssignTeamCommand parse(String args) throws ParseException {

src/main/java/seedu/address/logic/parser/DeletePersonCommandParser.java

@@ -9,13 +9,13 @@
 import seedu.address.model.project.Project;
 
 /**
- * Parses input arguments and creates a new DeleteCommand object
+ * Parses input arguments and creates a new DeletePersonCommand object
  */
 public class DeletePersonCommandParser implements Parser<DeletePersonCommand> {
 
     /**
-     * Parses the given {@code String} of arguments in the context of the DeleteCommand
-     * and returns a DeleteCommand object for execution.
+     * Parses the given {@code String} of arguments in the context of the DeletePersonCommand
+     * and returns a DeletePersonCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public DeletePersonCommand parse(String args) throws ParseException {

src/main/java/seedu/address/logic/parser/DeleteProjectCommandParser.java

@@ -11,8 +11,8 @@
 public class DeleteProjectCommandParser implements Parser<DeleteProjectCommand> {
 
     /**
-     * Parses the given {@code String} of arguments in the context of the DeleteCommand
-     * and returns a DeleteCommand object for execution.
+     * Parses the given {@code String} of arguments in the context of the DeleteProjectCommand
+     * and returns a DeleteProjectCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public DeleteProjectCommand parse(String args) throws ParseException {

src/main/java/seedu/address/logic/parser/FilterCategoryCommandParser.java

@@ -7,13 +7,13 @@
 import seedu.address.model.person.CategoryEqualsPredicate;
 
 /**
- * Parses input arguments and creates a new FindCommand object
+ * Parses input arguments and creates a new FilterCategoryCommand object
  */
 public class FilterCategoryCommandParser implements Parser<FilterCategoryCommand> {
 
     /**
-     * Parses the given {@code String} of arguments in the context of the FindCommand
-     * and returns a FindCommand object for execution.
+     * Parses the given {@code String} of arguments in the context of the FilterCategoryCommand
+     * and returns a FilterCategoryCommand object for execution.
      * @throws ParseException if the user input does not conform the expected format
      */
     public FilterCategoryCommand parse(String args) throws ParseException {